support login+host usernames for client secrets

[cloudstore.git] / rsync-piper.pl

diff --git a/rsync-piper.pl b/rsync-piper.pl
index 27d2f22..fa9a4fb 100755 (executable)
--- a/rsync-piper.pl
+++ b/rsync-piper.pl
@@ -9,31 +9,52 @@ use IO::Select;
 use Time::HiRes;
 use Data::Dump qw(dump);
 use English;
-use JSON::XS;
 
-my $dir = '/srv/cloudstore/var';
-my $log_fifo = "$dir/rsyncd.log";
-my $pid_file = "$dir/rsyncd.pid";
-my $cfg_file = "$dir/rsyncd.conf";
-my $users    = "users";
+use lib 'lib';
+use CloudStore::JSON;
+use CloudStore::dedup;
+
+my $dir   = $ENV{RSYNC_DIR}  || '/srv/cloudstore';
+my $port  = $ENV{RSYNC_PORT} || 6501;
+my $users = "users";
+
+my $log_fifo = "$dir/var/$port.log";
+my $pid_file = "$dir/var/$port.pid";
+my $cfg_file = "$dir/var/$port.conf";
+
+my $rsync = 'rsync';
+$rsync = 'bin/rsync' if -x 'bin/rsync'; # use 3.1dev version!
 
 my @transfer = qw(
 timestamp:%t:timestamp
-login:%u:text
+login:%m:text
+port:$port:int
+auth:%u:text
+host:%h:text
 pid:%p:int
 perms:%B:text
 itemize:%i:text
 mtime:%M:timestamp
+md5:%C:text
 op:%o:text
 size:%l:int
 transfered:%b:int
 file:%f:text
 );
 
+$transfer[2] = "port:$port:int"; # expand $port
+
 my @transfer_names =          map { ( split(/:/,$_,3) )[0] } @transfer;
-my $transfer_log   = join(' ',map { ( split(/:/,$_,3) )[1] } @transfer );
+my $transfer_log   = join('|',map { ( split(/:/,$_,3) )[1] } @transfer );
+
+if ( $ENV{SQL} ) {
+       print "CREATE TABLE rsync_transfer (\n\t",
+       join(",\n\t", map { my @m = split(/:/,$_,3); "$m[0] $m[2]" } @transfer),
+       "\n);\n";
+       exit 1;
+}
 
-mkdir $dir if ! -e $dir;
+mkdir "$dir/var" if ! -e "$dir/var";
 
 mkfifo $log_fifo, 0700 unless -p $log_fifo;
 
@@ -45,7 +66,7 @@ my $rsync_config = qq{
 use chroot = no
 
 #max connections = 4
-lock file = $dir/rsyncd.lock
+lock file = $dir/var/$port.lock
 
 #syslog facility = local5
 log file  = $log_fifo
@@ -59,16 +80,37 @@ pid file  = $pid_file
 # don't check secrets file permission (uid)
 strict modes = no
 
-pre-xfer exec = /srv/cloudstore/pre-xfer.sh
-post-xfer exec = /srv/cloudstore/post-xfer.sh
+#pre-xfer exec = /srv/cloudstore/pre-xfer.sh
+#post-xfer exec = /srv/cloudstore/post-xfer.sh
+
+};
+
+foreach my $path ( glob "$users/*" ) {
+
+       my $login = $path;
+       $login =~ s{^.+/([^/]+)$}{$1}; 
+
+       if ( -d $path && -d "$path/blob" && -f "$path/secrets" ) {
+               my @secrets = map { chomp; $_ } read_file "$path/secrets";
+               my $auth_users = join(', ', map { s/:.+$//; $_ } @secrets );
+
+               $rsync_config .= <<__RSYNC_MODULE__;
 
-[dpavlin]
-       path = /srv/cloudstore/users/dpavlin/blob
-       auth users = dpavlin
-       secrets file = /srv/cloudstore/secrets/dpavlin
+[$login]
+       path = $dir/users/$login/blob
+       auth users = $auth_users
+       secrets file = $dir/users/$login/secrets
        read only = false
 
-};
+__RSYNC_MODULE__
+
+               print "INFO: added $login = $auth_users\n";
+
+       } else {
+               warn "skipped $login: $!";
+       }
+
+}
 
 write_file $cfg_file, $rsync_config;
 warn "created $cfg_file ", -s $cfg_file, " bytes\n";
@@ -84,7 +126,7 @@ if ( -e $pid_file ) {
 }
 
 if ( ! -e $pid_file ) {
-       my $exec = "rsync --daemon --config $cfg_file --no-detach --port=6501";
+       my $exec = "$rsync --daemon --config $cfg_file --no-detach --port=$port";
        warn "START $exec\n";
 
        die "could not fork\n" unless defined(my $pid = fork);
@@ -107,32 +149,36 @@ while(1) {
        warn "# reading log output from $log_fifo\n";
        open(my $fifo, '<', $log_fifo);
        while( my $line = <$fifo> ) {
+               die $line if $line =~ /rsync error:/;
                chomp $line;
                print $line, $/;
+
                if ( $line =~ /transfer-log:(.+)/ ) {
                        my $transfer = $1;
                        $transfer =~ s|(\d\d\d\d)/(\d\d)/(\d\d)[-\s](\d\d:\d\d:\d\d)|$1-$2-$3T$4|g;
-warn "XXX $transfer";
-                       my ( $yyyy,$mm,$dd,undef,$login,undef ) = split( /[\-T\s]/, $transfer, 6 );
+                       my ( $yyyy,$mm,$dd,undef,$login,undef ) = split( /[\-T\|]/, $transfer, 6 );
+                       my $host = $1 if $login =~ s/\+(.+)//;
 
                        my $path = "users/$login/log";
                        mkdir $path unless -d $path;
                        $path .= "/$yyyy-$mm-$dd";
-warn "## $path $transfer\n";
                        my $new_log = ! -e $path;
                        open( my $log, '>>', $path );
-                       print $log join(' ',@transfer),"\n" if $new_log; # store header
+                       print $log join('|',@transfer),"\n" if $new_log; # store header
                        print $log "$transfer\n";
                        close $log;
 
-
-                       my @v = split(/\s+/,$transfer,$#transfer + 1);
+                       my @v = split(/\|/,$transfer,$#transfer + 1);
                        my %data;
                        @data{@transfer_names} = @v ; # FIXME validate?
 
-                       print ">>> data ",dump( \%data );
+                       print ">>> data ",dump( \%data ) if $ENV{DEBUG};
+
+                       CloudStore::dedup::data \%data; # uses deleted json files!
+
+                       my $json = CloudStore::JSON::rsync_transfer \%data;
 
-                       $gearman->dispatch_background( 'rsync_transfer' => encode_json \%data );
+                       $gearman->dispatch_background( 'rsync_transfer' => $json );
 
                }
        }