X-Git-Url: http://git.rot13.org/?p=bak-git.git;a=blobdiff_plain;f=bak-git-server.pl;h=fac76b7e78445bc26d3cff6e80e5cf8f94cc2fed;hp=eaad4ef7f1065676b71fedc0684b6b6d3af20cb5;hb=HEAD;hpb=cfd24d11afae959a029874ce94bcdacfd7693cc9

diff --git a/bak-git-server.pl b/bak-git-server.pl
index eaad4ef..3bd5f63 100755
--- a/bak-git-server.pl
+++ b/bak-git-server.pl
@@ -20,21 +20,28 @@ controll channel (or to pass through server ssh hops using C<ProxyCommand>)
 
   RemoteForward 9001 192.168.42.42:9001
 
-bak command overview:
+bak command, overview:
 
   bak add /path
   bak commit [/path [message]]
   bak diff [host:][/path]
   bak status [/path]
   bak log [/path]
+  bak log-grep pattern
+  bak grep pattern
 
+  bak show
   bak ch[anges]
   bak revert [host:]/path
 
   bak cat [host:]/path
+  bak grep pattern
+  bak find filename-pattern
 
   bak - push all changed files to server
 
+  bak add,commit /path
+
 See L<http://blog.rot13.org/bak-git> for more information
 
 =cut
@@ -71,8 +78,10 @@ while(<$ssh_fd>) {
 		$host = $1;
 	} elsif ( /^\s+(\S+)\s+(.+)/ ) {
 		$ssh_tunnel->{$host}++ if lc($1) eq 'remoteforward' && $2 =~ m/9001/;
+	} elsif ( /^\s+$/ ) {
+		# nop
 	} else {
-		die "can't parse $_";
+		warn "can't parse [$_]";
 	}
 }
 
@@ -90,6 +99,16 @@ warn "# ssh_client $hostname $server";
 	return $path;
 }
 
+sub _kill_ssh {
+	while ( my($host,$pid) = each %$ssh_tunnel ) {
+		warn "$host kill TERM $pid";
+		eval { kill 15, $pid; } # TERM
+	}
+}
+
+#$SIG{INT};
+$SIG{TERM} = &_kill_ssh;
+
 chdir $dir;
 system 'git init' unless -e '.git';
 
@@ -103,27 +122,40 @@ if ( $upgrade || $install ) {
 		system 'ssh-copy-id', "root\@$hostname" if ! -d $hostname;
 		my $path = shell_client( $hostname );
 		system "scp $path root\@$hostname:/usr/local/bin/";
-		system "ssh root\@$hostname apt-get install -y rsync";
+		system "ssh root\@$hostname apt-get install -y netcat rsync";
 	}
 } else {
-	warn "# start ssh tunnels...";
+	my $ssh = $ENV{SSH} || 'ssh';
+	warn "# start $ssh tunnels...";
 	foreach my $host ( keys %$ssh_tunnel ) {
+last; # FIXME disabled
 		warn "## $host\n";
-		open( $ssh_tunnel->{$host}, '-|', "ssh -N root\@$host &" ) or die $!;
+		my $pid = fork;
+		if ( ! defined $pid ) {
+			die "fork: $!";
+		} elsif ( $pid ) {
+#			waitpid $pid, 0;
+			warn "FIXME: waitpid $pid";
+		} else {
+			warn "EXEC $ssh $host";
+			exec "$ssh -N root\@$host";
+		}
+
+		$ssh_tunnel->{$host} = $pid;
 	}
 }
 
+warn "dir: $dir listen: $server_ip:9001\n";
+
 my $server = IO::Socket::INET->new(
 	Proto     => 'tcp',
-	LocalAddr => $server_ip,
+#	LocalAddr => $server_ip,
 	LocalPort => 9001,
 	Listen    => SOMAXCONN,
 	Reuse     => 1
 ) || die $!;
 
 
-warn "dir: $dir listen: $server_ip:9001\n";
-
 sub rsync {
 	warn "# rsync ",join(' ', @_), "\n";
 	system 'rsync', @_;
@@ -140,10 +172,24 @@ sub pull_changes {
 	rsync split / /, "-avv --files-from /tmp/$hostname.list root\@$hostname:/ $hostname/";
 }
 
+sub mkbasedir {
+	my $path = shift;
+	$path =~ s{/[^/]+$}{};
+	warn "# mkpath $path\n";
+	mkpath $path || die $!;
+}
+
 while (my $client = $server->accept()) {
 	my $line = <$client>;
 	chomp($line);
-	warn "<<< $line\n";
+
+	my $peerhost = $client->peerhost;
+	if ( $peerhost !~ m/^(10\.13\.37\.|10\.60\.0\.|10\.200\.100\.)/ ) {
+		print $client "$peerhost not allowed\n";
+		next;
+	}
+
+	warn "<<< $peerhost $line\n";
 	my ($user,$hostname,$pwd,$command,$rel_path,$message) = split(/\s+/,$line,6);
 	$hostname =~ s/\..+$//;
 
@@ -158,6 +204,8 @@ while (my $client = $server->accept()) {
 	}
 	my $path = $rel_path =~ m{^/} ? $rel_path : "$pwd/$rel_path";
 
+	foreach my $command ( split /,/, $command ) { # XXX command loop
+
 	warn "$hostname [$command] $on_host:$path | $message\n";
 
 	my $args_message = $message;
@@ -224,16 +272,42 @@ while (my $client = $server->accept()) {
 		}
 	} elsif ( $command eq 'cat' ) {
 		my $file_path = ( $on_host ? $on_host : $hostname ) . "/$path";
-		open(my $file, '<', $file_path) || warn "ERROR $file_path: $!";
-		while(<$file>) {
-			print $client $_;
+		if ( -r $file_path ) {
+			open(my $file, '<', $file_path) || warn "ERROR $file_path: $!";
+			while(<$file>) {
+				print $client $_;
+			}
+			close($file);
+		} else {
+			print $client "ERROR: $file_path: $!\n";
 		}
-		close($file);
 	} elsif ( $command eq 'ls' ) {
-		print $client `ls $backup_path`;
+		my $file_path = ( $on_host ? $on_host : $hostname ) . "/$path";
+		print $client `ls $file_path 2>&1`;
+	} elsif ( $command eq 'show' ) {
+		print $client `git show $rel_path`;
+	} elsif ( $command eq 'log-grep' ) {
+		#print $client `git log -g --grep=$rel_path`;
+	} elsif ( $command eq 'grep' ) {
+		print $client `git grep $rel_path`;
+	} elsif ( $command eq 'find' ) {
+		print $client `find . -iname '*$rel_path*' | sed -e 's,^./,,' -e 's,/,:/,'`
+	} elsif ( $command eq 'link' ) {
+		if ( $on_host ) {
+			mkbasedir "$on_host/$path";
+			rsync( '-avv', "root\@$on_host:$path", "$on_host/$path" );
+			mkbasedir "$hostname/$path";
+			link "$on_host/$path", "$hostname/$path";
+			rsync( '-avv', "$hostname/$path", "root\@$hostname:$path" );
+		} else {
+			print $client "ERROR: link requires host:/path\n";
+		}
 	} else {
-		print $client "Unknown command: $command\n";
+		print $client "ERROR: unknown command: $command\n";
 	}
 
+	} # XXX command, loop
+
+	close($client);
 }