support login+host usernames for client secrets

[cloudstore.git] / rsync-piper.pl

diff --git a/rsync-piper.pl b/rsync-piper.pl
index cbca36f..fa9a4fb 100755 (executable)
--- a/rsync-piper.pl
+++ b/rsync-piper.pl
@@ -27,8 +27,10 @@ $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
@@ -89,7 +91,7 @@ foreach my $path ( glob "$users/*" ) {
        $login =~ s{^.+/([^/]+)$}{$1}; 
 
        if ( -d $path && -d "$path/blob" && -f "$path/secrets" ) {
-               my @secrets = map { chomp } read_file "$path/secrets";
+               my @secrets = map { chomp; $_ } read_file "$path/secrets";
                my $auth_users = join(', ', map { s/:.+$//; $_ } @secrets );
 
                $rsync_config .= <<__RSYNC_MODULE__;
@@ -155,6 +157,7 @@ while(1) {
                        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;
@@ -165,7 +168,6 @@ while(1) {
                        print $log "$transfer\n";
                        close $log;
 
-
                        my @v = split(/\|/,$transfer,$#transfer + 1);
                        my %data;
                        @data{@transfer_names} = @v ; # FIXME validate?