CI / lint (pull_request) Successful in 26s
CI / sanitizers (address) (pull_request) Failing after 41s
CI / sanitizers (undefined) (pull_request) Successful in 40s
CI / fuzz-build (pull_request) Successful in 18s
CI / coverage (pull_request) Successful in 35s
CI / valgrind (pull_request) Failing after 37s
CI / build-and-test (pull_request) Failing after 2m35s
RSYNC_COMPAT Phase-2 row M: path-list construction and destination directory creation while preserving traversal safety. - -R/--relative with --files-from: transmit each listed entry under its bare relative destination path (no source-root mirror). Files keep an absolute local read path plus a separate wire/dest path (File.send_path); manifest, incremental quick-check and change output follow the wire path, so --delete and --remove-source-files stay consistent. -R without --files-from is unchanged (full mirror). - --no-implied-dirs: client-only, only meaningful with -R + --files-from. A listed file whose parent dir is not itself (or via an ancestor) explicitly listed cannot be placed; the run fails up front with a clear error. No effect otherwise. - --dirs/-d + --old-dirs/--old-d aliases: -d <dir> transmits the source root as an explicit empty directory entry (STATUS_MKDIR frame); with --files-from listed dirs are created empty and listed files transferred, never descending. Works single-threaded, -m (sequential scanner in the -m scan thread) and chunk-serialization (per-file type marker). Directory entries appear in the delete manifest. - --mkpath: new wire bool; server creates the destination root (and missing leading components under its authorized root) at connection start. A missing destination root is now rejected by default. - Protocol bumped to 2.7.0 (mkpath wire field + STATUS_MKDIR + chunk type marker). All receive paths funnel through file_save_to_disk_full which creates directories via the secure confined mkdir engine; dir entries are excluded from --remove-source-files outcome acknowledgements on both ends. - Unit coverage: CLI parse (relative/dirs aliases/mkpath/no-implied-dirs), config round-trip (relative + mkpath), scanner --dirs non-recursion and -R send_path (sequential + parallel), receiver dir-entry save. - Integration coverage: TestRelativeFilesFrom, TestNoImpliedDirs, TestDirs, TestMkpath (single and -m). - RSYNC_COMPAT: 4 rows move to Implemented (Summary 67/3/5/1/71 = 147).
369 lines
11 KiB
C
369 lines
11 KiB
C
#include <stddef.h>
|
|
#include <stdint.h>
|
|
#include <limits.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include "array_list.h"
|
|
#include "chunk.h"
|
|
#include "compression.h"
|
|
#include "data.h"
|
|
#include "file.h"
|
|
#include "log.h"
|
|
#include "metadata.h"
|
|
#include "protocol.h"
|
|
#include "utils.h"
|
|
|
|
/* Maximum individual file data size within a chunk (64 MB) */
|
|
#define MAX_FILE_DATA_SIZE (64ULL * 1024 * 1024)
|
|
#define MAX_FILES_PER_CHUNK 65536U
|
|
|
|
Chunk* chunk_create(File** items, int element_count) {
|
|
if (element_count < 0 || (element_count > 0 && items == NULL))
|
|
return NULL;
|
|
Chunk* chunk = (Chunk*)protocol_alloc(sizeof(Chunk));
|
|
if (chunk == NULL) {
|
|
log_perror("ERROR: Could not allocate memory for chunk structure");
|
|
return NULL;
|
|
}
|
|
|
|
if (element_count == 0) {
|
|
chunk->items = NULL;
|
|
} else {
|
|
if ((size_t)element_count > SIZE_MAX / sizeof(File*)) {
|
|
free(chunk);
|
|
return NULL;
|
|
}
|
|
chunk->items = (File**)protocol_alloc((size_t)element_count * sizeof(File*));
|
|
if (chunk->items == NULL) {
|
|
free(chunk);
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
for (int i = 0; i < element_count; i++) {
|
|
chunk->items[i] = items[i];
|
|
}
|
|
chunk->element_count = element_count;
|
|
return chunk;
|
|
}
|
|
|
|
void chunk_destroy(void* item) {
|
|
if (item == NULL) {
|
|
return;
|
|
}
|
|
Chunk* chunk = (Chunk*)item;
|
|
for (int i = 0; i < chunk->element_count; ++i) {
|
|
if (chunk->items[i] != NULL) {
|
|
file_destroy(chunk->items[i]);
|
|
}
|
|
}
|
|
free(chunk->items);
|
|
free(chunk);
|
|
}
|
|
|
|
static unsigned long long per_file_serialize_size(File* file, bool use_metadata) {
|
|
unsigned long long size = sizeof(size_t);
|
|
size_t path_len = strlen(file_wire_path(file));
|
|
unsigned long long metadata_size =
|
|
use_metadata ? sizeof(int) + (file->metadata ? FILE_METADATA_WIRE_SIZE : 0) : 0;
|
|
if ((unsigned long long)path_len > ULLONG_MAX - size)
|
|
return 0;
|
|
size += path_len;
|
|
if (metadata_size > ULLONG_MAX - size)
|
|
return 0;
|
|
size += metadata_size;
|
|
/* Entry type marker: 0 = regular file, 1 = explicit directory entry. */
|
|
if (sizeof(int) > ULLONG_MAX - size)
|
|
return 0;
|
|
size += sizeof(int);
|
|
if (sizeof(size_t) > ULLONG_MAX - size)
|
|
return 0;
|
|
size += sizeof(size_t);
|
|
if ((unsigned long long)file->data->size > ULLONG_MAX - size)
|
|
return 0;
|
|
return size + file->data->size;
|
|
}
|
|
|
|
Data* chunk_serialize(Chunk* chunk, bool use_metadata) {
|
|
if (!chunk || chunk->element_count < 0 || (chunk->element_count > 0 && chunk->items == NULL))
|
|
return NULL;
|
|
unsigned long long data_size = 0;
|
|
for (int i = 0; i < chunk->element_count; i++) {
|
|
if (!chunk->items[i] || !chunk->items[i]->path || !chunk->items[i]->data ||
|
|
(chunk->items[i]->data->size > 0 && !chunk->items[i]->data->data) ||
|
|
chunk->items[i]->path[0] == '\0' || has_path_traversal(chunk->items[i]->path) ||
|
|
(file_wire_path(chunk->items[i]))[0] == '\0')
|
|
return NULL;
|
|
unsigned long long file_size = per_file_serialize_size(chunk->items[i], use_metadata);
|
|
if (file_size == 0 || file_size > ULLONG_MAX - data_size || data_size + file_size > SIZE_MAX)
|
|
return NULL;
|
|
data_size += file_size;
|
|
}
|
|
Data* data = data_create_empty(data_size);
|
|
if (data == NULL) {
|
|
log_message(LOG_LEVEL_ERROR, "Could not allocate memory for chunk serialization");
|
|
return NULL;
|
|
}
|
|
char* data_pointer = data->data;
|
|
for (int i = 0; i < chunk->element_count; i++) {
|
|
File* file = chunk->items[i];
|
|
const char* wire_path = file_wire_path(file);
|
|
size_t path_len = strlen(wire_path);
|
|
memcpy(data_pointer, &path_len, sizeof(size_t));
|
|
data_pointer += sizeof(size_t);
|
|
memcpy(data_pointer, wire_path, path_len);
|
|
data_pointer += path_len;
|
|
|
|
int entry_type = file->is_dir ? 1 : 0;
|
|
memcpy(data_pointer, &entry_type, sizeof(int));
|
|
data_pointer += sizeof(int);
|
|
|
|
if (use_metadata)
|
|
metadata_to_buf(&data_pointer, file->metadata);
|
|
|
|
size_t file_data_size = file->data->size;
|
|
memcpy(data_pointer, &file_data_size, sizeof(size_t));
|
|
data_pointer += sizeof(size_t);
|
|
if (file_data_size > 0)
|
|
memcpy(data_pointer, file->data->data, file_data_size);
|
|
data_pointer += file_data_size;
|
|
}
|
|
return data;
|
|
}
|
|
|
|
Chunk* chunk_deserialize(Data* data, bool use_metadata) {
|
|
if (!data || (!data->data && data->size != 0))
|
|
return NULL;
|
|
ArrayList* files = array_list_create(file_destroy);
|
|
if (files == NULL)
|
|
return NULL;
|
|
char* data_pointer = data->data;
|
|
size_t remaining_size = data->size;
|
|
|
|
while (remaining_size > 0) {
|
|
if ((unsigned int)files->size >= MAX_FILES_PER_CHUNK) {
|
|
log_message(LOG_LEVEL_ERROR, "Chunk contains too many files");
|
|
array_list_delete(files);
|
|
return NULL;
|
|
}
|
|
if (remaining_size < sizeof(size_t)) {
|
|
log_message(LOG_LEVEL_ERROR, "Invalid chunk format: not enough data for path length");
|
|
array_list_delete(files);
|
|
return NULL;
|
|
}
|
|
|
|
size_t path_len;
|
|
memcpy(&path_len, data_pointer, sizeof(size_t));
|
|
data_pointer += sizeof(size_t);
|
|
remaining_size -= sizeof(size_t);
|
|
|
|
if (path_len > SIZE_MAX - 1 || remaining_size < path_len) {
|
|
log_message(LOG_LEVEL_ERROR, "Invalid chunk format: not enough data for path");
|
|
array_list_delete(files);
|
|
return NULL;
|
|
}
|
|
|
|
if (path_len == SIZE_MAX) {
|
|
array_list_delete(files);
|
|
return NULL;
|
|
}
|
|
char* path = protocol_alloc(path_len + 1);
|
|
if (path == NULL) {
|
|
log_perror("Could not allocate memory for file path");
|
|
array_list_delete(files);
|
|
return NULL;
|
|
}
|
|
memcpy(path, data_pointer, path_len);
|
|
path[path_len] = '\0';
|
|
if (memchr(path, '\0', path_len) != NULL) {
|
|
free(path);
|
|
array_list_delete(files);
|
|
return NULL;
|
|
}
|
|
data_pointer += path_len;
|
|
remaining_size -= path_len;
|
|
|
|
if (path_len == 0 || has_path_traversal(path)) {
|
|
free(path);
|
|
array_list_delete(files);
|
|
return NULL;
|
|
}
|
|
|
|
File* file = file_create(path);
|
|
free(path);
|
|
if (file == NULL) {
|
|
array_list_delete(files);
|
|
return NULL;
|
|
}
|
|
|
|
if (remaining_size < sizeof(int)) {
|
|
log_message(LOG_LEVEL_ERROR, "Invalid chunk format: not enough data for entry type");
|
|
file_destroy(file);
|
|
array_list_delete(files);
|
|
return NULL;
|
|
}
|
|
int entry_type;
|
|
memcpy(&entry_type, data_pointer, sizeof(int));
|
|
if (entry_type != 0 && entry_type != 1) {
|
|
log_message(LOG_LEVEL_ERROR, "Invalid chunk format: bad entry type");
|
|
file_destroy(file);
|
|
array_list_delete(files);
|
|
return NULL;
|
|
}
|
|
file->is_dir = entry_type == 1;
|
|
data_pointer += sizeof(int);
|
|
remaining_size -= sizeof(int);
|
|
|
|
if (use_metadata) {
|
|
if (remaining_size < sizeof(int)) {
|
|
log_message(LOG_LEVEL_ERROR, "Invalid chunk format: not enough data for metadata");
|
|
file_destroy(file);
|
|
array_list_delete(files);
|
|
return NULL;
|
|
}
|
|
// Peek at present flag to determine total size needed before reading
|
|
int present_flag;
|
|
memcpy(&present_flag, data_pointer, sizeof(int));
|
|
if ((present_flag != 0 && present_flag != 1) ||
|
|
(present_flag == 1 && remaining_size < sizeof(int) + FILE_METADATA_WIRE_SIZE)) {
|
|
log_message(LOG_LEVEL_ERROR, "Invalid chunk format: not enough data for metadata body");
|
|
file_destroy(file);
|
|
array_list_delete(files);
|
|
return NULL;
|
|
}
|
|
file->metadata = metadata_from_buf(&data_pointer);
|
|
remaining_size -= sizeof(int);
|
|
if (present_flag == 1) {
|
|
if (file->metadata == NULL) {
|
|
file_destroy(file);
|
|
array_list_delete(files);
|
|
return NULL;
|
|
}
|
|
remaining_size -= FILE_METADATA_WIRE_SIZE;
|
|
}
|
|
}
|
|
|
|
if (remaining_size < sizeof(size_t)) {
|
|
log_message(LOG_LEVEL_ERROR, "Invalid chunk format: not enough data for data size");
|
|
file_destroy(file);
|
|
array_list_delete(files);
|
|
return NULL;
|
|
}
|
|
|
|
size_t file_data_size;
|
|
memcpy(&file_data_size, data_pointer, sizeof(size_t));
|
|
data_pointer += sizeof(size_t);
|
|
remaining_size -= sizeof(size_t);
|
|
|
|
if (remaining_size < file_data_size) {
|
|
log_message(LOG_LEVEL_ERROR, "Invalid chunk format: not enough data for file content");
|
|
file_destroy(file);
|
|
array_list_delete(files);
|
|
return NULL;
|
|
}
|
|
|
|
// Reject individual file data larger than the maximum allowed size.
|
|
if (file_data_size > MAX_FILE_DATA_SIZE) {
|
|
log_message(LOG_LEVEL_ERROR, "File data size %zu exceeds maximum %llu", file_data_size,
|
|
(unsigned long long)MAX_FILE_DATA_SIZE);
|
|
file_destroy(file);
|
|
array_list_delete(files);
|
|
return NULL;
|
|
}
|
|
|
|
size_t allocation_size = file_data_size > 0 ? file_data_size : 1;
|
|
void* file_data = protocol_alloc(allocation_size);
|
|
if (file_data == NULL) {
|
|
log_perror("Could not allocate memory for file data");
|
|
file_destroy(file);
|
|
array_list_delete(files);
|
|
return NULL;
|
|
}
|
|
memcpy(file_data, data_pointer, file_data_size);
|
|
Data* replacement = data_create(file_data, file_data_size);
|
|
if (replacement == NULL) {
|
|
file_destroy(file);
|
|
array_list_delete(files);
|
|
return NULL;
|
|
}
|
|
data_destroy(file->data);
|
|
file->data = replacement;
|
|
data_pointer += file_data_size;
|
|
remaining_size -= file_data_size;
|
|
|
|
if (!array_list_add(files, file)) {
|
|
file_destroy(file);
|
|
array_list_delete(files);
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
File** file_array = (File**)array_list_to_array(files);
|
|
if (files->size > 0 && file_array == NULL) {
|
|
array_list_delete(files);
|
|
return NULL;
|
|
}
|
|
Chunk* chunk = chunk_create(file_array, files->size);
|
|
|
|
free(file_array);
|
|
if (chunk == NULL) {
|
|
array_list_delete(files);
|
|
return NULL;
|
|
}
|
|
files->item_destroyer = NULL;
|
|
array_list_delete(files);
|
|
|
|
return chunk;
|
|
}
|
|
|
|
Data* chunk_compress(Chunk* chunk, int compression_level, bool use_metadata) {
|
|
return chunk_compress_with_threads(chunk, compression_level, use_metadata, 0);
|
|
}
|
|
|
|
Data* chunk_compress_with_threads(Chunk* chunk, int compression_level, bool use_metadata,
|
|
int compression_threads) {
|
|
log_message(LOG_LEVEL_DEBUG, "Starting to compress chunk");
|
|
Data* serialized = chunk_serialize(chunk, use_metadata);
|
|
if (serialized == NULL)
|
|
return NULL;
|
|
Data* compressed = data_compress_with_threads(serialized, compression_level, compression_threads);
|
|
data_destroy(serialized);
|
|
if (compressed == NULL)
|
|
return NULL;
|
|
log_debug_message(LOG_DEBUG_PACK, "Chunk successfully compressed");
|
|
return compressed;
|
|
}
|
|
|
|
Chunk* receive_chunk_data(int fd, const Config* config) {
|
|
Data* chunk_data = receive_data_limited(fd, MAX_CHUNK_SIZE);
|
|
if (chunk_data == NULL) {
|
|
log_message(LOG_LEVEL_ERROR, "Failed to receive chunk data");
|
|
return NULL;
|
|
}
|
|
Data* data_to_process = chunk_data;
|
|
if (config->use_compression) {
|
|
data_to_process = data_decompress_limited(chunk_data, MAX_CHUNK_SIZE);
|
|
data_destroy(chunk_data);
|
|
if (data_to_process == NULL) {
|
|
log_message(LOG_LEVEL_ERROR, "Failed to decompress chunk");
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
// Reject chunks larger than the maximum allowed size to prevent OOM.
|
|
if (data_to_process->size > MAX_CHUNK_SIZE) {
|
|
log_message(LOG_LEVEL_ERROR, "Chunk size %zu exceeds maximum %llu", data_to_process->size,
|
|
(unsigned long long)MAX_CHUNK_SIZE);
|
|
data_destroy(data_to_process);
|
|
return NULL;
|
|
}
|
|
|
|
Chunk* chunk = chunk_deserialize(data_to_process, config->use_metadata);
|
|
data_destroy(data_to_process);
|
|
if (chunk == NULL)
|
|
log_message(LOG_LEVEL_ERROR, "Failed to deserialize chunk, skipping");
|
|
return chunk;
|
|
}
|