-die "Not invoked via sshd\n$Usage" unless defined $command;
-die "SSH_ORIGINAL_COMMAND='$command' is not rsync\n" unless $command =~ /^rsync\s/;
-die "$0 -ro: sending to read-only server not allowed\n"
- if $ro and $command !~ /^rsync --server --sender /;
-
-my ($cmd,$dir) = $command =~ /^(rsync\s+(?:-[-a-zA-Z]+\s+)+\.) ?("[^"]*"|[^\s"]*)$/;
-die "$0: invalid rsync-command syntax or options\n" if !defined $cmd;
-
-# Enforce default of $subdir instead of the normal $HOME default.
-my $orig = $dir;
-my @dirs;
-$dir =~ s/^"(.*?)"$/$1/;
-$dir =~ s/^\s+//;
-$dir =~ s/\s+$//;
-foreach (split(/(?<!\\)\s+/, $dir)) {
- s/\\(\s)/$1/g; # Unescape any escaped whitespace
- if ($subdir eq '/') { # Less checking for '/' access
- $dir = '/' if $dir eq '';
+die "$0: Not invoked via sshd\n$Usage" unless defined $command;
+die "$0: SSH_ORIGINAL_COMMAND='$command' is not rsync\n" unless $command =~ s/^rsync\s+//;
+our $am_sender = $command =~ /^--server\s+--sender\s/; # Restrictive on purpose!
+die "$0 -ro: sending to read-only server not allowed\n" if $ro && !$am_sender;
+
+### START of options data produced by the cull-options script. ###
+
+# These options are the only options that rsync might send to the server,
+# and only in the option/arg format that the stock rsync produces.
+
+# To disable a short-named option, add its letter to this string:
+our $short_disabled = '';
+
+our $short_no_arg = 'CDHIKLORSWbcdglnoprtuvxz'; # DO NOT REMOVE ANY
+our $short_with_num = 'B'; # DO NOT REMOVE ANY
+
+# To disable a long-named option, change its value to a 0 (NOTE: at least
+# one option appears in two places!). A value of -1 means the arg doesn't
+# need checking, a 1 means to check it, a 2 means only check when receiving.
+our %long_no_arg = (
+ 'copy-unsafe-links' => -1,
+ 'daemon' => -1,
+ 'delay-updates' => -1,
+ 'delete' => -1,
+ 'delete-after' => -1,
+ 'delete-before' => -1,
+ 'delete-during' => -1,
+ 'delete-excluded' => -1,
+ 'existing' => -1,
+ 'force' => -1,
+ 'from0' => -1,
+ 'fuzzy' => -1,
+ 'ignore-errors' => -1,
+ 'ignore-existing' => -1,
+ 'inplace' => -1,
+ 'list-only' => -1,
+ 'no-implied-dirs' => -1,
+ 'no-relative' => -1,
+ 'numeric-ids' => -1,
+ 'partial' => -1,
+ 'remove-sent-files' => $ro ? 0 : -1,
+ 'safe-links' => -1,
+ 'sender' => -1,
+ 'server' => -1,
+ 'size-only' => -1,
+);
+our %long_with_arg = (
+ 'bwlimit' => -1,
+ 'checksum-seed' => -1,
+ 'files-from' => 1,
+ 'log-format' => -1,
+ 'max-delete' => -1,
+ 'modify-window' => -1,
+ 'only-write-batch' => -1,
+ 'suffix' => -1,
+ 'timeout' => -1,
+);
+our %long_before_arg = (
+ 'backup-dir' => 2,
+ 'files-from' => 1,
+ 'max-size' => -1,
+ 'partial-dir' => 2,
+ 'temp-dir' => 2,
+);
+
+### END of options data produced by the cull-options script. ###
+
+if ($short_disabled ne '') {
+ $short_no_arg =~ s/[$short_disabled]//go;
+ $short_with_num =~ s/[$short_disabled]//go;
+}
+$short_no_arg = "[$short_no_arg]" if length($short_no_arg) > 1;
+$short_with_num = "[$short_with_num]" if length($short_with_num) > 1;
+
+my $write_log = -f LOGFILE && open(LOG, '>>', LOGFILE);
+
+chdir($subdir) or die "$0: Unable to chdir to restricted dir: $!\n";
+
+my(@opts, @args);
+my $in_options = 1;
+my $last_opt = '';
+my $check_type;
+foreach (split(/(?<!\\)\s+/, $command)) {
+ if ($check_type) {
+ push(@opts, check_arg($last_opt, $_, $check_type));
+ $check_type = 0;
+ } elsif ($in_options) {
+ push(@opts, $_);
+ if ($_ eq '.') {
+ $in_options = 0;
+ } else {
+ next if /^-$short_no_arg+$/o || /^-$short_with_num\d+$/o;
+
+ my($opt,$arg) = /^--([^=]+)(?:=(.*))?$/;
+ my $disabled;
+ if (defined $arg) {
+ my $ct = $long_with_arg{$opt};
+ if ($ct) {
+ $arg = check_arg($opt, $arg, $ct);
+ $opts[-1] =~ s/=.*/=$arg/;
+ next;
+ }
+ $disabled = defined $long_with_arg{$opt};
+ $opt = "--$opt";
+ } elsif (defined $opt) {
+ if (defined $long_no_arg{$opt}) {
+ next if $long_no_arg{$opt};
+ $disabled = 1;
+ } else {
+ $check_type = $long_before_arg{$opt};
+ if ($check_type) {
+ $last_opt = $opt;
+ next;
+ }
+ $disabled = defined $check_type;
+ }
+ $opt = "--$opt";
+ } elsif ($short_disabled ne '') {
+ $disabled = /^-$short_no_arg*([$short_disabled])/o;
+ $opt = "-$1" if $disabled;
+ }
+
+ last unless $disabled; # Generate generic failure
+ die "$0: option $opt has been disabled on this server.\n";
+ }