support login+host usernames for client secrets

[cloudstore.git] / rsync-piper.pl

diff --git a/rsync-piper.pl b/rsync-piper.pl
index f990d85..fa9a4fb 100755 (executable)
--- a/rsync-piper.pl
+++ b/rsync-piper.pl
@@ -12,22 +12,25 @@ use English;
 
 use lib 'lib';
 use CloudStore::JSON;
+use CloudStore::dedup;
 
-my $dir   = $ENV{RSYNC_DIR}  || '/srv/cloudstore/var';
+my $dir   = $ENV{RSYNC_DIR}  || '/srv/cloudstore';
 my $port  = $ENV{RSYNC_PORT} || 6501;
 my $users = "users";
 
-my $log_fifo = "$dir/$port.log";
-my $pid_file = "$dir/$port.pid";
-my $cfg_file = "$dir/$port.conf";
+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
@@ -51,7 +54,7 @@ if ( $ENV{SQL} ) {
        exit 1;
 }
 
-mkdir $dir if ! -e $dir;
+mkdir "$dir/var" if ! -e "$dir/var";
 
 mkfifo $log_fifo, 0700 unless -p $log_fifo;
 
@@ -63,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
@@ -77,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
 
-[dpavlin]
-       path = /srv/cloudstore/users/dpavlin/blob
-       auth users = dpavlin
-       secrets file = /srv/cloudstore/secrets/dpavlin
+};
+
+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__;
+
+[$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";
@@ -125,12 +149,15 @@ 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;
                        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;
@@ -141,13 +168,14 @@ while(1) {
                        print $log "$transfer\n";
                        close $log;
 
-
                        my @v = split(/\|/,$transfer,$#transfer + 1);
                        my %data;
                        @data{@transfer_names} = @v ; # FIXME validate?
 
                        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' => $json );