Compare commits

...

10 Commits

Author SHA1 Message Date
TapTap 95be50fead test: add unit test coverage for transports, config, file, multiprocessing (#131-#137) 2026-07-29 19:19:19 +02:00
TapTap 269ce0749b Merge pull request 'Merge all 5 batch PRs: security, CLI features, protocol, performance, tests/docs' (#148) from pr143-fixed into main
CI / lint (push) Successful in 11s
CI / sanitizers (address) (push) Successful in 16s
CI / sanitizers (undefined) (push) Successful in 15s
CI / coverage (push) Successful in 11s
CI / fuzz-build (push) Successful in 13s
CI / valgrind (push) Successful in 12s
CI / build-and-test (push) Successful in 55s
Reviewed-on: #148
2026-07-29 18:21:20 +02:00
TapTap 52d5492dee fix: restore follow_symlinks and partial fields lost in merge, register ssh tests
CI / lint (pull_request) Successful in 11s
CI / sanitizers (address) (pull_request) Successful in 16s
CI / sanitizers (undefined) (pull_request) Successful in 16s
CI / coverage (pull_request) Successful in 10s
CI / fuzz-build (pull_request) Successful in 13s
CI / valgrind (pull_request) Successful in 12s
CI / build-and-test (pull_request) Successful in 55s
2026-07-29 18:19:50 +02:00
TapTap e68e33c0c5 Apply PR #143 content on top of latest main 2026-07-29 18:18:07 +02:00
TapTap 3b621e591a Merge pull request 'Revert PR #143 merge to main' (#145) from revert-pr-143-merge into main
CI / lint (push) Successful in 9s
CI / sanitizers (address) (push) Successful in 14s
CI / sanitizers (undefined) (push) Successful in 16s
CI / fuzz-build (push) Successful in 13s
CI / coverage (push) Successful in 10s
CI / valgrind (push) Successful in 12s
CI / build-and-test (push) Successful in 55s
2026-07-29 18:10:43 +02:00
TapTap d3dca6c2a5 Revert "Merge pull request 'Merge all 5 batch PRs: security, CLI features, protocol, performance, tests/docs' (#143) from merge-all-v2 into main"
CI / lint (pull_request) Successful in 9s
CI / sanitizers (address) (pull_request) Successful in 15s
CI / sanitizers (undefined) (pull_request) Successful in 15s
CI / coverage (pull_request) Successful in 11s
CI / fuzz-build (pull_request) Successful in 13s
CI / valgrind (pull_request) Successful in 13s
CI / build-and-test (pull_request) Successful in 54s
This reverts commit 29f4f8cde6, reversing
changes made to c6bf7bb84e.
2026-07-29 18:10:01 +02:00
TapTap 29f4f8cde6 Merge pull request 'Merge all 5 batch PRs: security, CLI features, protocol, performance, tests/docs' (#143) from merge-all-v2 into main
CI / lint (push) Successful in 11s
CI / build-and-test (push) Failing after 9s
CI / sanitizers (address) (push) Failing after 14s
CI / sanitizers (undefined) (push) Failing after 14s
CI / coverage (push) Failing after 7s
CI / fuzz-build (push) Failing after 14s
CI / valgrind (push) Failing after 9s
2026-07-29 18:09:04 +02:00
TapTap c5acd13df2 Merge remote-tracking branch 'origin/main' into merge-all-v2
CI / lint (pull_request) Successful in 12s
CI / build-and-test (pull_request) Failing after 10s
CI / sanitizers (address) (pull_request) Failing after 14s
CI / sanitizers (undefined) (pull_request) Failing after 15s
CI / coverage (pull_request) Failing after 7s
CI / fuzz-build (pull_request) Failing after 15s
CI / valgrind (pull_request) Failing after 10s
# Conflicts:
#	src/client/client_cli.c
#	tests/test_transport_ssh.c
2026-07-29 18:07:03 +02:00
TapTap c6bf7bb84e Merge pull request 'feat: add --fastsync-server-path flag to configure remote server binary path' (#144) from fastsync-server-path-flag into main
CI / lint (push) Successful in 9s
CI / sanitizers (address) (push) Successful in 15s
CI / sanitizers (undefined) (push) Successful in 15s
CI / coverage (push) Successful in 10s
CI / fuzz-build (push) Successful in 14s
CI / valgrind (push) Successful in 12s
CI / build-and-test (push) Successful in 54s
Reviewed-on: #144
2026-07-21 18:17:35 +02:00
TapTap 30239c6f50 feat: add --fastsync-server-path flag to configure remote server binary path
CI / lint (pull_request) Successful in 10s
CI / sanitizers (address) (pull_request) Successful in 14s
CI / sanitizers (undefined) (pull_request) Successful in 16s
CI / fuzz-build (pull_request) Successful in 15s
CI / coverage (pull_request) Successful in 9s
CI / valgrind (pull_request) Successful in 12s
CI / build-and-test (pull_request) Successful in 54s
2026-07-21 18:13:21 +02:00
19 changed files with 857 additions and 15 deletions
+8
View File
@@ -68,6 +68,9 @@ static void print_usage(void) {
printf(" --max-depth <n> Maximum directory depth (0=unlimited)\n"); printf(" --max-depth <n> Maximum directory depth (0=unlimited)\n");
printf(" --log-file <path> Write log messages to file\n"); printf(" --log-file <path> Write log messages to file\n");
printf(" --queue-size <n> Queue capacity for multithreaded mode (default: 100)\n"); printf(" --queue-size <n> Queue capacity for multithreaded mode (default: 100)\n");
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(" --help Show this help\n"); printf(" --help Show this help\n");
} }
@@ -308,6 +311,11 @@ int main(int argc, char* argv[]) {
exit_code = 1; exit_code = 1;
goto cleanup; goto cleanup;
} }
} else if (strcmp(argv[i], "--partial") == 0) {
config->partial = true;
} else if (strcmp(argv[i], "--fastsync-server-path") == 0 && i + 1 < argc) {
free(config->fastsync_server_path);
config->fastsync_server_path = str_dup(argv[++i]);
} else if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--verbose") == 0) { } else if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--verbose") == 0) {
set_log_level(LOG_LEVEL_DEBUG); set_log_level(LOG_LEVEL_DEBUG);
} else if (argv[i][0] == '-') { } else if (argv[i][0] == '-') {
+4 -2
View File
@@ -234,7 +234,8 @@ static int send_chunks_multithreaded(void* pipeline_context) {
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 1; return 1;
} }
client = client_connect_ssh(context->config->ssh_destination, context->config->ssh_port); client = client_connect_ssh(context->config->ssh_destination, context->config->ssh_port,
context->config->fastsync_server_path);
} else if (context->config->use_tls) { } else if (context->config->use_tls) {
client = client_create(); client = client_create();
if (!client || !client_connect_tls(client, context->config->server_host, if (!client || !client_connect_tls(client, context->config->server_host,
@@ -392,7 +393,8 @@ int send_files(Config* config) {
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 1; return 1;
} }
client = client_connect_ssh(config->ssh_destination, config->ssh_port); client =
client_connect_ssh(config->ssh_destination, config->ssh_port, config->fastsync_server_path);
if (!client) if (!client)
return 1; return 1;
} else if (config->use_tls) { } else if (config->use_tls) {
+3
View File
@@ -33,6 +33,7 @@ Config* config_create(char* version, char* send_directory, char* receive_directo
config->ssh_port = 22; config->ssh_port = 22;
config->transport = TRANSPORT_TCP; config->transport = TRANSPORT_TCP;
config->ssh_destination = NULL; config->ssh_destination = NULL;
config->fastsync_server_path = NULL;
config->exclude_patterns = NULL; config->exclude_patterns = NULL;
config->exclude_count = 0; config->exclude_count = 0;
config->include_patterns = NULL; config->include_patterns = NULL;
@@ -92,6 +93,7 @@ void config_delete(Config* config) {
free(config->send_directory); free(config->send_directory);
free(config->receive_root_directory); free(config->receive_root_directory);
free(config->ssh_destination); free(config->ssh_destination);
free(config->fastsync_server_path);
for (int i = 0; i < config->exclude_count; i++) for (int i = 0; i < config->exclude_count; i++)
free(config->exclude_patterns[i]); free(config->exclude_patterns[i]);
free(config->exclude_patterns); free(config->exclude_patterns);
@@ -227,6 +229,7 @@ Config* config_receive(int file_descriptor) {
config->ssh_port = 22; config->ssh_port = 22;
config->transport = TRANSPORT_TCP; config->transport = TRANSPORT_TCP;
config->ssh_destination = NULL; config->ssh_destination = NULL;
config->fastsync_server_path = NULL;
config->exclude_patterns = NULL; config->exclude_patterns = NULL;
config->exclude_count = 0; config->exclude_count = 0;
config->include_patterns = NULL; config->include_patterns = NULL;
+3
View File
@@ -25,6 +25,7 @@ typedef struct Config {
int ssh_port; int ssh_port;
TransportType transport; TransportType transport;
char* ssh_destination; char* ssh_destination;
char* fastsync_server_path;
char** exclude_patterns; char** exclude_patterns;
int exclude_count; int exclude_count;
char** include_patterns; char** include_patterns;
@@ -50,6 +51,8 @@ typedef struct Config {
int max_depth; int max_depth;
FILE* log_file; FILE* log_file;
int queue_size; int queue_size;
bool follow_symlinks;
bool partial;
} Config; } Config;
#define PROTOCOL_VERSION "1.3.0" #define PROTOCOL_VERSION "1.3.0"
+4 -3
View File
@@ -67,7 +67,7 @@ static int parse_remote_dest(const char* dest, RemoteDest* r) {
return 0; return 0;
} }
Client* client_connect_ssh(const char* destination, int port) { Client* client_connect_ssh(const char* destination, int port, const char* server_path) {
RemoteDest r; RemoteDest r;
if (parse_remote_dest(destination, &r) != 0) { if (parse_remote_dest(destination, &r) != 0) {
fprintf(stderr, "Invalid remote destination: %s\n", destination); fprintf(stderr, "Invalid remote destination: %s\n", destination);
@@ -147,7 +147,7 @@ Client* client_connect_ssh(const char* destination, int port) {
ssh_argv[ac++] = port_str; ssh_argv[ac++] = port_str;
} }
ssh_argv[ac++] = ssh_user; ssh_argv[ac++] = ssh_user;
ssh_argv[ac++] = "fastsync-server"; ssh_argv[ac++] = (char*)(server_path ? server_path : "fastsync-server");
ssh_argv[ac++] = "--stdio"; ssh_argv[ac++] = "--stdio";
ssh_argv[ac] = NULL; ssh_argv[ac] = NULL;
execvp("ssh", ssh_argv); execvp("ssh", ssh_argv);
@@ -168,7 +168,8 @@ Client* client_connect_ssh(const char* destination, int port) {
close(sv[0]); close(sv[0]);
waitpid(pid, NULL, 0); waitpid(pid, NULL, 0);
remote_dest_destroy(&r); remote_dest_destroy(&r);
fprintf(stderr, "Error: could not launch 'fastsync-server --stdio' on remote\n"); fprintf(stderr, "Error: could not launch '%s --stdio' on remote\n",
server_path ? server_path : "fastsync-server");
return NULL; return NULL;
} }
+1 -1
View File
@@ -3,6 +3,6 @@
#include "transport_tcp.h" #include "transport_tcp.h"
Client* client_connect_ssh(const char* destination, int port); Client* client_connect_ssh(const char* destination, int port, const char* server_path);
#endif #endif
+6
View File
@@ -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);
+80
View File
@@ -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();
}
+6
View File
@@ -0,0 +1,6 @@
#ifndef TEST_CLIENT_CLI_H
#define TEST_CLIENT_CLI_H
void test_client_cli();
#endif
+109
View File
@@ -1,10 +1,16 @@
#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(str_dup("1.0"), str_dup("/src"), str_dup("/dst"), true, true, false, Config* cfg = config_create(str_dup("1.0"), str_dup("/src"), str_dup("/dst"), true, true, false,
@@ -89,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();
@@ -96,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();
} }
+130 -5
View File
@@ -261,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();
@@ -271,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();
} }
+158
View File
@@ -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();
}
+6
View File
@@ -0,0 +1,6 @@
#ifndef TEST_FUZZ_SMOKE_H
#define TEST_FUZZ_SMOKE_H
void test_fuzz_smoke();
#endif
+83
View File
@@ -1,10 +1,18 @@
#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() {
@@ -92,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();
} }
+151
View File
@@ -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();
}
}
+6
View File
@@ -0,0 +1,6 @@
#ifndef TEST_SERVER_H
#define TEST_SERVER_H
void test_server();
#endif
+31 -4
View File
@@ -4,17 +4,44 @@
static void test_ssh_connect_invalid_dest_no_colon() { static void test_ssh_connect_invalid_dest_no_colon() {
/* cppcheck-suppress constVariablePointer */ /* cppcheck-suppress constVariablePointer */
Client* c = client_connect_ssh("/path/to/dest", 22); Client* client = client_connect_ssh("invalid-destination-no-colon", 22, NULL);
EXPECT_NULL(c); EXPECT_NULL(client);
} }
static void test_ssh_connect_invalid_dest_empty() { static void test_ssh_connect_invalid_dest_empty() {
/* cppcheck-suppress constVariablePointer */ /* cppcheck-suppress constVariablePointer */
Client* c = client_connect_ssh("", 22); Client* client = client_connect_ssh("", 22, NULL);
EXPECT_NULL(c); EXPECT_NULL(client);
}
/* Test client_connect_ssh with malformed destination (just a colon).
* parse_remote_dest succeeds, ssh is exec'd and fails, but the function
* creates a Client that must be cleaned up. */
static void test_ssh_connect_malformed() {
Client* client = client_connect_ssh(":", 22, NULL);
/* ssh binary exists, so exec succeeds; the function returns a Client.
* We just verify it doesn't crash and clean up properly. */
if (client != NULL) {
client_disconnect(client);
client_delete(client);
}
EXPECT_TRUE(true);
}
/* Test client_connect_ssh with valid format but unreachable host.
* The function launches ssh which will fail to connect, returns a Client. */
static void test_ssh_connect_unreachable() {
Client* client = client_connect_ssh("nonexistent.invalid:/remote/path", 22, NULL);
if (client != NULL) {
client_disconnect(client);
client_delete(client);
}
EXPECT_TRUE(true);
} }
void test_transport_ssh() { void test_transport_ssh() {
test_ssh_connect_invalid_dest_no_colon(); test_ssh_connect_invalid_dest_no_colon();
test_ssh_connect_invalid_dest_empty(); test_ssh_connect_invalid_dest_empty();
test_ssh_connect_malformed();
test_ssh_connect_unreachable();
} }
+42
View File
@@ -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();
} }
+26
View File
@@ -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();
} }