TapTap
825ba69753
Re-review findings on the C3/C4 hardening branch: - --stdio is the SSH transport whose remote argv is composed by the client (including via --remote-option), so accepting --allow-super there let a client defeat the C3 secure default for a root receiver. Reject it at CLI parse time (standalone TCP only) and force the process-global flag off for --stdio as defense in depth. Correct the help text and README/RSYNC_COMPAT: the --stdio argv is client-composed, super stays off, and a forced command is needed if the default must hold. - daemon_conf: the per-module 'hosts allow'/'hosts deny' call sites passed module_name and replace in the wrong order, so multiple lines replaced instead of appended and the empty-value error omitted the module name. Pass (module->name, false) like the global keys; add a unit test for two per-module allow/deny lines appending. - tls: read the client CN via ASN1_STRING_to_UTF8 so an exactly-required-length name is accepted and only actual over-length CNs are rejected.
80 lines
4.3 KiB
C
80 lines
4.3 KiB
C
#ifndef SERVER_CLI_H
|
|
#define SERVER_CLI_H
|
|
|
|
#include <stdbool.h>
|
|
#include <stddef.h>
|
|
#include <stdint.h>
|
|
|
|
/* Parsed fastsync-server command line. All string members are borrowed
|
|
* pointers into the original argv (valid for the life of the argv array the
|
|
* caller passed to server_cli_parse); dparams points at the raw --dparam
|
|
* argument strings. No member owns heap memory. */
|
|
typedef struct ServerCliOptions {
|
|
bool stdio_mode; /* --stdio */
|
|
bool daemon_mode; /* --daemon */
|
|
bool no_detach; /* --no-detach */
|
|
bool verbose; /* -v / --verbose */
|
|
bool show_help; /* --help */
|
|
bool use_tls; /* --tls */
|
|
const char* tls_cert; /* --cert */
|
|
const char* tls_key; /* --key */
|
|
const char* tls_ca; /* --ca */
|
|
const char* client_cn; /* --client-cn */
|
|
bool destination_root_set; /* an explicit --destination-root was given */
|
|
const char* destination_root; /* --destination-root value ("." if unset) */
|
|
bool port_set; /* an explicit -p was given */
|
|
int port; /* -p value (default 8080 when unset) */
|
|
const char* config_path; /* --config value, or NULL */
|
|
const char* password_file; /* --password-file value, or NULL (daemon) */
|
|
const char* early_input_file; /* --early-input value, or NULL (daemon) */
|
|
/* --hash-credentials=FILE: read `user:password` lines from FILE and print
|
|
* new-format credential-store lines to stdout, then exit. Standalone mode
|
|
* (mutually exclusive with --daemon/--stdio). */
|
|
const char* hash_credentials_file;
|
|
bool hash_iterations_set; /* an explicit --iterations was given */
|
|
uint32_t hash_iterations; /* --iterations value (default CREDENTIAL_DEFAULT_ITERS) */
|
|
const char** dparams; /* raw --dparam override strings */
|
|
int dparam_count;
|
|
const char* bind_address; /* --address */
|
|
int bind_family; /* AF_UNSPEC / AF_INET / AF_INET6 */
|
|
bool allow_delete; /* --allow-delete */
|
|
bool trust_sender; /* --trust-sender */
|
|
bool allow_unauthenticated; /* --allow-unauthenticated */
|
|
/* --no-super: operator veto forcing SUPER_MODE_OFF for every connection, so
|
|
* the receiver never attempts super-user activities (ownership application,
|
|
* device-node creation) even when running as root. Applies to --stdio and
|
|
* --daemon alike; also makes the server refuse any client --copy-as. */
|
|
bool no_super; /* --no-super */
|
|
/* --allow-super: locally-launched standalone TCP listener opt-in that keeps
|
|
* the historical permissive behavior for a PRIVILEGED (root) receiver.
|
|
* Without it a root standalone server forces SUPER_MODE_OFF, so a client
|
|
* --devices / --write-devices / --super / ownership request cannot make it
|
|
* create device nodes, write raw devices, or apply client-chosen ownership.
|
|
* It is rejected for --stdio: that path's remote argv is composed by the
|
|
* client (directly and via --remote-option), so it must never opt a root
|
|
* receiver back into super mode. Non-root receivers are unaffected (the
|
|
* kernel refuses the confined attempts). The daemon path instead uses the
|
|
* per-module `client owner = yes` opt-in. */
|
|
bool allow_super; /* --allow-super */
|
|
/* --iconv=CONVERT_SPEC: the server's own LOCAL charset declaration. The
|
|
* client's full spec rides the wire config frame anyway; when the server is
|
|
* started with its own --iconv, its LOCAL half overrides the local charset
|
|
* the client assumed so the server converts received names to ITS charset.
|
|
* Borrowed pointer into argv (never owns heap). */
|
|
const char* iconv_spec; /* --iconv value, or NULL */
|
|
} ServerCliOptions;
|
|
|
|
/* Parse argc/argv into *opts. Zero-initialize *opts before calling (or use
|
|
* server_cli_options_default). Returns:
|
|
* 1 -- --help was requested (opts->show_help set; caller prints usage).
|
|
* 0 -- parsed successfully.
|
|
* -1 -- invalid arguments (err is filled with the reason).
|
|
*/
|
|
void server_cli_options_default(ServerCliOptions* opts);
|
|
int server_cli_parse(int argc, char* argv[], ServerCliOptions* opts, char* err, size_t err_size);
|
|
/* Release the only heap the parsed options own (the dparams pointer array; the
|
|
* strings it points at are borrowed from argv and are not freed). Safe to
|
|
* call on a zero-initialized/defaulted struct. */
|
|
void server_cli_options_free(ServerCliOptions* opts);
|
|
#endif
|