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

diff --git a/bak-git-server.pl b/bak-git-server.pl
index 5ba7e17..3bd5f63 100755
--- a/bak-git-server.pl
+++ b/bak-git-server.pl
@@ -27,6 +27,8 @@ bak command, overview:
   bak diff [host:][/path]
   bak status [/path]
   bak log [/path]
+  bak log-grep pattern
+  bak grep pattern
 
   bak show
   bak ch[anges]
@@ -76,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 [$_]";
 	}
 }
 
@@ -178,7 +182,14 @@ sub mkbasedir {
 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/\..+$//;
 
@@ -275,8 +286,10 @@ while (my $client = $server->accept()) {
 		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 log -g --grep=$rel_path`;
+		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' ) {