Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 692f65b7f0 | |||
| 1c4200a73a | |||
| 1c9e2ee527 |
147
otp.c
147
otp.c
@@ -50,6 +50,11 @@ static char current_pads_dir[512] = DEFAULT_PADS_DIR;
|
|||||||
int main(int argc, char* argv[]);
|
int main(int argc, char* argv[]);
|
||||||
int interactive_mode(void);
|
int interactive_mode(void);
|
||||||
int command_line_mode(int argc, char* argv[]);
|
int command_line_mode(int argc, char* argv[]);
|
||||||
|
int pipe_mode(int argc, char* argv[], const char* piped_text);
|
||||||
|
|
||||||
|
// Stdin detection functions
|
||||||
|
int has_stdin_data(void);
|
||||||
|
char* read_stdin_text(void);
|
||||||
|
|
||||||
// OTP thumb drive detection function
|
// OTP thumb drive detection function
|
||||||
int detect_otp_thumb_drive(char* otp_drive_path, size_t path_size);
|
int detect_otp_thumb_drive(char* otp_drive_path, size_t path_size);
|
||||||
@@ -124,7 +129,18 @@ int main(int argc, char* argv[]) {
|
|||||||
current_pads_dir[sizeof(current_pads_dir) - 1] = '\0';
|
current_pads_dir[sizeof(current_pads_dir) - 1] = '\0';
|
||||||
}
|
}
|
||||||
|
|
||||||
if (argc == 1) {
|
// Check for piped input
|
||||||
|
if (argc == 1 && has_stdin_data()) {
|
||||||
|
// No arguments but has piped data - enter pipe mode for interactive pad selection
|
||||||
|
char* piped_text = read_stdin_text();
|
||||||
|
if (piped_text) {
|
||||||
|
int result = pipe_mode(argc, argv, piped_text);
|
||||||
|
free(piped_text);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
// If reading stdin failed, fall back to interactive mode
|
||||||
|
return interactive_mode();
|
||||||
|
} else if (argc == 1) {
|
||||||
return interactive_mode();
|
return interactive_mode();
|
||||||
} else {
|
} else {
|
||||||
return command_line_mode(argc, argv);
|
return command_line_mode(argc, argv);
|
||||||
@@ -158,6 +174,7 @@ int interactive_mode(void) {
|
|||||||
handle_pads_menu();
|
handle_pads_menu();
|
||||||
break;
|
break;
|
||||||
case 'X':
|
case 'X':
|
||||||
|
case 'Q':
|
||||||
printf("Goodbye!\n");
|
printf("Goodbye!\n");
|
||||||
return 0;
|
return 0;
|
||||||
default:
|
default:
|
||||||
@@ -1127,10 +1144,39 @@ int generate_pad_with_entropy(uint64_t size_bytes, int display_progress, int use
|
|||||||
// Get final paths in pads directory
|
// Get final paths in pads directory
|
||||||
get_pad_path(chksum_hex, pad_path, state_path);
|
get_pad_path(chksum_hex, pad_path, state_path);
|
||||||
|
|
||||||
|
// Try rename first (works for same filesystem)
|
||||||
if (rename(temp_filename, pad_path) != 0) {
|
if (rename(temp_filename, pad_path) != 0) {
|
||||||
printf("Error: Cannot move pad file to pads directory\n");
|
// If rename fails, try copy and delete (works across filesystems)
|
||||||
|
FILE* temp_file = fopen(temp_filename, "rb");
|
||||||
|
FILE* dest_file = fopen(pad_path, "wb");
|
||||||
|
|
||||||
|
if (!temp_file || !dest_file) {
|
||||||
|
printf("Error: Cannot copy pad file to pads directory\n");
|
||||||
|
if (temp_file) fclose(temp_file);
|
||||||
|
if (dest_file) fclose(dest_file);
|
||||||
|
unlink(temp_filename);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Copy file in chunks
|
||||||
|
unsigned char copy_buffer[64 * 1024];
|
||||||
|
size_t bytes_read;
|
||||||
|
while ((bytes_read = fread(copy_buffer, 1, sizeof(copy_buffer), temp_file)) > 0) {
|
||||||
|
if (fwrite(copy_buffer, 1, bytes_read, dest_file) != bytes_read) {
|
||||||
|
printf("Error: Failed to copy pad file to pads directory\n");
|
||||||
|
fclose(temp_file);
|
||||||
|
fclose(dest_file);
|
||||||
|
unlink(temp_filename);
|
||||||
|
unlink(pad_path);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fclose(temp_file);
|
||||||
|
fclose(dest_file);
|
||||||
|
|
||||||
|
// Remove temporary file after successful copy
|
||||||
unlink(temp_filename);
|
unlink(temp_filename);
|
||||||
return 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set pad file to read-only
|
// Set pad file to read-only
|
||||||
@@ -2293,6 +2339,83 @@ void get_pad_path(const char* chksum, char* pad_path, char* state_path) {
|
|||||||
snprintf(state_path, 1024, "%s/%s.state", current_pads_dir, chksum);
|
snprintf(state_path, 1024, "%s/%s.state", current_pads_dir, chksum);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Stdin detection functions implementation
|
||||||
|
int has_stdin_data(void) {
|
||||||
|
// Check if stdin is a pipe/redirect (not a terminal)
|
||||||
|
if (!isatty(STDIN_FILENO)) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
char* read_stdin_text(void) {
|
||||||
|
size_t capacity = 4096;
|
||||||
|
size_t length = 0;
|
||||||
|
char* buffer = malloc(capacity);
|
||||||
|
|
||||||
|
if (!buffer) {
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
char chunk[1024];
|
||||||
|
while (fgets(chunk, sizeof(chunk), stdin)) {
|
||||||
|
size_t chunk_len = strlen(chunk);
|
||||||
|
|
||||||
|
// Ensure we have enough capacity
|
||||||
|
while (length + chunk_len >= capacity) {
|
||||||
|
capacity *= 2;
|
||||||
|
char* new_buffer = realloc(buffer, capacity);
|
||||||
|
if (!new_buffer) {
|
||||||
|
free(buffer);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
buffer = new_buffer;
|
||||||
|
}
|
||||||
|
|
||||||
|
strcpy(buffer + length, chunk);
|
||||||
|
length += chunk_len;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Remove trailing newline if present
|
||||||
|
if (length > 0 && buffer[length - 1] == '\n') {
|
||||||
|
buffer[length - 1] = '\0';
|
||||||
|
length--;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If empty, free and return NULL
|
||||||
|
if (length == 0) {
|
||||||
|
free(buffer);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
return buffer;
|
||||||
|
}
|
||||||
|
|
||||||
|
int pipe_mode(int argc, char* argv[], const char* piped_text) {
|
||||||
|
(void)argc; // Suppress unused parameter warning
|
||||||
|
(void)argv; // Suppress unused parameter warning
|
||||||
|
|
||||||
|
printf("Piped text received: \"%s\"\n\n", piped_text);
|
||||||
|
|
||||||
|
// List available pads for selection
|
||||||
|
int pad_count = list_available_pads();
|
||||||
|
if (pad_count == 0) {
|
||||||
|
printf("No pads available. Generate a pad first.\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
printf("\nEnter pad selection (number, checksum, or prefix): ");
|
||||||
|
char pad_input[MAX_HASH_LENGTH];
|
||||||
|
if (!fgets(pad_input, sizeof(pad_input), stdin)) {
|
||||||
|
printf("Error: Failed to read pad selection\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
pad_input[strcspn(pad_input, "\n")] = 0;
|
||||||
|
|
||||||
|
// Encrypt the piped text
|
||||||
|
return encrypt_text(pad_input, piped_text);
|
||||||
|
}
|
||||||
|
|
||||||
// OTP thumb drive detection function implementation
|
// OTP thumb drive detection function implementation
|
||||||
int detect_otp_thumb_drive(char* otp_drive_path, size_t path_size) {
|
int detect_otp_thumb_drive(char* otp_drive_path, size_t path_size) {
|
||||||
const char* mount_dirs[] = {"/media", "/run/media", "/mnt", NULL};
|
const char* mount_dirs[] = {"/media", "/run/media", "/mnt", NULL};
|
||||||
@@ -3016,10 +3139,15 @@ int handle_pads_menu(void) {
|
|||||||
|
|
||||||
char input[10];
|
char input[10];
|
||||||
if (fgets(input, sizeof(input), stdin)) {
|
if (fgets(input, sizeof(input), stdin)) {
|
||||||
char choice = toupper(input[0]);
|
char choice = toupper(input[0]);
|
||||||
if (choice == 'G') {
|
if (choice == 'G') {
|
||||||
return handle_generate_menu();
|
int result = handle_generate_menu();
|
||||||
|
if (result == 0) {
|
||||||
|
// After successful pad generation, return to pads menu
|
||||||
|
return handle_pads_menu();
|
||||||
}
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -3088,7 +3216,12 @@ int handle_pads_menu(void) {
|
|||||||
|
|
||||||
// Handle actions first
|
// Handle actions first
|
||||||
if (toupper(input[0]) == 'G') {
|
if (toupper(input[0]) == 'G') {
|
||||||
return handle_generate_menu();
|
int result = handle_generate_menu();
|
||||||
|
if (result == 0) {
|
||||||
|
// After successful pad generation, return to pads menu
|
||||||
|
return handle_pads_menu();
|
||||||
|
}
|
||||||
|
return result;
|
||||||
} else if (toupper(input[0]) == 'B') {
|
} else if (toupper(input[0]) == 'B') {
|
||||||
return 0; // Back to main menu
|
return 0; // Back to main menu
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user