Compare commits

..

1 Commits

Author SHA1 Message Date
TapTap 69773bd16a fix: resolve all security issues (#154, #156, #157, #159, #160, #161, #162, #170)
CI / lint (pull_request) Failing after 3s
CI / build-and-test (pull_request) Has been skipped
CI / sanitizers (address) (pull_request) Has been skipped
CI / sanitizers (undefined) (pull_request) Has been skipped
CI / fuzz-build (pull_request) Has been skipped
CI / coverage (pull_request) Has been skipped
CI / valgrind (pull_request) Has been skipped
2026-07-29 18:52:08 +02:00
28 changed files with 184 additions and 1292 deletions
-130
View File
@@ -71,39 +71,6 @@ static void print_usage(void) {
printf(" --partial Keep partial files on interrupted transfer\n");
printf(" --fastsync-server-path <path>\n");
printf(" Path to fastsync-server on remote (default: fastsync-server)\n");
printf(" -l, --links Copy symlinks as symlinks\n");
printf(" --copy-links Transform symlinks into referent files\n");
printf(" --safe-links Skip symlinks that point outside transfer tree\n");
printf(" --copy-unsafe-links Only transform unsafe symlinks into referent files\n");
printf(" -H, --hard-links Preserve hard links\n");
printf(" -A, --acls Preserve ACLs\n");
printf(" -X, --xattrs Preserve extended attributes\n");
printf(" -D, --devices Preserve device files\n");
printf(" -S, --sparse Handle sparse files efficiently\n");
printf(" -i, --itemize-changes Show per-file change summary\n");
printf(" --out-format <fmt> Custom output format string\n");
printf(" --info <flags> Info verbosity level\n");
printf(" --debug <flags> Debug verbosity level\n");
printf(" --list-only List files without transferring\n");
printf(" -h, --human-readable Human-readable numbers\n");
printf(" -u, --update Skip files newer on destination\n");
printf(" --inplace Update files in-place (no temp+rename)\n");
printf(" --append Append data to shorter files\n");
printf(" --append-verify Append with verify\n");
printf(" --delete-excluded Also delete excluded files\n");
printf(" --delete-after Delete after transfer, not before\n");
printf(" --max-delete <n> Maximum number of files to delete\n");
printf(" --filter <rule> Add file filtering rule\n");
printf(" --files-from <file> Read file list from file\n");
printf(" --cvs-exclude Auto-ignore CVS files\n");
printf(" --prune-empty-dirs Omit empty directories from transfer\n");
printf(" -R, --relative Use relative paths\n");
printf(" -e, --rsh <cmd> Specify remote shell\n");
printf(" --rsync-path <path> Path to remote binary\n");
printf(" --temp-dir <dir> Temporary directory for files\n");
printf(" --compare-dest <dir> Compare destination\n");
printf(" --copy-dest <dir> Copy destination\n");
printf(" --link-dest <dir> Link destination\n");
printf(" --help Show this help\n");
}
@@ -351,103 +318,6 @@ int main(int argc, char* argv[]) {
config->fastsync_server_path = str_dup(argv[++i]);
} else if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--verbose") == 0) {
set_log_level(LOG_LEVEL_DEBUG);
} else if (strcmp(argv[i], "-l") == 0 || strcmp(argv[i], "--links") == 0) {
config->follow_symlinks = true;
log_message(LOG_LEVEL_INFO, "Enabled symlink preservation");
} else if (strcmp(argv[i], "--copy-links") == 0) {
config->copy_links = true;
log_message(LOG_LEVEL_INFO, "Enabled copy-links (dereference symlinks)");
} else if (strcmp(argv[i], "--safe-links") == 0) {
config->safe_links = true;
log_message(LOG_LEVEL_INFO, "Enabled safe-links (skip unsafe symlinks)");
} else if (strcmp(argv[i], "--copy-unsafe-links") == 0) {
config->copy_unsafe_links = true;
log_message(LOG_LEVEL_INFO, "Enabled copy-unsafe-links");
} else if (strcmp(argv[i], "-H") == 0 || strcmp(argv[i], "--hard-links") == 0) {
config->preserve_hard_links = true;
log_message(LOG_LEVEL_INFO, "Enabled hard link preservation");
} else if (strcmp(argv[i], "-A") == 0 || strcmp(argv[i], "--acls") == 0) {
config->preserve_acls = true;
log_message(LOG_LEVEL_INFO, "Enabled ACL preservation");
} else if (strcmp(argv[i], "-X") == 0 || strcmp(argv[i], "--xattrs") == 0) {
config->preserve_xattrs = true;
log_message(LOG_LEVEL_INFO, "Enabled xattr preservation");
} else if (strcmp(argv[i], "-D") == 0 || strcmp(argv[i], "--devices") == 0) {
config->preserve_devices = true;
log_message(LOG_LEVEL_INFO, "Enabled device file preservation");
} else if (strcmp(argv[i], "-S") == 0 || strcmp(argv[i], "--sparse") == 0) {
config->preserve_sparse = true;
log_message(LOG_LEVEL_INFO, "Enabled sparse file handling");
} else if (strcmp(argv[i], "-i") == 0 || strcmp(argv[i], "--itemize-changes") == 0) {
config->itemize_changes = true;
} else if (strcmp(argv[i], "--out-format") == 0 && i + 1 < argc) {
free(config->out_format);
config->out_format = str_dup(argv[++i]);
} else if (strcmp(argv[i], "--info") == 0 && i + 1 < argc) {
config->info_level = atoi(argv[++i]);
} else if (strcmp(argv[i], "--debug") == 0 && i + 1 < argc) {
config->debug_level = atoi(argv[++i]);
} else if (strcmp(argv[i], "--list-only") == 0) {
config->list_only = true;
} else if (strcmp(argv[i], "-h") == 0 || strcmp(argv[i], "--human-readable") == 0) {
config->human_readable = true;
} else if (strcmp(argv[i], "-u") == 0 || strcmp(argv[i], "--update") == 0) {
config->update = true;
} else if (strcmp(argv[i], "--inplace") == 0) {
config->inplace = true;
} else if (strcmp(argv[i], "--append") == 0) {
config->append = true;
} else if (strcmp(argv[i], "--append-verify") == 0) {
config->append_verify = true;
} else if (strcmp(argv[i], "--delete-excluded") == 0) {
config->delete_excluded = true;
} else if (strcmp(argv[i], "--delete-after") == 0) {
config->delete_after = true;
} else if (strcmp(argv[i], "--max-delete") == 0 && i + 1 < argc) {
config->max_delete = atoi(argv[++i]);
if (config->max_delete < 0) {
fprintf(stderr, "Error: --max-delete must be a non-negative integer\n");
exit_code = 1;
goto cleanup;
}
} else if (strcmp(argv[i], "--filter") == 0 && i + 1 < argc) {
if (!config->filters) {
config->filters = array_list_create(free);
}
array_list_add(config->filters, str_dup(argv[++i]));
} else if (strcmp(argv[i], "--files-from") == 0 && i + 1 < argc) {
free(config->files_from);
config->files_from = str_dup(argv[++i]);
} else if (strcmp(argv[i], "--cvs-exclude") == 0) {
config->cvs_exclude = true;
} else if (strcmp(argv[i], "--prune-empty-dirs") == 0) {
config->prune_empty_dirs = true;
} else if (strcmp(argv[i], "-R") == 0 || strcmp(argv[i], "--relative") == 0) {
config->relative = true;
} else if (strcmp(argv[i], "-e") == 0 || strcmp(argv[i], "--rsh") == 0) {
if (i + 1 < argc) {
free(config->rsh_command);
config->rsh_command = str_dup(argv[++i]);
} else {
fprintf(stderr, "Error: -e/--rsh requires a command argument\n");
exit_code = 1;
goto cleanup;
}
} else if (strcmp(argv[i], "--rsync-path") == 0 && i + 1 < argc) {
free(config->rsync_path);
config->rsync_path = str_dup(argv[++i]);
} else if (strcmp(argv[i], "--temp-dir") == 0 && i + 1 < argc) {
free(config->temp_dir);
config->temp_dir = str_dup(argv[++i]);
} else if (strcmp(argv[i], "--compare-dest") == 0 && i + 1 < argc) {
free(config->compare_dest);
config->compare_dest = str_dup(argv[++i]);
} else if (strcmp(argv[i], "--copy-dest") == 0 && i + 1 < argc) {
free(config->copy_dest);
config->copy_dest = str_dup(argv[++i]);
} else if (strcmp(argv[i], "--link-dest") == 0 && i + 1 < argc) {
free(config->link_dest);
config->link_dest = str_dup(argv[++i]);
} else if (argv[i][0] == '-') {
fprintf(stderr, "Unknown option: %s\n", argv[i]);
print_usage();
+4 -9
View File
@@ -306,9 +306,7 @@ static int scan_directory_multithreaded(void* pipeline_context) {
context->config->send_directory, context->config->use_metadata, context->config->chunk_size,
context->config->exclude_patterns, context->config->exclude_count,
context->config->include_patterns, context->config->include_count, context->config->max_size,
context->config->min_size, context->config->max_depth, 4,
context->config->follow_symlinks, context->config->copy_links,
context->config->safe_links, context->config->copy_unsafe_links);
context->config->min_size, context->config->max_depth, 4);
Chunk* current_chunk;
while ((current_chunk = parallel_scanner_next(scanner)) != NULL) {
@@ -371,8 +369,7 @@ int send_files(Config* config) {
DirectoryScanner* scanner = directory_scanner_create(
config->send_directory, config->use_metadata, config->chunk_size, config->exclude_patterns,
config->exclude_count, config->include_patterns, config->include_count, config->max_size,
config->min_size, config->max_depth, config->follow_symlinks, config->copy_links,
config->safe_links, config->copy_unsafe_links);
config->min_size, config->max_depth);
Chunk* chunk;
int file_count = 0;
unsigned long long total_bytes = 0;
@@ -426,8 +423,7 @@ int send_files(Config* config) {
DirectoryScanner* scanner = directory_scanner_create(
config->send_directory, config->use_metadata, config->chunk_size, config->exclude_patterns,
config->exclude_count, config->include_patterns, config->include_count, config->max_size,
config->min_size, config->max_depth, config->follow_symlinks, config->copy_links,
config->safe_links, config->copy_unsafe_links);
config->min_size, config->max_depth);
Chunk* current_chunk;
unsigned long long total_bytes = 0;
time_t last_progress = 0;
@@ -516,8 +512,7 @@ int send_files_multithreaded(Config* config) {
DirectoryScanner* scanner = directory_scanner_create(
config->send_directory, config->use_metadata, config->chunk_size, config->exclude_patterns,
config->exclude_count, config->include_patterns, config->include_count, config->max_size,
config->min_size, config->max_depth, config->follow_symlinks, config->copy_links,
config->safe_links, config->copy_unsafe_links);
config->min_size, config->max_depth);
Chunk* chunk;
int file_count = 0;
unsigned long long total_bytes = 0;
+3 -67
View File
@@ -38,9 +38,7 @@ DirectoryScanner* directory_scanner_create(const char* root_directory, bool use_
unsigned long long chunk_size, char** exclude_patterns,
int exclude_count, char** include_patterns,
int include_count, unsigned long long max_size,
unsigned long long min_size, int max_depth,
bool follow_symlinks, bool copy_links,
bool safe_links, bool copy_unsafe_links) {
unsigned long long min_size, int max_depth) {
DirectoryScanner* scanner = malloc(sizeof(DirectoryScanner));
if (scanner == NULL)
return NULL;
@@ -57,10 +55,6 @@ DirectoryScanner* directory_scanner_create(const char* root_directory, bool use_
scanner->min_size = min_size;
scanner->max_depth = max_depth;
scanner->current_depth = 0;
scanner->follow_symlinks = follow_symlinks;
scanner->copy_links = copy_links;
scanner->safe_links = safe_links;
scanner->copy_unsafe_links = copy_unsafe_links;
queue_enqueue(scanner->directories, dir_entry_create(root_directory, 0));
return scanner;
}
@@ -137,57 +131,10 @@ Chunk* directory_scanner_next(DirectoryScanner* scanner) {
char* cur_path = path_cat(scanner->current_path, entry->d_name);
struct stat stats;
struct stat lstats;
bool is_symlink = false;
if (lstat(cur_path, &lstats) != 0) {
free(cur_path);
continue;
}
is_symlink = S_ISLNK(lstats.st_mode);
if (is_symlink && !scanner->follow_symlinks && !scanner->copy_links && !scanner->safe_links && !scanner->copy_unsafe_links) {
free(cur_path);
continue;
}
if (is_symlink && scanner->safe_links) {
char link_target[4096];
ssize_t len = readlink(cur_path, link_target, sizeof(link_target) - 1);
if (len < 0) {
free(cur_path);
continue;
}
link_target[len] = '\0';
if (link_target[0] == '/') {
free(cur_path);
continue;
}
}
if (is_symlink && scanner->copy_unsafe_links && !scanner->copy_links) {
char link_target[4096];
ssize_t len = readlink(cur_path, link_target, sizeof(link_target) - 1);
if (len < 0) {
free(cur_path);
continue;
}
link_target[len] = '\0';
bool unsafe = (link_target[0] == '/');
if (!unsafe) {
free(cur_path);
continue;
}
}
bool use_lstat = is_symlink && scanner->follow_symlinks && !scanner->copy_links;
if (use_lstat) {
stats = lstats;
} else {
if (stat(cur_path, &stats) != 0) {
free(cur_path);
continue;
}
}
if (S_ISDIR(stats.st_mode)) {
int next_depth = scanner->current_depth + 1;
@@ -271,10 +218,6 @@ typedef struct {
unsigned long long max_size;
unsigned long long min_size;
int max_depth;
bool follow_symlinks;
bool copy_links;
bool safe_links;
bool copy_unsafe_links;
} ParallelWorkerArg;
static int parallel_worker_thread(void* arg) {
@@ -282,8 +225,7 @@ static int parallel_worker_thread(void* arg) {
for (int i = 0; i < wa->dir_count; i++) {
DirectoryScanner* ds = directory_scanner_create(
wa->dirs[i], wa->use_metadata, wa->chunk_size, wa->exclude_patterns, wa->exclude_count,
wa->include_patterns, wa->include_count, wa->max_size, wa->min_size, wa->max_depth,
wa->follow_symlinks, wa->copy_links, wa->safe_links, wa->copy_unsafe_links);
wa->include_patterns, wa->include_count, wa->max_size, wa->min_size, wa->max_depth);
Chunk* chunk;
while ((chunk = directory_scanner_next(ds)) != NULL) {
queue_enqueue_multithreaded(wa->ps->result_queue, chunk, &wa->ps->result_mutex,
@@ -310,9 +252,7 @@ ParallelScanner* parallel_scanner_create(char* root_directory, bool use_metadata
int exclude_count, char** include_patterns,
int include_count, unsigned long long max_size,
unsigned long long min_size, int max_depth,
int num_threads,
bool follow_symlinks, bool copy_links,
bool safe_links, bool copy_unsafe_links) {
int num_threads) {
ParallelScanner* ps = calloc(1, sizeof(ParallelScanner));
if (!ps)
return NULL;
@@ -471,10 +411,6 @@ ParallelScanner* parallel_scanner_create(char* root_directory, bool use_metadata
wa->max_size = max_size;
wa->min_size = min_size;
wa->max_depth = max_depth;
wa->follow_symlinks = follow_symlinks;
wa->copy_links = copy_links;
wa->safe_links = safe_links;
wa->copy_unsafe_links = copy_unsafe_links;
start += count;
if (thrd_create(&ps->threads[t], parallel_worker_thread, wa) != thrd_success) {
for (int j = 0; j < count; j++)
+2 -10
View File
@@ -21,10 +21,6 @@ typedef struct {
unsigned long long min_size;
int max_depth;
int current_depth;
bool follow_symlinks;
bool copy_links;
bool safe_links;
bool copy_unsafe_links;
} DirectoryScanner;
typedef struct {
@@ -43,9 +39,7 @@ DirectoryScanner* directory_scanner_create(const char* root_directory, bool use_
unsigned long long chunk_size, char** exclude_patterns,
int exclude_count, char** include_patterns,
int include_count, unsigned long long max_size,
unsigned long long min_size, int max_depth,
bool follow_symlinks, bool copy_links,
bool safe_links, bool copy_unsafe_links);
unsigned long long min_size, int max_depth);
Chunk* directory_scanner_next(DirectoryScanner* scanner);
void directory_scanner_destroy(DirectoryScanner* scanner);
@@ -54,9 +48,7 @@ ParallelScanner* parallel_scanner_create(char* root_directory, bool use_metadata
int exclude_count, char** include_patterns,
int include_count, unsigned long long max_size,
unsigned long long min_size, int max_depth,
int num_threads,
bool follow_symlinks, bool copy_links,
bool safe_links, bool copy_unsafe_links);
int num_threads);
Chunk* parallel_scanner_next(ParallelScanner* scanner);
void parallel_scanner_destroy(ParallelScanner* scanner);
+1 -1
View File
@@ -69,7 +69,7 @@ int receive_files(Config* config, int fd) {
}
char* full_path = path_cat(config->receive_root_directory, check_path);
struct stat st;
bool has_old = full_path && stat(full_path, &st) == 0;
bool has_old = full_path && lstat(full_path, &st) == 0;
bool match = has_old && (unsigned long long)st.st_size == check_size &&
(long long)st.st_mtime == check_mtime;
if (match)
+9 -2
View File
@@ -78,14 +78,21 @@ Data* data_decompress(Data* compressed_data) {
return NULL;
}
// ZSTD_CONTENTSIZE_UNKNOWN (~2^64) can cause massive allocation;
// fall back to a conservative estimate (3x compressed size) when unknown.
if (dst_size == ZSTD_CONTENTSIZE_UNKNOWN) {
dst_size = compressed_data->size * 3;
if (dst_size < INITIAL_DECOMPRESS_BUF_SIZE)
dst_size = INITIAL_DECOMPRESS_BUF_SIZE;
}
ZSTD_DCtx* dctx = ZSTD_createDCtx();
if (!dctx) {
log_message(LOG_LEVEL_ERROR, "Failed to create ZSTD decompression context");
return NULL;
}
size_t buf_size =
(!ZSTD_isError(dst_size) && dst_size > 0) ? (size_t)dst_size : INITIAL_DECOMPRESS_BUF_SIZE;
size_t buf_size = (dst_size > 0) ? (size_t)dst_size : INITIAL_DECOMPRESS_BUF_SIZE;
Data* uncompressed_data = data_create_empty(buf_size);
if (!uncompressed_data) {
log_message(LOG_LEVEL_ERROR, "Failed to allocate decompression buffer");
-173
View File
@@ -59,40 +59,6 @@ Config* config_create(char* version, char* send_directory, char* receive_directo
config->max_depth = 0;
config->log_file = NULL;
config->queue_size = 100;
config->follow_symlinks = false;
config->partial = false;
config->copy_links = false;
config->safe_links = false;
config->copy_unsafe_links = false;
config->preserve_hard_links = false;
config->preserve_acls = false;
config->preserve_xattrs = false;
config->preserve_devices = false;
config->preserve_sparse = false;
config->itemize_changes = false;
config->out_format = NULL;
config->info_level = 0;
config->debug_level = 0;
config->list_only = false;
config->human_readable = false;
config->update = false;
config->inplace = false;
config->append = false;
config->append_verify = false;
config->delete_excluded = false;
config->delete_after = false;
config->max_delete = 0;
config->filters = NULL;
config->files_from = NULL;
config->cvs_exclude = false;
config->prune_empty_dirs = false;
config->relative = false;
config->rsh_command = NULL;
config->rsync_path = NULL;
config->temp_dir = NULL;
config->compare_dest = NULL;
config->copy_dest = NULL;
config->link_dest = NULL;
return config;
}
@@ -139,17 +105,6 @@ void config_delete(Config* config) {
free(config->tls_ca);
free(config->backup_dir);
free(config->server_host);
free(config->out_format);
free(config->files_from);
free(config->rsh_command);
free(config->rsync_path);
free(config->temp_dir);
free(config->compare_dest);
free(config->copy_dest);
free(config->link_dest);
if (config->filters) {
array_list_delete(config->filters);
}
free(config);
}
@@ -190,44 +145,6 @@ bool config_send(int file_descriptor, const Config* config) {
return false;
if (!send_str(file_descriptor, config->backup_dir ? config->backup_dir : ""))
return false;
if (!send_int(file_descriptor, config->follow_symlinks))
return false;
if (!send_int(file_descriptor, config->copy_links))
return false;
if (!send_int(file_descriptor, config->safe_links))
return false;
if (!send_int(file_descriptor, config->copy_unsafe_links))
return false;
if (!send_int(file_descriptor, config->preserve_hard_links))
return false;
if (!send_int(file_descriptor, config->preserve_acls))
return false;
if (!send_int(file_descriptor, config->preserve_xattrs))
return false;
if (!send_int(file_descriptor, config->preserve_devices))
return false;
if (!send_int(file_descriptor, config->preserve_sparse))
return false;
if (!send_int(file_descriptor, config->update))
return false;
if (!send_int(file_descriptor, config->inplace))
return false;
if (!send_int(file_descriptor, config->append))
return false;
if (!send_int(file_descriptor, config->append_verify))
return false;
if (!send_int(file_descriptor, config->delete_excluded))
return false;
if (!send_int(file_descriptor, config->delete_after))
return false;
if (!send_n_data(file_descriptor, &config->max_delete, sizeof(config->max_delete)))
return false;
if (!send_int(file_descriptor, config->relative))
return false;
if (!send_int(file_descriptor, config->prune_empty_dirs))
return false;
if (!send_str(file_descriptor, config->temp_dir ? config->temp_dir : ""))
return false;
Status status;
if (!receive_status(file_descriptor, &status))
return false;
@@ -330,101 +247,12 @@ Config* config_receive(int file_descriptor) {
config->max_depth = 0;
config->log_file = NULL;
config->queue_size = 100;
config->follow_symlinks = false;
config->copy_links = false;
config->safe_links = false;
config->copy_unsafe_links = false;
config->preserve_hard_links = false;
config->preserve_acls = false;
config->preserve_xattrs = false;
config->preserve_devices = false;
config->preserve_sparse = false;
config->itemize_changes = false;
config->out_format = NULL;
config->info_level = 0;
config->debug_level = 0;
config->list_only = false;
config->human_readable = false;
config->update = false;
config->inplace = false;
config->append = false;
config->append_verify = false;
config->delete_excluded = false;
config->delete_after = false;
config->max_delete = 0;
config->filters = NULL;
config->files_from = NULL;
config->cvs_exclude = false;
config->prune_empty_dirs = false;
config->relative = false;
config->rsh_command = NULL;
config->rsync_path = NULL;
config->temp_dir = NULL;
config->compare_dest = NULL;
config->copy_dest = NULL;
config->link_dest = NULL;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->backup = tmp;
config->backup_dir = receive_str(file_descriptor);
if (config->backup_dir == NULL)
goto error;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->follow_symlinks = tmp;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->copy_links = tmp;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->safe_links = tmp;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->copy_unsafe_links = tmp;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->preserve_hard_links = tmp;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->preserve_acls = tmp;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->preserve_xattrs = tmp;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->preserve_devices = tmp;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->preserve_sparse = tmp;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->update = tmp;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->inplace = tmp;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->append = tmp;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->append_verify = tmp;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->delete_excluded = tmp;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->delete_after = tmp;
if (!receive_n_data(file_descriptor, &config->max_delete, sizeof(config->max_delete)))
goto error;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->relative = tmp;
if (!receive_int(file_descriptor, &tmp))
goto error;
config->prune_empty_dirs = tmp;
config->temp_dir = receive_str(file_descriptor);
if (config->temp_dir == NULL)
goto error;
config->server_host = str_dup("127.0.0.1");
config->server_port = 8080;
if (!send_status(file_descriptor, STATUS_OK))
@@ -437,7 +265,6 @@ error:
free(config->receive_root_directory);
free(config->server_host);
free(config->backup_dir);
free(config->temp_dir);
free(config);
return NULL;
}
-47
View File
@@ -1,7 +1,6 @@
#ifndef CONFIG_H
#define CONFIG_H
#include "array_list.h"
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
@@ -54,52 +53,6 @@ typedef struct Config {
int queue_size;
bool follow_symlinks;
bool partial;
// Issue #120: Symlink handling
bool copy_links;
bool safe_links;
bool copy_unsafe_links;
// Issue #121: Extended metadata preservation
bool preserve_hard_links;
bool preserve_acls;
bool preserve_xattrs;
bool preserve_devices;
bool preserve_sparse;
// Issue #122: Output/logging options
bool itemize_changes;
char* out_format;
int info_level;
int debug_level;
bool list_only;
bool human_readable;
// Issue #127: Transfer modes
bool update;
bool inplace;
bool append;
bool append_verify;
// Issue #128: Extended delete options
bool delete_excluded;
bool delete_after;
int max_delete;
// Issue #129: Advanced file selection
ArrayList* filters;
char* files_from;
bool cvs_exclude;
bool prune_empty_dirs;
bool relative;
// Issue #130: Remote shell/connection options
char* rsh_command;
char* rsync_path;
char* temp_dir;
char* compare_dest;
char* copy_dest;
char* link_dest;
} Config;
#define PROTOCOL_VERSION "1.3.0"
+21
View File
@@ -1,5 +1,6 @@
#include "delta.h"
#include "log.h"
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
@@ -7,6 +8,10 @@
#define XXH_IMPLEMENTATION
#include <xxhash.h>
/* Maximum number of blocks/instructions allowed from the wire to prevent OOM */
#define MAX_DELTA_BLOCKS (1024U * 1024U) /* 1M signature blocks */
#define MAX_DELTA_INSTRUCTIONS (1024U * 1024U) /* 1M delta instructions */
uint32_t delta_adler32(const void* data, uint32_t len) {
const uint8_t* p = (const uint8_t*)data;
uint32_t s1 = 1;
@@ -101,6 +106,14 @@ DeltaSignature* delta_signature_deserialize(const Data* data) {
memcpy(&sig->block_count, buf + pos, sizeof(uint32_t));
pos += sizeof(uint32_t);
// Reject unreasonably large block counts to prevent OOM
if (sig->block_count > MAX_DELTA_BLOCKS) {
log_message(LOG_LEVEL_ERROR, "Delta signature block count %u exceeds maximum %u",
sig->block_count, MAX_DELTA_BLOCKS);
free(sig);
return NULL;
}
uint64_t expected = sizeof(uint64_t) + sizeof(uint32_t) + sizeof(uint32_t) +
(uint64_t)sig->block_count * (sizeof(uint32_t) + sizeof(uint32_t));
if (data->size < expected) {
@@ -340,6 +353,14 @@ Delta* delta_deserialize(const Data* data) {
memcpy(&delta->instruction_count, buf + pos, sizeof(uint32_t));
pos += sizeof(uint32_t);
// Reject unreasonably large instruction counts to prevent OOM
if (delta->instruction_count > MAX_DELTA_INSTRUCTIONS) {
log_message(LOG_LEVEL_ERROR, "Delta instruction count %u exceeds maximum %u",
delta->instruction_count, MAX_DELTA_INSTRUCTIONS);
free(delta);
return NULL;
}
delta->instructions = malloc(delta->instruction_count * sizeof(DeltaInstruction));
if (!delta->instructions) {
free(delta);
+58 -3
View File
@@ -134,9 +134,64 @@ bool file_save_to_disk(const char* root_directory, File* file, const Config* con
log_message(LOG_LEVEL_ERROR, "Path traversal detected in file path: %s", file->path);
return false;
}
char* disk_path = path_cat((char*)root_directory, file->path);
if (disk_path == NULL)
// Resolve the destination root to its real path, preventing symlink-based escapes.
// If the root does not yet exist, try to create it so realpath can succeed.
char* resolved_root = realpath(root_directory, NULL);
if (resolved_root == NULL) {
if (mkdir_r(root_directory)) {
resolved_root = realpath(root_directory, NULL);
}
}
if (resolved_root == NULL) {
log_message(LOG_LEVEL_ERROR, "Failed to resolve destination root: %s", root_directory);
return false;
}
char* disk_path = path_cat(resolved_root, file->path);
if (disk_path == NULL) {
free(resolved_root);
return false;
}
// Ensure the target directory exists so the parent can be resolved for path safety.
char* dir_dup = str_dup(disk_path);
if (!dir_dup) {
free(resolved_root);
free(disk_path);
return false;
}
char* dir_str = dirname(dir_dup);
// Create the directory if needed (no-op if it already exists) so realpath can resolve it.
if (!mkdir_r(dir_str)) {
free(dir_dup);
free(resolved_root);
free(disk_path);
return false;
}
char* resolved_dir = realpath(dir_str, NULL);
free(dir_dup);
if (resolved_dir == NULL) {
log_message(LOG_LEVEL_ERROR, "Failed to resolve directory for: %s", disk_path);
free(resolved_root);
free(disk_path);
return false;
}
// Verify that the resolved directory is inside the resolved root.
// Both are canonical absolute paths — this prevents symlink-based escapes.
size_t root_len = strlen(resolved_root);
if (strncmp(resolved_dir, resolved_root, root_len) != 0 ||
(resolved_dir[root_len] != '\0' && resolved_dir[root_len] != '/')) {
log_message(LOG_LEVEL_ERROR, "Path escape detected: %s is outside %s", disk_path, root_directory);
free(resolved_dir);
free(resolved_root);
free(disk_path);
return false;
}
free(resolved_dir);
free(resolved_root);
bool ok = to_disk(disk_path, file->data->data, file->data->size);
if (ok)
file_restore_metadata(disk_path, file->metadata);
@@ -341,7 +396,7 @@ File* receive_incremental_check(int fd, const Config* config, bool* skipped) {
char* full_path = path_cat(config->receive_root_directory, check_path);
struct stat st;
bool has_old_file = (full_path && stat(full_path, &st) == 0);
bool has_old_file = (full_path && lstat(full_path, &st) == 0);
unsigned long long old_size = has_old_file ? (unsigned long long)st.st_size : 0;
bool match = has_old_file && (unsigned long long)st.st_size == check_size &&
+3 -3
View File
@@ -9,7 +9,7 @@
#include <time.h>
#include <unistd.h>
#define MAX_DATA_SIZE (256ULL * 1024 * 1024) /* 256 MB max per message */
#define MAX_DATA_SIZE (100ULL * 1024 * 1024) /* 100 MB max per data message */
#define RECEIVE_TIMEOUT_SEC 60 /* 60 second per-message timeout */
#define MAX_CONNECTION_MEMORY (1024ULL * 1024 * 1024) /* 1 GB total per connection */
@@ -186,9 +186,9 @@ char* receive_str(int file_descriptor) {
size_t size;
if (!receive_n_data(file_descriptor, &size, sizeof(size_t)))
return NULL;
if (size > MAX_DATA_SIZE) {
if (size > MAX_STRING_SIZE) {
log_message(LOG_LEVEL_ERROR, "String size %zu exceeds maximum %llu", size,
(unsigned long long)MAX_DATA_SIZE);
(unsigned long long)MAX_STRING_SIZE);
return NULL;
}
char* data = (char*)malloc(size + 1);
+5 -2
View File
@@ -5,8 +5,11 @@
#include <stdbool.h>
#include <stddef.h>
/* Maximum allowed string size for receive_str (10 MB) */
#define MAX_STRING_SIZE (10 * 1024 * 1024)
/* Maximum allowed string size for receive_str (64 KB) */
#define MAX_STRING_SIZE (64 * 1024)
/* Maximum allowed data payload size for receive_data (100 MB) */
#define MAX_DATA_PAYLOAD_SIZE (100ULL * 1024 * 1024)
typedef struct ssl_st SSL;
+20 -3
View File
@@ -79,25 +79,38 @@ static SSL_CTX* create_ssl_ctx(bool is_server, const char* cert, const char* key
return ctx;
}
static SSL* wrap_fd_with_ssl(int fd, SSL_CTX* ctx, bool is_server) {
static SSL* wrap_fd_with_ssl(int fd, SSL_CTX* ctx, bool is_server, const char* hostname) {
SSL* ssl = SSL_new(ctx);
if (!ssl) {
log_message(LOG_LEVEL_ERROR, "Failed to create SSL object");
return NULL;
}
SSL_set_fd(ssl, fd);
// Enable hostname verification for client connections when a hostname is provided.
// Must be done before SSL_connect to take effect during the handshake.
if (!is_server && hostname) {
SSL_set1_host(ssl, hostname);
}
// Retry SSL_accept/SSL_connect on WANT_READ/WANT_WRITE (non-blocking handshake)
int ret;
do {
if (is_server)
ret = SSL_accept(ssl);
else
ret = SSL_connect(ssl);
if (ret <= 0) {
int ssl_err = SSL_get_error(ssl, ret);
if (ssl_err == SSL_ERROR_WANT_READ || ssl_err == SSL_ERROR_WANT_WRITE)
continue;
log_message(LOG_LEVEL_ERROR, "SSL %s failed", is_server ? "accept" : "connect");
log_ssl_errors();
SSL_free(ssl);
return NULL;
}
} while (ret <= 0);
return ssl;
}
@@ -117,7 +130,7 @@ struct tls_child_ctx {
static void tls_child_fn(int fd, void* arg) {
struct tls_child_ctx* ctx = (struct tls_child_ctx*)arg;
SSL* ssl = wrap_fd_with_ssl(fd, ctx->ssl_ctx, true);
SSL* ssl = wrap_fd_with_ssl(fd, ctx->ssl_ctx, true, NULL);
if (!ssl)
return;
io_set_ssl(ssl);
@@ -151,12 +164,16 @@ bool client_connect_tls(Client* client, char* host, int port, const char* cert_p
return false;
client->ssl_ctx = ctx;
SSL* ssl = wrap_fd_with_ssl(client->file_descriptor, ctx, false);
// Pass the server hostname for TLS hostname verification (SSL_set1_host
// is called inside wrap_fd_with_ssl before the handshake when ca_path is set).
const char* verify_host = ca_path ? host : NULL;
SSL* ssl = wrap_fd_with_ssl(client->file_descriptor, ctx, false, verify_host);
if (!ssl) {
SSL_CTX_free(ctx);
client->ssl_ctx = NULL;
return false;
}
client->ssl = ssl;
io_set_ssl(ssl);
return true;
+7 -1
View File
@@ -126,7 +126,13 @@ static void delete_extras_walk(const char* abs_path, const char* rel_path, Array
char* child_abs = path_cat((char*)abs_path, entry->d_name);
char* child_rel = path_cat((char*)rel_path, entry->d_name);
struct stat st;
if (stat(child_abs, &st) != 0) {
if (lstat(child_abs, &st) != 0) {
free(child_abs);
free(child_rel);
continue;
}
// Skip symlinks to prevent following them outside the destination tree
if (S_ISLNK(st.st_mode)) {
free(child_abs);
free(child_rel);
continue;
+9 -1
View File
@@ -37,15 +37,23 @@ def _generate_certs(cert_dir):
], check=True, capture_output=True)
# Server key + CSR + cert (signed by CA)
# Use a config file to include IP SAN 127.0.0.1 so hostname verification passes
san_config = os.path.join(cert_dir, "server_san.conf")
with open(san_config, "w") as f:
f.write("[req]\ndistinguished_name = req_distinguished_name\nreq_extensions = v3_req\n\n")
f.write("[req_distinguished_name]\nCN = localhost\n\n")
f.write("[v3_req]\nsubjectAltName = @alt_names\n\n")
f.write("[alt_names]\nDNS.1 = localhost\nIP.1 = 127.0.0.1\n")
subprocess.run([
"openssl", "req", "-newkey", "rsa:2048", "-nodes",
"-keyout", server_key, "-out", os.path.join(cert_dir, "server.csr"),
"-subj", "/CN=localhost",
"-subj", "/CN=localhost", "-config", san_config,
], check=True, capture_output=True)
subprocess.run([
"openssl", "x509", "-req", "-in", os.path.join(cert_dir, "server.csr"),
"-CA", ca_cert, "-CAkey", ca_key, "-CAcreateserial",
"-out", server_cert, "-days", "1",
"-extfile", san_config, "-extensions", "v3_req",
], check=True, capture_output=True)
# Client key + CSR + cert (signed by CA)
-6
View File
@@ -1,13 +1,11 @@
#include "test_array_list.h"
#include "test_chunk.h"
#include "test_client_cli.h"
#include "test_compression.h"
#include "test_config.h"
#include "test_data.h"
#include "test_delta.h"
#include "test_file.h"
#include "test_file_sendfile.h"
#include "test_fuzz_smoke.h"
#include "test_glob.h"
#include "test_log.h"
#include "test_metadata.h"
@@ -17,7 +15,6 @@
#include "test_queue.h"
#include "test_robustness.h"
#include "test_scanner.h"
#include "test_server.h"
#include "test_shared_utils.h"
#include "test_stress.h"
#include "test_transport_tcp.h"
@@ -56,9 +53,6 @@ int main() {
RUN_TEST(test_transport_tcp);
RUN_TEST(test_transport_ssh);
RUN_TEST(test_transport_tls);
RUN_TEST(test_client_cli);
RUN_TEST(test_server);
RUN_TEST(test_fuzz_smoke);
printf("\n\033[1;36m=== TEST SUMMARY ===\033[0m\n");
printf("Total Tests Run: %d\n", tests_run);
-80
View File
@@ -1,80 +0,0 @@
#include "test_client_cli.h"
#include "config.h"
#include "test_utils.h"
#include "utils.h"
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
/* Test basic config creation matching client_cli startup */
static void test_cli_default_config() {
Config* cfg = config_create(str_dup("1.0"), NULL, NULL, false, false, false, false, false, 5,
false, 0);
EXPECT_NOT_NULL(cfg);
EXPECT_NULL(cfg->send_directory);
EXPECT_NULL(cfg->receive_root_directory);
EXPECT_EQ_INT(cfg->compression_level, 5);
config_delete(cfg);
}
/* Test that --archive sets compression, multithreading, and metadata */
static void test_cli_archive_flags() {
Config* cfg = config_create(str_dup("1.0"), NULL, NULL, false, false, false, false, false, 5,
false, 0);
EXPECT_NOT_NULL(cfg);
cfg->use_compression = true;
cfg->use_multithreading = true;
cfg->use_metadata = true;
EXPECT_TRUE(cfg->use_compression);
EXPECT_TRUE(cfg->use_multithreading);
EXPECT_TRUE(cfg->use_metadata);
config_delete(cfg);
}
/* Test that --dry-run sets dry_run flag */
static void test_cli_dry_run() {
Config* cfg = config_create(str_dup("1.0"), NULL, NULL, false, false, false, false, false, 5,
false, 0);
cfg->dry_run = true;
EXPECT_TRUE(cfg->dry_run);
config_delete(cfg);
}
/* Test that --delete sets use_delete */
static void test_cli_delete_flag() {
Config* cfg = config_create(str_dup("1.0"), NULL, NULL, false, false, false, false, false, 5,
false, 0);
cfg->use_delete = true;
EXPECT_TRUE(cfg->use_delete);
config_delete(cfg);
}
/* Test exclude pattern handling */
static void test_cli_exclude_patterns() {
Config* cfg = config_create(str_dup("1.0"), NULL, NULL, false, false, false, false, false, 5,
false, 0);
EXPECT_NOT_NULL(cfg);
cfg->exclude_patterns = malloc(2 * sizeof(char*));
EXPECT_NOT_NULL(cfg->exclude_patterns);
cfg->exclude_patterns[0] = str_dup("*.log");
cfg->exclude_patterns[1] = str_dup("tmp/");
cfg->exclude_count = 2;
EXPECT_EQ_STR(cfg->exclude_patterns[0], "*.log");
EXPECT_EQ_STR(cfg->exclude_patterns[1], "tmp/");
EXPECT_EQ_INT(cfg->exclude_count, 2);
config_delete(cfg);
}
void test_client_cli() {
test_cli_default_config();
test_cli_archive_flags();
test_cli_dry_run();
test_cli_delete_flag();
test_cli_exclude_patterns();
}
-6
View File
@@ -1,6 +0,0 @@
#ifndef TEST_CLIENT_CLI_H
#define TEST_CLIENT_CLI_H
void test_client_cli();
#endif
-109
View File
@@ -1,16 +1,10 @@
#include "test_config.h"
#include "config.h"
#include "multiprocessing.h"
#include "protocol.h"
#include "queue.h"
#include "test_utils.h"
#include "utils.h"
#include <stdlib.h>
#include <string.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <sys/wait.h>
#include <unistd.h>
static void test_config_lifecycle() {
Config* cfg = config_create(str_dup("1.0"), str_dup("/src"), str_dup("/dst"), true, true, false,
@@ -95,104 +89,6 @@ static void test_pipeline_receiver_lifecycle() {
pipeline_context_receiver_destroy(pcr);
}
/* Test config_send/config_receive round-trip over a socketpair */
static void test_config_send_receive() {
Config* send_cfg = config_create(str_dup(PROTOCOL_VERSION), str_dup("/send/src"),
str_dup("/send/dst"), true, true, true, true, true, 5, false,
1024);
EXPECT_NOT_NULL(send_cfg);
int p[2];
EXPECT_EQ_INT(socketpair(AF_UNIX, SOCK_STREAM, 0, p), 0);
io_set_fds(p[0], p[1]);
io_set_bwlimit(0);
pid_t pid = fork();
if (pid == 0) {
close(p[1]);
io_set_fds(p[0], p[0]);
Config* recv_cfg = config_receive(p[0]);
close(p[0]);
bool ok = true;
if (!recv_cfg) ok = false;
else {
if (strcmp(recv_cfg->version, PROTOCOL_VERSION) != 0) ok = false;
if (strcmp(recv_cfg->send_directory, "/send/src") != 0) ok = false;
if (strcmp(recv_cfg->receive_root_directory, "/send/dst") != 0) ok = false;
if (!recv_cfg->save_to_disk) ok = false;
if (!recv_cfg->use_multithreading) ok = false;
if (!recv_cfg->use_chunk_serialization) ok = false;
if (recv_cfg->compression_level != 5) ok = false;
if (recv_cfg->chunk_size != 1024) ok = false;
}
config_delete(recv_cfg);
_exit(ok ? 0 : 1);
} else {
close(p[0]);
io_set_fds(p[1], p[1]);
bool sent = config_send(p[1], send_cfg);
close(p[1]);
int status;
waitpid(pid, &status, 0);
config_delete(send_cfg);
EXPECT_TRUE(sent);
EXPECT_TRUE(WIFEXITED(status) && WEXITSTATUS(status) == 0);
}
}
/* Test config_send/receive version mismatch rejection */
static void test_config_send_receive_version_mismatch() {
Config* cfg = config_create(str_dup("0.0"), str_dup("/src"), str_dup("/dst"), false, false, false,
false, false, 0, false, 0);
int p[2];
EXPECT_EQ_INT(socketpair(AF_UNIX, SOCK_STREAM, 0, p), 0);
io_set_fds(p[0], p[1]);
io_set_bwlimit(0);
pid_t pid = fork();
if (pid == 0) {
close(p[1]);
io_set_fds(p[0], p[0]);
Config* recv = config_receive(p[0]);
close(p[0]);
_exit(recv == NULL ? 0 : 1);
} else {
close(p[0]);
io_set_fds(p[1], p[1]);
bool sent = config_send(p[1], cfg);
close(p[1]);
int status;
waitpid(pid, &status, 0);
config_delete(cfg);
/* config_send should return false because config_receive sends STATUS_ERROR */
EXPECT_FALSE(sent);
EXPECT_TRUE(WIFEXITED(status) && WEXITSTATUS(status) == 0);
}
}
/* Test is_remote_dest edge cases */
static void test_is_remote_dest() {
EXPECT_TRUE(is_remote_dest("user@host:/path"));
EXPECT_TRUE(is_remote_dest("host:/path"));
EXPECT_TRUE(is_remote_dest("user@192.168.1.1:/remote/path"));
EXPECT_FALSE(is_remote_dest(NULL));
EXPECT_FALSE(is_remote_dest(""));
EXPECT_FALSE(is_remote_dest(":"));
EXPECT_FALSE(is_remote_dest("/local/path"));
EXPECT_FALSE(is_remote_dest("relative/path"));
EXPECT_TRUE(is_remote_dest("C:/windows/path"));
EXPECT_FALSE(is_remote_dest("noslash"));
EXPECT_FALSE(is_remote_dest("/"));
EXPECT_TRUE(is_remote_dest("host:"));
EXPECT_TRUE(is_remote_dest("user@host:"));
}
void test_config() {
test_config_lifecycle();
test_config_ssh_dest();
@@ -200,9 +96,4 @@ void test_config() {
test_config_ssh_dest_no_user();
test_pipeline_sender_lifecycle();
test_pipeline_receiver_lifecycle();
if (!is_running_under_valgrind()) {
test_config_send_receive();
test_config_send_receive_version_mismatch();
}
test_is_remote_dest();
}
+5 -130
View File
@@ -261,132 +261,6 @@ static void test_file_metadata_create() {
unlink("test_meta_file.txt");
}
static void test_file_save_to_disk_path_traversal() {
File* f = file_create("../etc/passwd");
EXPECT_NOT_NULL(f);
const char* content = "should not save";
f->data->data = malloc(strlen(content));
EXPECT_NOT_NULL(f->data->data);
memcpy(f->data->data, content, strlen(content));
f->data->size = strlen(content);
EXPECT_FALSE(file_save_to_disk("/tmp", f, NULL));
file_destroy(f);
}
static void test_file_save_to_disk_deep_traversal() {
File* f = file_create("subdir/../../etc/passwd");
EXPECT_NOT_NULL(f);
const char* content = "should not save";
f->data->data = malloc(strlen(content));
EXPECT_NOT_NULL(f->data->data);
memcpy(f->data->data, content, strlen(content));
f->data->size = strlen(content);
EXPECT_FALSE(file_save_to_disk("/tmp", f, NULL));
file_destroy(f);
}
static void test_file_send_single_calls_compression() {
const char* content = "Hello, Compressed File Transfer!";
size_t len = strlen(content);
File* file = file_create("test_send_comp.txt");
EXPECT_NOT_NULL(file);
file->data->data = malloc(len);
EXPECT_NOT_NULL(file->data->data);
memcpy(file->data->data, content, len);
file->data->size = len;
Config* cfg = config_create(str_dup(PROTOCOL_VERSION), str_dup("/tmp"), str_dup("/tmp"), false,
false, false, true, false, 3, false, 0);
int p[2];
EXPECT_EQ_INT(pipe(p), 0);
io_set_fds(p[0], p[1]);
io_set_bwlimit(0);
pid_t pid = fork();
if (pid == 0) {
close(p[1]);
File* received = file_receive(cfg, p[0]);
close(p[0]);
bool ok = true;
if (!received) ok = false;
else {
if (strcmp(received->path, "test_send_comp.txt") != 0) ok = false;
if (!received->data || received->data->size != len) ok = false;
else if (memcmp(received->data->data, content, len) != 0) ok = false;
}
file_destroy(received);
config_delete(cfg);
_exit(ok ? 0 : 1);
} else {
close(p[0]);
bool sent = file_send_single_calls(file, p[1], false, 3, true);
close(p[1]);
int status;
waitpid(pid, &status, 0);
file_destroy(file);
config_delete(cfg);
EXPECT_TRUE(sent);
EXPECT_TRUE(WIFEXITED(status) && WEXITSTATUS(status) == 0);
}
}
static void test_file_send_single_calls_metadata() {
const char* content = "File with metadata";
size_t len = strlen(content);
EXPECT_TRUE(to_disk("test_meta_send.txt", content, len));
struct stat st;
EXPECT_EQ_INT(stat("test_meta_send.txt", &st), 0);
File* file = file_create("test_meta_send.txt");
EXPECT_NOT_NULL(file);
file->data->size = len;
file->data->data = malloc(len);
EXPECT_NOT_NULL(file->data->data);
memcpy(file->data->data, content, len);
file->metadata = file_metadata_create(&st);
EXPECT_NOT_NULL(file->metadata);
Config* cfg = config_create(str_dup(PROTOCOL_VERSION), str_dup("/tmp"), str_dup("/tmp"), false,
false, false, false, true, 0, false, 0);
int p[2];
EXPECT_EQ_INT(pipe(p), 0);
io_set_fds(p[0], p[1]);
io_set_bwlimit(0);
pid_t pid = fork();
if (pid == 0) {
close(p[1]);
File* received = file_receive(cfg, p[0]);
close(p[0]);
bool ok = true;
if (!received) ok = false;
else {
if (strcmp(received->path, "test_meta_send.txt") != 0) ok = false;
if (!received->data || received->data->size != len) ok = false;
else if (memcmp(received->data->data, content, len) != 0) ok = false;
if (!received->metadata) ok = false;
}
file_destroy(received);
config_delete(cfg);
_exit(ok ? 0 : 1);
} else {
close(p[0]);
bool sent = file_send_single_calls(file, p[1], true, 0, true);
close(p[1]);
int status;
waitpid(pid, &status, 0);
file_destroy(file);
config_delete(cfg);
unlink("test_meta_send.txt");
EXPECT_TRUE(sent);
EXPECT_TRUE(WIFEXITED(status) && WEXITSTATUS(status) == 0);
}
}
void test_file() {
test_file_create();
test_file_destroy_null();
@@ -397,13 +271,14 @@ void test_file() {
test_to_disk_basic();
test_to_disk_creates_dirs();
test_file_content_to_buffer();
test_file_save_to_disk_path_traversal();
test_file_save_to_disk_deep_traversal();
if (!is_running_under_valgrind()) {
// Fork tests are skipped under valgrind because the parent process runs
// orders of magnitude slower than the child (parent is instrumented, child
// is not), which causes pipe-based protocol handshake timeouts. The parent
// process itself has zero valgrind errors -- the failures are all in the
// forked children where inherited allocations are reported as leaks.
test_file_send_receive();
test_file_send_no_path();
test_file_send_single_calls_compression();
test_file_send_single_calls_metadata();
}
test_file_metadata_create();
}
-158
View File
@@ -1,158 +0,0 @@
#include "test_fuzz_smoke.h"
#include "chunk.h"
#include "compression.h"
#include "data.h"
#include "delta.h"
#include "metadata.h"
#include "test_utils.h"
#include "utils.h"
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
/* Smoke test for chunk_deserialize fuzz target */
static void test_fuzz_chunk_deserialize() {
File* file = file_create("fuzz_test.txt");
EXPECT_NOT_NULL(file);
const char* content = "fuzz data";
file->data->data = malloc(strlen(content));
EXPECT_NOT_NULL(file->data->data);
memcpy(file->data->data, content, strlen(content));
file->data->size = strlen(content);
File* chunk_files[] = {file};
Chunk* chunk = chunk_create(chunk_files, 1);
EXPECT_NOT_NULL(chunk);
Data* serialized = chunk_serialize(chunk, false);
EXPECT_NOT_NULL(serialized);
Chunk* deserialized = chunk_deserialize(serialized, false);
EXPECT_NOT_NULL(deserialized);
EXPECT_EQ_INT(deserialized->element_count, 1);
chunk_destroy(deserialized);
data_destroy(serialized);
chunk_destroy(chunk);
}
/* Smoke test for compress/decompress fuzz target */
static void test_fuzz_compress_decompress() {
/* Must use malloc'd buffers since data_destroy calls free(data->data) */
const char* test_data = "Hello, compression fuzzing!";
size_t len = strlen(test_data);
void* buf = malloc(len);
EXPECT_NOT_NULL(buf);
memcpy(buf, test_data, len);
Data* original = data_create(buf, len);
EXPECT_NOT_NULL(original);
Data* compressed = data_compress(original, 3);
EXPECT_NOT_NULL(compressed);
Data* decompressed = data_decompress(compressed);
EXPECT_NOT_NULL(decompressed);
EXPECT_EQ_INT((int)decompressed->size, (int)len);
EXPECT_EQ_INT(memcmp(decompressed->data, test_data, len), 0);
data_destroy(decompressed);
data_destroy(compressed);
data_destroy(original);
}
/* Smoke test for delta_deserialize fuzz target */
static void test_fuzz_delta_deserialize() {
const char* old_data_str = "Hello, World!";
const char* new_data_str = "Hello, Delta!";
size_t old_len = strlen(old_data_str);
size_t new_len = strlen(new_data_str);
DeltaSignature* sig = delta_signature_create((void*)old_data_str, old_len, 64);
EXPECT_NOT_NULL(sig);
Delta* delta = delta_compute((void*)new_data_str, new_len, sig, 64);
EXPECT_NOT_NULL(delta);
Data* serialized = delta_serialize(delta);
EXPECT_NOT_NULL(serialized);
Delta* deserialized = delta_deserialize(serialized);
EXPECT_NOT_NULL(deserialized);
delta_destroy(deserialized);
data_destroy(serialized);
delta_destroy(delta);
delta_signature_destroy(sig);
}
/* Smoke test for metadata_from_buf fuzz target */
static void test_fuzz_metadata_from_buf() {
EXPECT_TRUE(to_disk("fuzz_meta_test.txt", "metadata test", 13));
struct stat st;
EXPECT_EQ_INT(stat("fuzz_meta_test.txt", &st), 0);
FileMetadata* meta = file_metadata_create(&st);
EXPECT_NOT_NULL(meta);
size_t meta_buf_size = sizeof(int32_t) + FILE_METADATA_WIRE_SIZE;
char* meta_buf = malloc(meta_buf_size);
EXPECT_NOT_NULL(meta_buf);
char* meta_ptr = meta_buf;
metadata_to_buf(&meta_ptr, meta);
char* buf_copy = meta_buf;
FileMetadata* deserialized = metadata_from_buf(&buf_copy);
EXPECT_NOT_NULL(deserialized);
EXPECT_EQ_INT((int)deserialized->mode, (int)meta->mode);
EXPECT_EQ_INT((int)deserialized->mtime_sec, (int)meta->mtime_sec);
file_metadata_destroy(deserialized);
free(meta_buf);
file_metadata_destroy(meta);
unlink("fuzz_meta_test.txt");
}
/* Smoke test for delta_signature_deserialize fuzz target */
static void test_fuzz_delta_signature_deserialize() {
const char* data_str = "Test data for signature";
size_t len = strlen(data_str);
DeltaSignature* sig = delta_signature_create((void*)data_str, len, 64);
EXPECT_NOT_NULL(sig);
Data* serialized = delta_signature_serialize(sig);
EXPECT_NOT_NULL(serialized);
DeltaSignature* deserialized = delta_signature_deserialize(serialized);
EXPECT_NOT_NULL(deserialized);
EXPECT_EQ_INT((int)deserialized->block_size, 64);
delta_signature_destroy(deserialized);
data_destroy(serialized);
delta_signature_destroy(sig);
}
/* Smoke test for glob_match fuzz target */
static void test_fuzz_glob_match() {
EXPECT_TRUE(glob_match("*.txt", "file.txt"));
EXPECT_FALSE(glob_match("*.txt", "file.TXT"));
EXPECT_FALSE(glob_match("*.txt", "file.c"));
EXPECT_TRUE(glob_match("data?", "data1"));
EXPECT_TRUE(glob_match("data?", "dataX"));
EXPECT_FALSE(glob_match("data?", "data12"));
EXPECT_TRUE(glob_match("src/**/*.c", "src/main.c"));
EXPECT_TRUE(glob_match("**/test*.py", "src/tests/test_foo.py"));
EXPECT_FALSE(glob_match("*.md", "readme.txt"));
}
void test_fuzz_smoke() {
test_fuzz_chunk_deserialize();
test_fuzz_compress_decompress();
test_fuzz_delta_deserialize();
test_fuzz_metadata_from_buf();
test_fuzz_delta_signature_deserialize();
test_fuzz_glob_match();
}
-6
View File
@@ -1,6 +0,0 @@
#ifndef TEST_FUZZ_SMOKE_H
#define TEST_FUZZ_SMOKE_H
void test_fuzz_smoke();
#endif
-83
View File
@@ -1,18 +1,10 @@
#include "test_multiprocessing.h"
#include "multiprocessing.h"
#include "config.h"
#include "protocol.h"
#include "queue.h"
#include "utils.h"
#include "test_utils.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <threads.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <sys/wait.h>
#include <unistd.h>
/* Test pipeline_context_sender_create/destroy with valid arguments */
static void test_sender_create_destroy() {
@@ -100,85 +92,10 @@ static void test_receiver_fd_zero() {
pipeline_context_receiver_destroy(ctx);
}
/* Test that receive_thread completes cleanly when sent FINISHED immediately */
static void test_receive_thread_finished() {
Config* cfg = config_create(str_dup(PROTOCOL_VERSION), str_dup("/src"), str_dup("/tmp/dst"),
true, false, false, false, false, 0, false, 0);
int p[2];
EXPECT_EQ_INT(socketpair(AF_UNIX, SOCK_STREAM, 0, p), 0);
io_set_fds(p[0], p[1]);
io_set_bwlimit(0);
pid_t pid = fork();
if (pid == 0) {
close(p[1]);
io_set_fds(p[0], p[0]);
Queue* q = queue_create(5, file_destroy);
EXPECT_NOT_NULL(q);
PipelineContextReceiver* ctx = pipeline_context_receiver_create(cfg, q, p[0]);
EXPECT_NOT_NULL(ctx);
int ret = receive_thread(ctx);
pipeline_context_receiver_destroy(ctx);
close(p[0]);
_exit(ret == thrd_success ? 0 : 1);
} else {
close(p[0]);
io_set_fds(p[1], p[1]);
send_status(p[1], STATUS_FINISHED);
int status;
waitpid(pid, &status, 0);
close(p[1]);
config_delete(cfg);
EXPECT_TRUE(WIFEXITED(status) && WEXITSTATUS(status) == 0);
}
}
/* Test that write_thread completes when queue signals done */
static void test_write_thread_done() {
Config* cfg = config_create(str_dup(PROTOCOL_VERSION), str_dup("/src"), str_dup("/tmp/dst"),
false, false, false, false, false, 0, false, 0);
Queue* q = queue_create(5, file_destroy);
EXPECT_NOT_NULL(q);
PipelineContextReceiver* ctx = pipeline_context_receiver_create(cfg, q, 0);
EXPECT_NOT_NULL(ctx);
/* Mark as done so write_thread exits immediately */
ctx->receiver_done = true;
thrd_t writer;
int ret = thrd_create(&writer, write_thread, ctx);
EXPECT_EQ_INT(ret, thrd_success);
int result;
thrd_join(writer, &result);
EXPECT_EQ_INT(result, thrd_success);
/* Clean up manually (pipeline_context_receiver_destroy would double-free) */
mtx_destroy(&ctx->mutex);
cnd_destroy(&ctx->condition_not_full);
cnd_destroy(&ctx->condition_not_empty);
free(ctx);
queue_destroy(q);
config_delete(cfg);
}
void test_multiprocessing() {
test_sender_create_destroy();
test_receiver_create_destroy();
test_sender_queue_capacities();
test_sender_zero_capacity();
test_receiver_fd_zero();
if (!is_running_under_valgrind()) {
test_receive_thread_finished();
}
test_write_thread_done();
}
+12 -12
View File
@@ -19,7 +19,7 @@ static void test_scanner_single_file() {
create_test_file(file1, content1);
DirectoryScanner* scanner =
directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0, 0, false, false, false, false);
directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0, 0);
EXPECT_NOT_NULL(scanner);
Chunk* chunk = directory_scanner_next(scanner);
@@ -48,7 +48,7 @@ static void test_scanner_multiple_files() {
create_test_file(file2, content2);
DirectoryScanner* scanner =
directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0, 0, false, false, false, false);
directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0, 0);
EXPECT_NOT_NULL(scanner);
const Chunk* chunk = directory_scanner_next(scanner);
@@ -88,7 +88,7 @@ static void test_scanner_subdirectory() {
create_test_file(sub_file, content);
DirectoryScanner* scanner =
directory_scanner_create((char*)root, false, 0, NULL, 0, NULL, 0, 0, 0, 0, false, false, false, false);
directory_scanner_create((char*)root, false, 0, NULL, 0, NULL, 0, 0, 0, 0);
EXPECT_NOT_NULL(scanner);
int total_files = 0;
@@ -112,7 +112,7 @@ static void test_scanner_empty_directory() {
EXPECT_EQ_INT(mkdir(dir, 0755), 0);
DirectoryScanner* scanner =
directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0, 0, false, false, false, false);
directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0, 0);
EXPECT_NOT_NULL(scanner);
const Chunk* chunk = directory_scanner_next(scanner);
@@ -136,7 +136,7 @@ static void test_scanner_exclude_pattern() {
char* exclude[] = {"*.tmp"};
DirectoryScanner* scanner =
directory_scanner_create((char*)dir, false, 0, exclude, 1, NULL, 0, 0, 0, 0, false, false, false, false);
directory_scanner_create((char*)dir, false, 0, exclude, 1, NULL, 0, 0, 0, 0);
EXPECT_NOT_NULL(scanner);
Chunk* chunk = directory_scanner_next(scanner);
@@ -169,7 +169,7 @@ static void test_scanner_exclude_subdirectory() {
char* exclude[] = {"*.tmp"};
DirectoryScanner* scanner =
directory_scanner_create((char*)root, false, 0, exclude, 1, NULL, 0, 0, 0, 0, false, false, false, false);
directory_scanner_create((char*)root, false, 0, exclude, 1, NULL, 0, 0, 0, 0);
EXPECT_NOT_NULL(scanner);
int total = 0;
@@ -207,7 +207,7 @@ static void test_scanner_include_and_exclude() {
char* exclude[] = {"*.bak"};
char* include[] = {"*.txt", "*.log"};
DirectoryScanner* scanner =
directory_scanner_create((char*)dir, false, 0, exclude, 1, include, 2, 0, 0, 0, false, false, false, false);
directory_scanner_create((char*)dir, false, 0, exclude, 1, include, 2, 0, 0, 0);
EXPECT_NOT_NULL(scanner);
Chunk* chunk = directory_scanner_next(scanner);
@@ -244,7 +244,7 @@ static void test_scanner_max_size() {
/* max_size = 10 — only files <= 10 bytes */
DirectoryScanner* scanner =
directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 10, 0, 0, false, false, false, false);
directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 10, 0, 0);
EXPECT_NOT_NULL(scanner);
Chunk* chunk = directory_scanner_next(scanner);
@@ -272,7 +272,7 @@ static void test_scanner_min_size() {
/* min_size = 1 — only files >= 1 byte */
DirectoryScanner* scanner =
directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 1, 0, false, false, false, false);
directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 1, 0);
EXPECT_NOT_NULL(scanner);
Chunk* chunk = directory_scanner_next(scanner);
@@ -302,7 +302,7 @@ static void test_scanner_size_range() {
/* Only files between 3 and 20 bytes */
DirectoryScanner* scanner =
directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 20, 3, 0, false, false, false, false);
directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 20, 3, 0);
EXPECT_NOT_NULL(scanner);
Chunk* chunk = directory_scanner_next(scanner);
@@ -338,7 +338,7 @@ static void test_scanner_mixed_patterns() {
char* exclude[] = {"*.bak"};
char* include[] = {"*.txt"};
DirectoryScanner* scanner =
directory_scanner_create((char*)dir, false, 0, exclude, 1, include, 1, 10, 3, 0, false, false, false, false);
directory_scanner_create((char*)dir, false, 0, exclude, 1, include, 1, 10, 3, 0);
EXPECT_NOT_NULL(scanner);
Chunk* chunk = directory_scanner_next(scanner);
@@ -369,7 +369,7 @@ static void test_scanner_no_patterns() {
create_test_file(f2, "second");
DirectoryScanner* scanner =
directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0, 0, false, false, false, false);
directory_scanner_create((char*)dir, false, 0, NULL, 0, NULL, 0, 0, 0, 0);
EXPECT_NOT_NULL(scanner);
Chunk* chunk = directory_scanner_next(scanner);
-151
View File
@@ -1,151 +0,0 @@
#include "test_server.h"
#include "config.h"
#include "file.h"
#include "protocol.h"
#include "test_utils.h"
#include "utils.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/socket.h>
#include <sys/un.h>
#include <sys/wait.h>
#include <unistd.h>
/* Include server.c but rename main to avoid conflict with test runner's main */
#define main server_main_
#include "server.c"
#undef main
/* Test receive_files with immediate FINISHED status */
static void test_receive_files_finished() {
Config* cfg = config_create(str_dup(PROTOCOL_VERSION), str_dup("/src"), str_dup("/tmp/dst"),
false, false, false, false, false, 0, false, 0);
EXPECT_NOT_NULL(cfg);
/* Use socketpair for full-duplex communication */
int p[2];
EXPECT_EQ_INT(socketpair(AF_UNIX, SOCK_STREAM, 0, p), 0);
io_set_fds(p[0], p[1]);
io_set_bwlimit(0);
pid_t pid = fork();
if (pid == 0) {
/* Child: run receive_files - needs both directions */
close(p[1]);
io_set_fds(p[0], p[0]);
int ret = receive_files(cfg, p[0]);
close(p[0]);
config_delete(cfg);
_exit(ret == 0 ? 0 : 1);
} else {
/* Parent: send FINISHED */
close(p[0]);
io_set_fds(p[1], p[1]);
send_status(p[1], STATUS_FINISHED);
Status resp;
receive_status(p[1], &resp);
int status;
waitpid(pid, &status, 0);
close(p[1]);
config_delete(cfg);
EXPECT_EQ_INT(resp, STATUS_OK);
EXPECT_TRUE(WIFEXITED(status) && WEXITSTATUS(status) == 0);
}
}
/* Test receive_files with STATUS_NEXT + file data */
static void test_receive_files_single_file() {
const char* content = "Hello from server test!";
size_t len = strlen(content);
Config* cfg = config_create(str_dup(PROTOCOL_VERSION), str_dup("/src"), str_dup("/tmp/dst"),
false, false, false, false, false, 0, false, 0);
EXPECT_NOT_NULL(cfg);
int p[2];
EXPECT_EQ_INT(socketpair(AF_UNIX, SOCK_STREAM, 0, p), 0);
io_set_fds(p[0], p[1]);
io_set_bwlimit(0);
pid_t pid = fork();
if (pid == 0) {
close(p[1]);
io_set_fds(p[0], p[0]);
int ret = receive_files(cfg, p[0]);
close(p[0]);
config_delete(cfg);
_exit(ret == 0 ? 0 : 1);
} else {
close(p[0]);
io_set_fds(p[1], p[1]);
send_status(p[1], STATUS_NEXT);
File* file = file_create("test_server_file.txt");
EXPECT_NOT_NULL(file);
file->data->data = malloc(len);
EXPECT_NOT_NULL(file->data->data);
memcpy(file->data->data, content, len);
file->data->size = len;
send_str(p[1], file->path);
send_data(p[1], file->data);
file_destroy(file);
send_status(p[1], STATUS_FINISHED);
Status resp;
receive_status(p[1], &resp);
int status;
waitpid(pid, &status, 0);
close(p[1]);
config_delete(cfg);
EXPECT_EQ_INT(resp, STATUS_OK);
EXPECT_TRUE(WIFEXITED(status) && WEXITSTATUS(status) == 0);
}
}
/* Test receive_files with STATUS_ABORT */
static void test_receive_files_abort() {
Config* cfg = config_create(str_dup(PROTOCOL_VERSION), str_dup("/src"), str_dup("/tmp/dst"),
false, false, false, false, false, 0, false, 0);
EXPECT_NOT_NULL(cfg);
int p[2];
EXPECT_EQ_INT(socketpair(AF_UNIX, SOCK_STREAM, 0, p), 0);
io_set_fds(p[0], p[1]);
io_set_bwlimit(0);
pid_t pid = fork();
if (pid == 0) {
close(p[1]);
io_set_fds(p[0], p[0]);
int ret = receive_files(cfg, p[0]);
close(p[0]);
config_delete(cfg);
_exit(ret == -1 ? 0 : 1);
} else {
close(p[0]);
io_set_fds(p[1], p[1]);
send_status(p[1], STATUS_ABORT);
int status;
waitpid(pid, &status, 0);
close(p[1]);
config_delete(cfg);
EXPECT_TRUE(WIFEXITED(status) && WEXITSTATUS(status) == 0);
}
}
void test_server() {
if (!is_running_under_valgrind()) {
test_receive_files_finished();
test_receive_files_single_file();
test_receive_files_abort();
}
}
-6
View File
@@ -1,6 +0,0 @@
#ifndef TEST_SERVER_H
#define TEST_SERVER_H
void test_server();
#endif
-42
View File
@@ -1,8 +1,6 @@
#include "test_transport_tcp.h"
#include "protocol.h"
#include "test_utils.h"
#include "transport_tcp.h"
#include <string.h>
#include <unistd.h>
static void test_server_create_ephemeral() {
@@ -37,49 +35,9 @@ static void test_client_delete_null() {
client_delete(c);
}
/* Test tcp_set_timeouts with valid values */
static void test_tcp_set_timeouts() {
tcp_set_timeouts(0, 0);
tcp_set_timeouts(60, 20);
tcp_set_timeouts(-1, -1);
EXPECT_TRUE(true);
}
/* Test client_connect with an invalid host (should fail gracefully) */
static void test_client_connect_invalid_host() {
Client* c = client_create();
EXPECT_NOT_NULL(c);
bool ok = client_connect(c, "10.255.255.1", 9999);
EXPECT_FALSE(ok);
client_disconnect(c);
client_delete(c);
}
/* Test server_delete with double-delete safety */
static void test_server_delete_double() {
Server* s = server_create(0);
EXPECT_NOT_NULL(s);
server_delete(&s);
EXPECT_NULL(s);
server_delete(&s);
EXPECT_NULL(s);
}
/* Test client_disconnect then client_delete */
static void test_client_disconnect_delete() {
Client* c = client_create();
EXPECT_NOT_NULL(c);
client_disconnect(c);
client_delete(c);
}
void test_transport_tcp() {
test_server_create_ephemeral();
test_server_delete_null();
test_client_create();
test_client_delete_null();
test_tcp_set_timeouts();
test_client_connect_invalid_host();
test_server_delete_double();
test_client_disconnect_delete();
}
-26
View File
@@ -1,10 +1,7 @@
#include "test_transport_tls.h"
#include "protocol.h"
#include "test_utils.h"
#include "transport_tcp.h"
#include "transport_tls.h"
#include <string.h>
#include <unistd.h>
static void test_tls_global_init() {
bool ok = tls_global_init();
@@ -21,30 +18,7 @@ static void test_server_create_tls_without_certs() {
EXPECT_NULL(s);
}
/* Test client_connect_tls with no server listening (should fail gracefully) */
static void test_client_connect_tls_fail() {
Client* c = client_create();
EXPECT_NOT_NULL(c);
bool ok = client_connect_tls(c, "127.0.0.1", 1, NULL, NULL, NULL);
EXPECT_FALSE(ok);
client_disconnect(c);
client_delete(c);
}
/* Test server_create_tls with empty cert paths (should fail gracefully) */
static void test_server_create_tls_empty_certs() {
Server* s = server_create(0);
EXPECT_NOT_NULL(s);
bool ok = server_create_tls(s, "", "", NULL);
EXPECT_FALSE(ok);
EXPECT_NULL(s->ssl_ctx);
server_delete(&s);
EXPECT_NULL(s);
}
void test_transport_tls() {
test_tls_global_init();
test_server_create_tls_without_certs();
test_client_connect_tls_fail();
test_server_create_tls_empty_certs();
}