Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 95be50fead |
+65
-54
@@ -105,71 +105,27 @@ static int read_patterns_from_file(const char* filepath, char*** patterns, int*
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool validate_config(Config* config) {
|
|
||||||
if (!config->send_directory || !config->receive_root_directory) {
|
|
||||||
fprintf(stderr, "Error: source and destination directories are required\n");
|
|
||||||
print_usage();
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (config->use_sendfile && (config->use_chunk_serialization || config->use_compression)) {
|
|
||||||
fprintf(stderr, "Error: -f/--sendfile cannot be combined with -c (compression) or -s "
|
|
||||||
"(chunk serialization)\n");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (config->transport == TRANSPORT_SSH && config->use_sendfile) {
|
|
||||||
fprintf(stderr, "Error: -f/--sendfile is not supported with SSH transport\n");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (config->use_incremental && config->use_chunk_serialization) {
|
|
||||||
fprintf(stderr, "Error: --incremental is not supported with -s (chunk serialization)\n");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (config->use_incremental && !config->use_metadata) {
|
|
||||||
log_message(LOG_LEVEL_INFO, "Enabling metadata preservation for --incremental");
|
|
||||||
config->use_metadata = true;
|
|
||||||
}
|
|
||||||
if (config->use_delta && !config->use_incremental) {
|
|
||||||
fprintf(stderr, "Error: --delta requires --incremental\n");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (config->use_delta && config->use_chunk_serialization) {
|
|
||||||
fprintf(stderr, "Error: --delta cannot be combined with -s (chunk serialization)\n");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (config->use_delta && config->use_sendfile) {
|
|
||||||
fprintf(stderr, "Error: --delta cannot be combined with -f (sendfile)\n");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (config->use_delta && !config->use_metadata) {
|
|
||||||
log_message(LOG_LEVEL_INFO, "Enabling metadata preservation for --delta");
|
|
||||||
config->use_metadata = true;
|
|
||||||
}
|
|
||||||
if (config->use_tls) {
|
|
||||||
if (!config->tls_cert || !config->tls_key) {
|
|
||||||
fprintf(stderr, "Error: --tls requires --cert and --key\n");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
tls_global_init();
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
int main(int argc, char* argv[]) {
|
int main(int argc, char* argv[]) {
|
||||||
const char* env_source = getenv("FASTSYNC_SOURCE_DIR");
|
const char* env_source = getenv("FASTSYNC_SOURCE_DIR");
|
||||||
const char* env_dest = getenv("FASTSYNC_DEST_DIR");
|
const char* env_dest = getenv("FASTSYNC_DEST_DIR");
|
||||||
const char* env_save = getenv("FASTSYNC_SAVE_TO_DISK");
|
const char* env_save = getenv("FASTSYNC_SAVE_TO_DISK");
|
||||||
|
|
||||||
|
bool save_to_disk = false;
|
||||||
|
if (env_save && (strcmp(env_save, "true") == 0 || strcmp(env_save, "1") == 0)) {
|
||||||
|
save_to_disk = true;
|
||||||
|
}
|
||||||
|
|
||||||
int exit_code = 0;
|
int exit_code = 0;
|
||||||
Config* config = NULL;
|
Config* config = NULL;
|
||||||
bool config_owned_by_pipeline = false;
|
bool config_owned_by_pipeline = false;
|
||||||
|
|
||||||
config = config_create();
|
char* config_version = str_dup(PROTOCOL_VERSION);
|
||||||
if (!config) {
|
if (!config_version) {
|
||||||
exit_code = 1;
|
exit_code = 1;
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
if (env_save && (strcmp(env_save, "true") == 0 || strcmp(env_save, "1") == 0))
|
config = config_create(config_version, NULL, NULL, save_to_disk, false, false, false, false, 5,
|
||||||
config->save_to_disk = true;
|
false, 0);
|
||||||
|
|
||||||
int positional_args[2];
|
int positional_args[2];
|
||||||
int positional_count = 0;
|
int positional_count = 0;
|
||||||
@@ -385,6 +341,7 @@ int main(int argc, char* argv[]) {
|
|||||||
config->send_directory = str_dup(argv[positional_args[0]]);
|
config->send_directory = str_dup(argv[positional_args[0]]);
|
||||||
config->receive_root_directory = str_dup(argv[positional_args[1]]);
|
config->receive_root_directory = str_dup(argv[positional_args[1]]);
|
||||||
config->save_to_disk = true;
|
config->save_to_disk = true;
|
||||||
|
|
||||||
config_parse_ssh_dest(config);
|
config_parse_ssh_dest(config);
|
||||||
} else if (positional_count == 1) {
|
} else if (positional_count == 1) {
|
||||||
fprintf(stderr, "Error: missing destination argument\n");
|
fprintf(stderr, "Error: missing destination argument\n");
|
||||||
@@ -398,10 +355,64 @@ int main(int argc, char* argv[]) {
|
|||||||
config->receive_root_directory = str_dup((char*)env_dest);
|
config->receive_root_directory = str_dup((char*)env_dest);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!validate_config(config)) {
|
if (!config->send_directory || !config->receive_root_directory) {
|
||||||
|
fprintf(stderr, "Error: source and destination directories are required\n");
|
||||||
|
print_usage();
|
||||||
exit_code = 1;
|
exit_code = 1;
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
if (config->use_sendfile && (config->use_chunk_serialization || config->use_compression)) {
|
||||||
|
fprintf(stderr, "Error: -f/--sendfile cannot be combined with -c (compression) or -s (chunk "
|
||||||
|
"serialization)\n");
|
||||||
|
exit_code = 1;
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (config->transport == TRANSPORT_SSH && config->use_sendfile) {
|
||||||
|
fprintf(stderr, "Error: -f/--sendfile is not supported with SSH transport\n");
|
||||||
|
exit_code = 1;
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (config->use_incremental && config->use_chunk_serialization) {
|
||||||
|
fprintf(stderr, "Error: --incremental is not supported with -s (chunk serialization)\n");
|
||||||
|
exit_code = 1;
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (config->use_incremental && !config->use_metadata) {
|
||||||
|
log_message(LOG_LEVEL_INFO, "Enabling metadata preservation for --incremental");
|
||||||
|
config->use_metadata = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (config->use_delta && !config->use_incremental) {
|
||||||
|
fprintf(stderr, "Error: --delta requires --incremental\n");
|
||||||
|
exit_code = 1;
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
if (config->use_delta && config->use_chunk_serialization) {
|
||||||
|
fprintf(stderr, "Error: --delta cannot be combined with -s (chunk serialization)\n");
|
||||||
|
exit_code = 1;
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
if (config->use_delta && config->use_sendfile) {
|
||||||
|
fprintf(stderr, "Error: --delta cannot be combined with -f (sendfile)\n");
|
||||||
|
exit_code = 1;
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
if (config->use_delta && !config->use_metadata) {
|
||||||
|
log_message(LOG_LEVEL_INFO, "Enabling metadata preservation for --delta");
|
||||||
|
config->use_metadata = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (config->use_tls) {
|
||||||
|
if (!config->tls_cert || !config->tls_key) {
|
||||||
|
fprintf(stderr, "Error: --tls requires --cert and --key\n");
|
||||||
|
exit_code = 1;
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
tls_global_init();
|
||||||
|
}
|
||||||
|
|
||||||
tcp_set_timeouts(config->timeout, config->contimeout);
|
tcp_set_timeouts(config->timeout, config->contimeout);
|
||||||
|
|
||||||
|
|||||||
+86
-77
@@ -364,86 +364,62 @@ static int load_files_multithreaded(void* pipeline_context) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static int run_dry_run(Config* config) {
|
int send_files(Config* config) {
|
||||||
DirectoryScanner* scanner = directory_scanner_create(
|
if (config->dry_run) {
|
||||||
config->send_directory, config->use_metadata, config->chunk_size, config->exclude_patterns,
|
DirectoryScanner* scanner = directory_scanner_create(
|
||||||
config->exclude_count, config->include_patterns, config->include_count, config->max_size,
|
config->send_directory, config->use_metadata, config->chunk_size, config->exclude_patterns,
|
||||||
config->min_size, config->max_depth);
|
config->exclude_count, config->include_patterns, config->include_count, config->max_size,
|
||||||
if (!scanner)
|
config->min_size, config->max_depth);
|
||||||
return -1;
|
Chunk* chunk;
|
||||||
Chunk* chunk;
|
int file_count = 0;
|
||||||
int file_count = 0;
|
unsigned long long total_bytes = 0;
|
||||||
unsigned long long total_bytes = 0;
|
printf("Dry run: files to be transferred\n");
|
||||||
printf("Dry run: files to be transferred\n");
|
while ((chunk = directory_scanner_next(scanner)) != NULL) {
|
||||||
while ((chunk = directory_scanner_next(scanner)) != NULL) {
|
for (int i = 0; i < chunk->element_count; i++) {
|
||||||
for (int i = 0; i < chunk->element_count; i++) {
|
printf(" %s (%zu bytes)\n", chunk->items[i]->path, chunk->items[i]->data->size);
|
||||||
printf(" %s (%zu bytes)\n", chunk->items[i]->path, chunk->items[i]->data->size);
|
total_bytes += chunk->items[i]->data->size;
|
||||||
total_bytes += chunk->items[i]->data->size;
|
file_count++;
|
||||||
file_count++;
|
}
|
||||||
|
chunk_destroy(chunk);
|
||||||
}
|
}
|
||||||
chunk_destroy(chunk);
|
directory_scanner_destroy(scanner);
|
||||||
|
printf("Total: %d files, %.1f MB\n", file_count, total_bytes / 1048576.0);
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
directory_scanner_destroy(scanner);
|
|
||||||
printf("Total: %d files, %.1f MB\n", file_count, total_bytes / 1048576.0);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static Client* connect_to_server(Config* config) {
|
Client* client;
|
||||||
if (config->transport == TRANSPORT_SSH) {
|
if (config->transport == TRANSPORT_SSH) {
|
||||||
if (config->use_sendfile) {
|
if (config->use_sendfile) {
|
||||||
fprintf(stderr, "Error: -f/--sendfile is not supported with SSH transport\n");
|
fprintf(stderr, "Error: -f/--sendfile is not supported with SSH transport\n");
|
||||||
return NULL;
|
return 1;
|
||||||
|
}
|
||||||
|
client =
|
||||||
|
client_connect_ssh(config->ssh_destination, config->ssh_port, config->fastsync_server_path);
|
||||||
|
if (!client)
|
||||||
|
return 1;
|
||||||
|
} else if (config->use_tls) {
|
||||||
|
client = client_create();
|
||||||
|
if (!client || !client_connect_tls(client, config->server_host, config->server_port,
|
||||||
|
config->tls_cert, config->tls_key, config->tls_ca)) {
|
||||||
|
if (client)
|
||||||
|
client_delete(client);
|
||||||
|
fprintf(stderr, "Error: could not connect to server via TLS\n");
|
||||||
|
return 1;
|
||||||
}
|
}
|
||||||
return client_connect_ssh(config->ssh_destination, config->ssh_port,
|
|
||||||
config->fastsync_server_path);
|
|
||||||
}
|
|
||||||
Client* client = client_create();
|
|
||||||
if (!client)
|
|
||||||
return NULL;
|
|
||||||
bool ok;
|
|
||||||
if (config->use_tls) {
|
|
||||||
ok = client_connect_tls(client, config->server_host, config->server_port, config->tls_cert,
|
|
||||||
config->tls_key, config->tls_ca);
|
|
||||||
} else {
|
} else {
|
||||||
ok = client_connect(client, config->server_host, config->server_port);
|
client = client_create();
|
||||||
|
if (!client || !client_connect(client, config->server_host, config->server_port)) {
|
||||||
|
if (client)
|
||||||
|
client_delete(client);
|
||||||
|
fprintf(stderr, "Error: could not connect to server\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (!ok) {
|
if (!config_send(client->file_descriptor, config)) {
|
||||||
|
client_disconnect(client);
|
||||||
client_delete(client);
|
client_delete(client);
|
||||||
fprintf(stderr, "Error: could not connect to server\n");
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
return client;
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool send_manifest(int fd, ArrayList* manifest) {
|
|
||||||
if (!send_status(fd, STATUS_MANIFEST))
|
|
||||||
return false;
|
|
||||||
if (!send_int(fd, manifest->size))
|
|
||||||
return false;
|
|
||||||
for (int i = 0; i < manifest->size; i++) {
|
|
||||||
if (!send_str(fd, (char*)manifest->items[i]))
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void print_progress(unsigned long long total_bytes, time_t start) {
|
|
||||||
double elapsed = difftime(time(NULL), start);
|
|
||||||
double rate = elapsed > 0 ? total_bytes / (1048576.0 * elapsed) : 0;
|
|
||||||
fprintf(stderr, "\rSent %.1f MB (%.1f MB/s) ", total_bytes / 1048576.0, rate);
|
|
||||||
fflush(stderr);
|
|
||||||
}
|
|
||||||
|
|
||||||
int send_files(Config* config) {
|
|
||||||
if (config->dry_run)
|
|
||||||
return run_dry_run(config);
|
|
||||||
|
|
||||||
Client* client = connect_to_server(config);
|
|
||||||
if (!client)
|
|
||||||
return 1;
|
return 1;
|
||||||
if (!config_send(client->file_descriptor, config))
|
}
|
||||||
goto send_fail;
|
|
||||||
|
|
||||||
DirectoryScanner* scanner = directory_scanner_create(
|
DirectoryScanner* scanner = directory_scanner_create(
|
||||||
config->send_directory, config->use_metadata, config->chunk_size, config->exclude_patterns,
|
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->exclude_count, config->include_patterns, config->include_count, config->max_size,
|
||||||
@@ -485,26 +461,40 @@ int send_files(Config* config) {
|
|||||||
time_t now = time(NULL);
|
time_t now = time(NULL);
|
||||||
if (now - last_progress >= 1) {
|
if (now - last_progress >= 1) {
|
||||||
last_progress = now;
|
last_progress = now;
|
||||||
print_progress(total_bytes, start);
|
double elapsed = difftime(now, start);
|
||||||
|
double rate = elapsed > 0 ? total_bytes / (1048576.0 * elapsed) : 0;
|
||||||
|
fprintf(stderr, "\rSent %.1f MB (%.1f MB/s) ", total_bytes / 1048576.0, rate);
|
||||||
|
fflush(stderr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
chunk_destroy(current_chunk);
|
chunk_destroy(current_chunk);
|
||||||
}
|
}
|
||||||
if (config->use_delete) {
|
if (config->use_delete) {
|
||||||
if (!send_manifest(client->file_descriptor, manifest)) {
|
if (!send_status(client->file_descriptor, STATUS_MANIFEST)) {
|
||||||
array_list_delete(manifest);
|
array_list_delete(manifest);
|
||||||
goto send_fail;
|
goto send_fail;
|
||||||
}
|
}
|
||||||
|
if (!send_int(client->file_descriptor, manifest->size)) {
|
||||||
|
array_list_delete(manifest);
|
||||||
|
goto send_fail;
|
||||||
|
}
|
||||||
|
for (int i = 0; i < manifest->size; i++) {
|
||||||
|
if (!send_str(client->file_descriptor, (char*)manifest->items[i])) {
|
||||||
|
array_list_delete(manifest);
|
||||||
|
goto send_fail;
|
||||||
|
}
|
||||||
|
}
|
||||||
array_list_delete(manifest);
|
array_list_delete(manifest);
|
||||||
}
|
}
|
||||||
if (!send_status(client->file_descriptor, STATUS_FINISHED))
|
if (!send_status(client->file_descriptor, STATUS_FINISHED))
|
||||||
goto send_fail;
|
goto send_fail;
|
||||||
Status s;
|
Status s;
|
||||||
int ok = receive_status(client->file_descriptor, &s) && s == STATUS_OK;
|
int ok = receive_status(client->file_descriptor, &s) && s == STATUS_OK;
|
||||||
if (config->show_progress)
|
if (config->show_progress) {
|
||||||
print_progress(total_bytes, start);
|
double elapsed = difftime(time(NULL), start);
|
||||||
if (config->show_progress)
|
double rate = elapsed > 0 ? total_bytes / (1048576.0 * elapsed) : 0;
|
||||||
fprintf(stderr, "Done.\n");
|
fprintf(stderr, "\rSent %.1f MB (%.1f MB/s) Done.\n", total_bytes / 1048576.0, rate);
|
||||||
|
}
|
||||||
directory_scanner_destroy(scanner);
|
directory_scanner_destroy(scanner);
|
||||||
client_disconnect(client);
|
client_disconnect(client);
|
||||||
client_delete(client);
|
client_delete(client);
|
||||||
@@ -518,8 +508,27 @@ send_fail:
|
|||||||
}
|
}
|
||||||
|
|
||||||
int send_files_multithreaded(Config* config) {
|
int send_files_multithreaded(Config* config) {
|
||||||
if (config->dry_run)
|
if (config->dry_run) {
|
||||||
return run_dry_run(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);
|
||||||
|
Chunk* chunk;
|
||||||
|
int file_count = 0;
|
||||||
|
unsigned long long total_bytes = 0;
|
||||||
|
printf("Dry run: files to be transferred\n");
|
||||||
|
while ((chunk = directory_scanner_next(scanner)) != NULL) {
|
||||||
|
for (int i = 0; i < chunk->element_count; i++) {
|
||||||
|
printf(" %s (%zu bytes)\n", chunk->items[i]->path, chunk->items[i]->data->size);
|
||||||
|
total_bytes += chunk->items[i]->data->size;
|
||||||
|
file_count++;
|
||||||
|
}
|
||||||
|
chunk_destroy(chunk);
|
||||||
|
}
|
||||||
|
directory_scanner_destroy(scanner);
|
||||||
|
printf("Total: %d files, %.1f MB\n", file_count, total_bytes / 1048576.0);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
long pages = sysconf(_SC_AVPHYS_PAGES);
|
long pages = sysconf(_SC_AVPHYS_PAGES);
|
||||||
long page_size = sysconf(_SC_PAGE_SIZE);
|
long page_size = sysconf(_SC_PAGE_SIZE);
|
||||||
|
|||||||
+46
-10
@@ -8,21 +8,57 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
Config* config_create(void) {
|
Config* config_create(char* version, char* send_directory, char* receive_directory,
|
||||||
Config* config = calloc(1, sizeof(Config));
|
bool save_to_disk, bool use_multithreading, bool use_chunk_serialization,
|
||||||
|
bool use_compression, bool use_metadata, int compression_level,
|
||||||
|
bool use_sendfile, unsigned long long chunk_size) {
|
||||||
|
|
||||||
|
Config* config = malloc(sizeof(Config));
|
||||||
if (!config)
|
if (!config)
|
||||||
return NULL;
|
return NULL;
|
||||||
config->version = str_dup(PROTOCOL_VERSION);
|
config->version = version;
|
||||||
config->compression_level = 5;
|
config->send_directory = send_directory;
|
||||||
config->chunk_size = DEFAULT_CHUNK_SIZE;
|
config->receive_root_directory = receive_directory;
|
||||||
|
config->save_to_disk = save_to_disk;
|
||||||
|
config->use_multithreading = use_multithreading;
|
||||||
|
config->use_chunk_serialization = use_chunk_serialization;
|
||||||
|
config->use_compression = use_compression;
|
||||||
|
config->use_metadata = use_metadata;
|
||||||
|
config->show_progress = false;
|
||||||
|
config->dry_run = false;
|
||||||
|
config->use_delete = false;
|
||||||
|
config->compression_level = compression_level;
|
||||||
|
config->use_sendfile = use_sendfile;
|
||||||
|
config->chunk_size = chunk_size > 0 ? chunk_size : DEFAULT_CHUNK_SIZE;
|
||||||
config->ssh_port = 22;
|
config->ssh_port = 22;
|
||||||
config->server_port = 8080;
|
config->transport = TRANSPORT_TCP;
|
||||||
config->server_host = str_dup("127.0.0.1");
|
config->ssh_destination = NULL;
|
||||||
config->timeout = 30;
|
config->fastsync_server_path = NULL;
|
||||||
config->contimeout = 10;
|
config->exclude_patterns = NULL;
|
||||||
config->queue_size = 100;
|
config->exclude_count = 0;
|
||||||
|
config->include_patterns = NULL;
|
||||||
|
config->include_count = 0;
|
||||||
|
config->max_size = 0;
|
||||||
|
config->min_size = 0;
|
||||||
|
config->use_incremental = false;
|
||||||
|
config->use_delta = false;
|
||||||
config->delta_block_size = DELTA_BLOCK_SIZE_DEFAULT;
|
config->delta_block_size = DELTA_BLOCK_SIZE_DEFAULT;
|
||||||
config->delta_max_file_size = DELTA_MAX_FILE_SIZE;
|
config->delta_max_file_size = DELTA_MAX_FILE_SIZE;
|
||||||
|
config->use_tls = false;
|
||||||
|
config->tls_cert = NULL;
|
||||||
|
config->tls_key = NULL;
|
||||||
|
config->tls_ca = NULL;
|
||||||
|
config->server_host = str_dup("127.0.0.1");
|
||||||
|
config->server_port = 8080;
|
||||||
|
config->timeout = 30;
|
||||||
|
config->contimeout = 10;
|
||||||
|
config->quiet = false;
|
||||||
|
config->backup = false;
|
||||||
|
config->backup_dir = NULL;
|
||||||
|
config->stats = false;
|
||||||
|
config->max_depth = 0;
|
||||||
|
config->log_file = NULL;
|
||||||
|
config->queue_size = 100;
|
||||||
return config;
|
return config;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+4
-1
@@ -58,7 +58,10 @@ typedef struct Config {
|
|||||||
#define PROTOCOL_VERSION "1.3.0"
|
#define PROTOCOL_VERSION "1.3.0"
|
||||||
#define DEFAULT_CHUNK_SIZE (10 * 1024 * 1024)
|
#define DEFAULT_CHUNK_SIZE (10 * 1024 * 1024)
|
||||||
|
|
||||||
Config* config_create(void);
|
Config* config_create(char* version, char* send_directory, char* receive_directory,
|
||||||
|
bool save_to_disk, bool use_multithreading, bool use_chunk_serialization,
|
||||||
|
bool use_compression, bool use_metadata, int compression_level,
|
||||||
|
bool use_sendfile, unsigned long long chunk_size);
|
||||||
void config_delete(Config* config);
|
void config_delete(Config* config);
|
||||||
bool config_send(int file_descriptor, const Config* config);
|
bool config_send(int file_descriptor, const Config* config);
|
||||||
Config* config_receive(int file_descriptor);
|
Config* config_receive(int file_descriptor);
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
#include "test_array_list.h"
|
#include "test_array_list.h"
|
||||||
#include "test_chunk.h"
|
#include "test_chunk.h"
|
||||||
|
#include "test_client_cli.h"
|
||||||
#include "test_compression.h"
|
#include "test_compression.h"
|
||||||
#include "test_config.h"
|
#include "test_config.h"
|
||||||
#include "test_data.h"
|
#include "test_data.h"
|
||||||
#include "test_delta.h"
|
#include "test_delta.h"
|
||||||
#include "test_file.h"
|
#include "test_file.h"
|
||||||
#include "test_file_sendfile.h"
|
#include "test_file_sendfile.h"
|
||||||
|
#include "test_fuzz_smoke.h"
|
||||||
#include "test_glob.h"
|
#include "test_glob.h"
|
||||||
#include "test_log.h"
|
#include "test_log.h"
|
||||||
#include "test_metadata.h"
|
#include "test_metadata.h"
|
||||||
@@ -15,6 +17,7 @@
|
|||||||
#include "test_queue.h"
|
#include "test_queue.h"
|
||||||
#include "test_robustness.h"
|
#include "test_robustness.h"
|
||||||
#include "test_scanner.h"
|
#include "test_scanner.h"
|
||||||
|
#include "test_server.h"
|
||||||
#include "test_shared_utils.h"
|
#include "test_shared_utils.h"
|
||||||
#include "test_stress.h"
|
#include "test_stress.h"
|
||||||
#include "test_transport_tcp.h"
|
#include "test_transport_tcp.h"
|
||||||
@@ -53,6 +56,9 @@ int main() {
|
|||||||
RUN_TEST(test_transport_tcp);
|
RUN_TEST(test_transport_tcp);
|
||||||
RUN_TEST(test_transport_ssh);
|
RUN_TEST(test_transport_ssh);
|
||||||
RUN_TEST(test_transport_tls);
|
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("\n\033[1;36m=== TEST SUMMARY ===\033[0m\n");
|
||||||
printf("Total Tests Run: %d\n", tests_run);
|
printf("Total Tests Run: %d\n", tests_run);
|
||||||
|
|||||||
@@ -0,0 +1,80 @@
|
|||||||
|
#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();
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
#ifndef TEST_CLIENT_CLI_H
|
||||||
|
#define TEST_CLIENT_CLI_H
|
||||||
|
|
||||||
|
void test_client_cli();
|
||||||
|
|
||||||
|
#endif
|
||||||
+121
-51
@@ -1,23 +1,21 @@
|
|||||||
#include "test_config.h"
|
#include "test_config.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "multiprocessing.h"
|
#include "multiprocessing.h"
|
||||||
|
#include "protocol.h"
|
||||||
#include "queue.h"
|
#include "queue.h"
|
||||||
#include "test_utils.h"
|
#include "test_utils.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include <stdlib.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() {
|
static void test_config_lifecycle() {
|
||||||
Config* cfg = config_create();
|
Config* cfg = config_create(str_dup("1.0"), str_dup("/src"), str_dup("/dst"), true, true, false,
|
||||||
|
false, false, 1, false, 0);
|
||||||
EXPECT_NOT_NULL(cfg);
|
EXPECT_NOT_NULL(cfg);
|
||||||
free(cfg->version);
|
|
||||||
cfg->version = str_dup("1.0");
|
|
||||||
cfg->send_directory = str_dup("/src");
|
|
||||||
cfg->receive_root_directory = str_dup("/dst");
|
|
||||||
cfg->save_to_disk = true;
|
|
||||||
cfg->use_multithreading = true;
|
|
||||||
cfg->use_chunk_serialization = false;
|
|
||||||
cfg->use_compression = false;
|
|
||||||
cfg->compression_level = 1;
|
|
||||||
EXPECT_EQ_STR(cfg->version, "1.0");
|
EXPECT_EQ_STR(cfg->version, "1.0");
|
||||||
EXPECT_EQ_STR(cfg->send_directory, "/src");
|
EXPECT_EQ_STR(cfg->send_directory, "/src");
|
||||||
EXPECT_EQ_STR(cfg->receive_root_directory, "/dst");
|
EXPECT_EQ_STR(cfg->receive_root_directory, "/dst");
|
||||||
@@ -31,14 +29,9 @@ static void test_config_lifecycle() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void test_config_ssh_dest() {
|
static void test_config_ssh_dest() {
|
||||||
Config* cfg = config_create();
|
Config* cfg = config_create(str_dup("1.0"), str_dup("/src"), str_dup("user@host:/dst"), true,
|
||||||
|
false, false, false, false, 1, false, 0);
|
||||||
EXPECT_NOT_NULL(cfg);
|
EXPECT_NOT_NULL(cfg);
|
||||||
free(cfg->version);
|
|
||||||
cfg->version = str_dup("1.0");
|
|
||||||
cfg->send_directory = str_dup("/src");
|
|
||||||
cfg->receive_root_directory = str_dup("user@host:/dst");
|
|
||||||
cfg->save_to_disk = true;
|
|
||||||
cfg->compression_level = 1;
|
|
||||||
EXPECT_EQ_INT(cfg->transport, TRANSPORT_TCP);
|
EXPECT_EQ_INT(cfg->transport, TRANSPORT_TCP);
|
||||||
EXPECT_NULL(cfg->ssh_destination);
|
EXPECT_NULL(cfg->ssh_destination);
|
||||||
EXPECT_EQ_STR(cfg->receive_root_directory, "user@host:/dst");
|
EXPECT_EQ_STR(cfg->receive_root_directory, "user@host:/dst");
|
||||||
@@ -51,14 +44,8 @@ static void test_config_ssh_dest() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void test_config_ssh_dest_local_path() {
|
static void test_config_ssh_dest_local_path() {
|
||||||
Config* cfg = config_create();
|
Config* cfg = config_create(str_dup("1.0"), str_dup("/src"), str_dup("/local/path"), true, false,
|
||||||
EXPECT_NOT_NULL(cfg);
|
false, false, false, 1, false, 0);
|
||||||
free(cfg->version);
|
|
||||||
cfg->version = str_dup("1.0");
|
|
||||||
cfg->send_directory = str_dup("/src");
|
|
||||||
cfg->receive_root_directory = str_dup("/local/path");
|
|
||||||
cfg->save_to_disk = true;
|
|
||||||
cfg->compression_level = 1;
|
|
||||||
config_parse_ssh_dest(cfg);
|
config_parse_ssh_dest(cfg);
|
||||||
EXPECT_EQ_INT(cfg->transport, TRANSPORT_TCP);
|
EXPECT_EQ_INT(cfg->transport, TRANSPORT_TCP);
|
||||||
EXPECT_NULL(cfg->ssh_destination);
|
EXPECT_NULL(cfg->ssh_destination);
|
||||||
@@ -67,14 +54,8 @@ static void test_config_ssh_dest_local_path() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void test_config_ssh_dest_no_user() {
|
static void test_config_ssh_dest_no_user() {
|
||||||
Config* cfg = config_create();
|
Config* cfg = config_create(str_dup("1.0"), str_dup("/src"), str_dup("host:/remote"), true, false,
|
||||||
EXPECT_NOT_NULL(cfg);
|
false, false, false, 1, false, 0);
|
||||||
free(cfg->version);
|
|
||||||
cfg->version = str_dup("1.0");
|
|
||||||
cfg->send_directory = str_dup("/src");
|
|
||||||
cfg->receive_root_directory = str_dup("host:/remote");
|
|
||||||
cfg->save_to_disk = true;
|
|
||||||
cfg->compression_level = 1;
|
|
||||||
config_parse_ssh_dest(cfg);
|
config_parse_ssh_dest(cfg);
|
||||||
EXPECT_EQ_INT(cfg->transport, TRANSPORT_SSH);
|
EXPECT_EQ_INT(cfg->transport, TRANSPORT_SSH);
|
||||||
EXPECT_EQ_STR(cfg->ssh_destination, "host:/remote");
|
EXPECT_EQ_STR(cfg->ssh_destination, "host:/remote");
|
||||||
@@ -83,14 +64,8 @@ static void test_config_ssh_dest_no_user() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void test_pipeline_sender_lifecycle() {
|
static void test_pipeline_sender_lifecycle() {
|
||||||
Config* cfg = config_create();
|
Config* cfg = config_create(str_dup("2.0"), str_dup("/src2"), str_dup("/dst2"), false, false,
|
||||||
free(cfg->version);
|
true, true, false, 1, false, 0);
|
||||||
cfg->version = str_dup("2.0");
|
|
||||||
cfg->send_directory = str_dup("/src2");
|
|
||||||
cfg->receive_root_directory = str_dup("/dst2");
|
|
||||||
cfg->use_chunk_serialization = true;
|
|
||||||
cfg->use_compression = true;
|
|
||||||
cfg->compression_level = 1;
|
|
||||||
Queue* q1 = queue_create(5, NULL);
|
Queue* q1 = queue_create(5, NULL);
|
||||||
Queue* q2 = queue_create(15, NULL);
|
Queue* q2 = queue_create(15, NULL);
|
||||||
|
|
||||||
@@ -106,16 +81,8 @@ static void test_pipeline_sender_lifecycle() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void test_pipeline_receiver_lifecycle() {
|
static void test_pipeline_receiver_lifecycle() {
|
||||||
Config* cfg = config_create();
|
Config* cfg = config_create(str_dup("3.0"), str_dup("/src3"), str_dup("/dst3"), true, true, true,
|
||||||
free(cfg->version);
|
true, false, 1, false, 0);
|
||||||
cfg->version = str_dup("3.0");
|
|
||||||
cfg->send_directory = str_dup("/src3");
|
|
||||||
cfg->receive_root_directory = str_dup("/dst3");
|
|
||||||
cfg->save_to_disk = true;
|
|
||||||
cfg->use_multithreading = true;
|
|
||||||
cfg->use_chunk_serialization = true;
|
|
||||||
cfg->use_compression = true;
|
|
||||||
cfg->compression_level = 1;
|
|
||||||
Queue* q = queue_create(20, NULL);
|
Queue* q = queue_create(20, NULL);
|
||||||
|
|
||||||
PipelineContextReceiver* pcr = pipeline_context_receiver_create(cfg, q, 42);
|
PipelineContextReceiver* pcr = pipeline_context_receiver_create(cfg, q, 42);
|
||||||
@@ -128,6 +95,104 @@ static void test_pipeline_receiver_lifecycle() {
|
|||||||
pipeline_context_receiver_destroy(pcr);
|
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() {
|
void test_config() {
|
||||||
test_config_lifecycle();
|
test_config_lifecycle();
|
||||||
test_config_ssh_dest();
|
test_config_ssh_dest();
|
||||||
@@ -135,4 +200,9 @@ void test_config() {
|
|||||||
test_config_ssh_dest_no_user();
|
test_config_ssh_dest_no_user();
|
||||||
test_pipeline_sender_lifecycle();
|
test_pipeline_sender_lifecycle();
|
||||||
test_pipeline_receiver_lifecycle();
|
test_pipeline_receiver_lifecycle();
|
||||||
|
if (!is_running_under_valgrind()) {
|
||||||
|
test_config_send_receive();
|
||||||
|
test_config_send_receive_version_mismatch();
|
||||||
|
}
|
||||||
|
test_is_remote_dest();
|
||||||
}
|
}
|
||||||
|
|||||||
+132
-8
@@ -154,9 +154,8 @@ static void test_file_send_receive() {
|
|||||||
memcpy(file->data->data, content, len);
|
memcpy(file->data->data, content, len);
|
||||||
file->data->size = len;
|
file->data->size = len;
|
||||||
|
|
||||||
Config* cfg = config_create();
|
Config* cfg = config_create(str_dup(PROTOCOL_VERSION), str_dup("/tmp"), str_dup("/tmp"), false,
|
||||||
cfg->send_directory = str_dup("/tmp");
|
false, false, false, false, 0, false, 0);
|
||||||
cfg->receive_root_directory = str_dup("/tmp");
|
|
||||||
|
|
||||||
int p[2];
|
int p[2];
|
||||||
EXPECT_EQ_INT(pipe(p), 0);
|
EXPECT_EQ_INT(pipe(p), 0);
|
||||||
@@ -262,6 +261,132 @@ static void test_file_metadata_create() {
|
|||||||
unlink("test_meta_file.txt");
|
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() {
|
void test_file() {
|
||||||
test_file_create();
|
test_file_create();
|
||||||
test_file_destroy_null();
|
test_file_destroy_null();
|
||||||
@@ -272,14 +397,13 @@ void test_file() {
|
|||||||
test_to_disk_basic();
|
test_to_disk_basic();
|
||||||
test_to_disk_creates_dirs();
|
test_to_disk_creates_dirs();
|
||||||
test_file_content_to_buffer();
|
test_file_content_to_buffer();
|
||||||
|
test_file_save_to_disk_path_traversal();
|
||||||
|
test_file_save_to_disk_deep_traversal();
|
||||||
if (!is_running_under_valgrind()) {
|
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_receive();
|
||||||
test_file_send_no_path();
|
test_file_send_no_path();
|
||||||
|
test_file_send_single_calls_compression();
|
||||||
|
test_file_send_single_calls_metadata();
|
||||||
}
|
}
|
||||||
test_file_metadata_create();
|
test_file_metadata_create();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,10 +22,9 @@ static void test_sendfile_basic() {
|
|||||||
/* Set the size so file_send_sendfile can report it */
|
/* Set the size so file_send_sendfile can report it */
|
||||||
file->data->size = len;
|
file->data->size = len;
|
||||||
|
|
||||||
Config* cfg = config_create();
|
Config* cfg = config_create(str_dup(PROTOCOL_VERSION), str_dup("/tmp"), str_dup("/tmp"), false,
|
||||||
|
false, false, false, false, 0, false, 0);
|
||||||
EXPECT_NOT_NULL(cfg);
|
EXPECT_NOT_NULL(cfg);
|
||||||
cfg->send_directory = str_dup("/tmp");
|
|
||||||
cfg->receive_root_directory = str_dup("/tmp");
|
|
||||||
|
|
||||||
int p[2];
|
int p[2];
|
||||||
EXPECT_EQ_INT(pipe(p), 0);
|
EXPECT_EQ_INT(pipe(p), 0);
|
||||||
@@ -81,10 +80,9 @@ static void test_sendfile_empty_file() {
|
|||||||
EXPECT_NOT_NULL(file);
|
EXPECT_NOT_NULL(file);
|
||||||
file->data->size = 0;
|
file->data->size = 0;
|
||||||
|
|
||||||
Config* cfg = config_create();
|
Config* cfg = config_create(str_dup(PROTOCOL_VERSION), str_dup("/tmp"), str_dup("/tmp"), false,
|
||||||
|
false, false, false, false, 0, false, 0);
|
||||||
EXPECT_NOT_NULL(cfg);
|
EXPECT_NOT_NULL(cfg);
|
||||||
cfg->send_directory = str_dup("/tmp");
|
|
||||||
cfg->receive_root_directory = str_dup("/tmp");
|
|
||||||
|
|
||||||
int p[2];
|
int p[2];
|
||||||
EXPECT_EQ_INT(pipe(p), 0);
|
EXPECT_EQ_INT(pipe(p), 0);
|
||||||
@@ -93,7 +91,6 @@ static void test_sendfile_empty_file() {
|
|||||||
|
|
||||||
pid_t pid = fork();
|
pid_t pid = fork();
|
||||||
if (pid == 0) {
|
if (pid == 0) {
|
||||||
/* Child: receive */
|
|
||||||
close(p[1]);
|
close(p[1]);
|
||||||
File* received = file_receive(cfg, p[0]);
|
File* received = file_receive(cfg, p[0]);
|
||||||
close(p[0]);
|
close(p[0]);
|
||||||
@@ -164,12 +161,9 @@ static void test_sendfile_compression_fallback() {
|
|||||||
file->data->size = (size_t)st.st_size;
|
file->data->size = (size_t)st.st_size;
|
||||||
EXPECT_TRUE(file_load_data(file));
|
EXPECT_TRUE(file_load_data(file));
|
||||||
|
|
||||||
Config* cfg = config_create();
|
Config* cfg = config_create(str_dup(PROTOCOL_VERSION), str_dup("/tmp"), str_dup("/tmp"), false,
|
||||||
|
false, false, true, false, 3, false, 0);
|
||||||
EXPECT_NOT_NULL(cfg);
|
EXPECT_NOT_NULL(cfg);
|
||||||
cfg->send_directory = str_dup("/tmp");
|
|
||||||
cfg->receive_root_directory = str_dup("/tmp");
|
|
||||||
cfg->use_compression = true;
|
|
||||||
cfg->compression_level = 3;
|
|
||||||
|
|
||||||
int p[2];
|
int p[2];
|
||||||
EXPECT_EQ_INT(pipe(p), 0);
|
EXPECT_EQ_INT(pipe(p), 0);
|
||||||
@@ -178,7 +172,6 @@ static void test_sendfile_compression_fallback() {
|
|||||||
|
|
||||||
pid_t pid = fork();
|
pid_t pid = fork();
|
||||||
if (pid == 0) {
|
if (pid == 0) {
|
||||||
/* Child: receive */
|
|
||||||
close(p[1]);
|
close(p[1]);
|
||||||
File* received = file_receive(cfg, p[0]);
|
File* received = file_receive(cfg, p[0]);
|
||||||
close(p[0]);
|
close(p[0]);
|
||||||
|
|||||||
@@ -0,0 +1,158 @@
|
|||||||
|
#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();
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
#ifndef TEST_FUZZ_SMOKE_H
|
||||||
|
#define TEST_FUZZ_SMOKE_H
|
||||||
|
|
||||||
|
void test_fuzz_smoke();
|
||||||
|
|
||||||
|
#endif
|
||||||
@@ -1,19 +1,24 @@
|
|||||||
#include "test_multiprocessing.h"
|
#include "test_multiprocessing.h"
|
||||||
#include "multiprocessing.h"
|
#include "multiprocessing.h"
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#include "protocol.h"
|
||||||
#include "queue.h"
|
#include "queue.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
#include "test_utils.h"
|
#include "test_utils.h"
|
||||||
|
#include <stdio.h>
|
||||||
#include <stdlib.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 */
|
/* Test pipeline_context_sender_create/destroy with valid arguments */
|
||||||
static void test_sender_create_destroy() {
|
static void test_sender_create_destroy() {
|
||||||
Config* cfg = config_create();
|
Config* cfg = config_create(str_dup("1.0"), str_dup("/src"), str_dup("/dst"), false, false, false,
|
||||||
|
false, false, 0, false, 0);
|
||||||
EXPECT_NOT_NULL(cfg);
|
EXPECT_NOT_NULL(cfg);
|
||||||
free(cfg->version);
|
|
||||||
cfg->version = str_dup("1.0");
|
|
||||||
cfg->send_directory = str_dup("/src");
|
|
||||||
cfg->receive_root_directory = str_dup("/dst");
|
|
||||||
|
|
||||||
Queue* q_scanner = queue_create(5, NULL);
|
Queue* q_scanner = queue_create(5, NULL);
|
||||||
EXPECT_NOT_NULL(q_scanner);
|
EXPECT_NOT_NULL(q_scanner);
|
||||||
@@ -35,14 +40,9 @@ static void test_sender_create_destroy() {
|
|||||||
|
|
||||||
/* Test pipeline_context_receiver_create/destroy with valid arguments */
|
/* Test pipeline_context_receiver_create/destroy with valid arguments */
|
||||||
static void test_receiver_create_destroy() {
|
static void test_receiver_create_destroy() {
|
||||||
Config* cfg = config_create();
|
Config* cfg = config_create(str_dup("2.0"), str_dup("/src"), str_dup("/dst"), true, true, false,
|
||||||
|
false, false, 0, false, 0);
|
||||||
EXPECT_NOT_NULL(cfg);
|
EXPECT_NOT_NULL(cfg);
|
||||||
free(cfg->version);
|
|
||||||
cfg->version = str_dup("2.0");
|
|
||||||
cfg->send_directory = str_dup("/src");
|
|
||||||
cfg->receive_root_directory = str_dup("/dst");
|
|
||||||
cfg->save_to_disk = true;
|
|
||||||
cfg->use_multithreading = true;
|
|
||||||
|
|
||||||
Queue* q = queue_create(20, NULL);
|
Queue* q = queue_create(20, NULL);
|
||||||
EXPECT_NOT_NULL(q);
|
EXPECT_NOT_NULL(q);
|
||||||
@@ -59,12 +59,9 @@ static void test_receiver_create_destroy() {
|
|||||||
|
|
||||||
/* Test that create handles various queue capacities */
|
/* Test that create handles various queue capacities */
|
||||||
static void test_sender_queue_capacities() {
|
static void test_sender_queue_capacities() {
|
||||||
Config* cfg = config_create();
|
Config* cfg = config_create(str_dup("3.0"), str_dup("/src"), str_dup("/dst"), false, false, false,
|
||||||
|
false, false, 0, false, 0);
|
||||||
EXPECT_NOT_NULL(cfg);
|
EXPECT_NOT_NULL(cfg);
|
||||||
free(cfg->version);
|
|
||||||
cfg->version = str_dup("3.0");
|
|
||||||
cfg->send_directory = str_dup("/src");
|
|
||||||
cfg->receive_root_directory = str_dup("/dst");
|
|
||||||
|
|
||||||
/* Single-element queues */
|
/* Single-element queues */
|
||||||
Queue* q1 = queue_create(1, NULL);
|
Queue* q1 = queue_create(1, NULL);
|
||||||
@@ -78,12 +75,9 @@ static void test_sender_queue_capacities() {
|
|||||||
|
|
||||||
/* Test that create handles zero-capacity queues */
|
/* Test that create handles zero-capacity queues */
|
||||||
static void test_sender_zero_capacity() {
|
static void test_sender_zero_capacity() {
|
||||||
Config* cfg = config_create();
|
Config* cfg = config_create(str_dup("4.0"), str_dup("/src"), str_dup("/dst"), false, false, false,
|
||||||
|
false, false, 0, false, 0);
|
||||||
EXPECT_NOT_NULL(cfg);
|
EXPECT_NOT_NULL(cfg);
|
||||||
free(cfg->version);
|
|
||||||
cfg->version = str_dup("4.0");
|
|
||||||
cfg->send_directory = str_dup("/src");
|
|
||||||
cfg->receive_root_directory = str_dup("/dst");
|
|
||||||
|
|
||||||
Queue* q1 = queue_create(0, NULL);
|
Queue* q1 = queue_create(0, NULL);
|
||||||
Queue* q2 = queue_create(0, NULL);
|
Queue* q2 = queue_create(0, NULL);
|
||||||
@@ -96,11 +90,8 @@ static void test_sender_zero_capacity() {
|
|||||||
|
|
||||||
/* Test receiver with zero file_descriptor */
|
/* Test receiver with zero file_descriptor */
|
||||||
static void test_receiver_fd_zero() {
|
static void test_receiver_fd_zero() {
|
||||||
Config* cfg = config_create();
|
Config* cfg = config_create(str_dup("5.0"), str_dup("/src"), str_dup("/dst"), false, false, false,
|
||||||
free(cfg->version);
|
false, false, 0, false, 0);
|
||||||
cfg->version = str_dup("5.0");
|
|
||||||
cfg->send_directory = str_dup("/src");
|
|
||||||
cfg->receive_root_directory = str_dup("/dst");
|
|
||||||
Queue* q = queue_create(5, NULL);
|
Queue* q = queue_create(5, NULL);
|
||||||
PipelineContextReceiver* ctx = pipeline_context_receiver_create(cfg, q, 0);
|
PipelineContextReceiver* ctx = pipeline_context_receiver_create(cfg, q, 0);
|
||||||
EXPECT_NOT_NULL(ctx);
|
EXPECT_NOT_NULL(ctx);
|
||||||
@@ -109,10 +100,85 @@ static void test_receiver_fd_zero() {
|
|||||||
pipeline_context_receiver_destroy(ctx);
|
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() {
|
void test_multiprocessing() {
|
||||||
test_sender_create_destroy();
|
test_sender_create_destroy();
|
||||||
test_receiver_create_destroy();
|
test_receiver_create_destroy();
|
||||||
test_sender_queue_capacities();
|
test_sender_queue_capacities();
|
||||||
test_sender_zero_capacity();
|
test_sender_zero_capacity();
|
||||||
test_receiver_fd_zero();
|
test_receiver_fd_zero();
|
||||||
|
if (!is_running_under_valgrind()) {
|
||||||
|
test_receive_thread_finished();
|
||||||
|
}
|
||||||
|
test_write_thread_done();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,151 @@
|
|||||||
|
#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();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
#ifndef TEST_SERVER_H
|
||||||
|
#define TEST_SERVER_H
|
||||||
|
|
||||||
|
void test_server();
|
||||||
|
|
||||||
|
#endif
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
#include "test_transport_tcp.h"
|
#include "test_transport_tcp.h"
|
||||||
|
#include "protocol.h"
|
||||||
#include "test_utils.h"
|
#include "test_utils.h"
|
||||||
#include "transport_tcp.h"
|
#include "transport_tcp.h"
|
||||||
|
#include <string.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
static void test_server_create_ephemeral() {
|
static void test_server_create_ephemeral() {
|
||||||
@@ -35,9 +37,49 @@ static void test_client_delete_null() {
|
|||||||
client_delete(c);
|
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() {
|
void test_transport_tcp() {
|
||||||
test_server_create_ephemeral();
|
test_server_create_ephemeral();
|
||||||
test_server_delete_null();
|
test_server_delete_null();
|
||||||
test_client_create();
|
test_client_create();
|
||||||
test_client_delete_null();
|
test_client_delete_null();
|
||||||
|
test_tcp_set_timeouts();
|
||||||
|
test_client_connect_invalid_host();
|
||||||
|
test_server_delete_double();
|
||||||
|
test_client_disconnect_delete();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,10 @@
|
|||||||
#include "test_transport_tls.h"
|
#include "test_transport_tls.h"
|
||||||
|
#include "protocol.h"
|
||||||
#include "test_utils.h"
|
#include "test_utils.h"
|
||||||
#include "transport_tcp.h"
|
#include "transport_tcp.h"
|
||||||
#include "transport_tls.h"
|
#include "transport_tls.h"
|
||||||
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
static void test_tls_global_init() {
|
static void test_tls_global_init() {
|
||||||
bool ok = tls_global_init();
|
bool ok = tls_global_init();
|
||||||
@@ -18,7 +21,30 @@ static void test_server_create_tls_without_certs() {
|
|||||||
EXPECT_NULL(s);
|
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() {
|
void test_transport_tls() {
|
||||||
test_tls_global_init();
|
test_tls_global_init();
|
||||||
test_server_create_tls_without_certs();
|
test_server_create_tls_without_certs();
|
||||||
|
test_client_connect_tls_fail();
|
||||||
|
test_server_create_tls_empty_certs();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user