git-daemon: allow virtual hosts to forbit tilde parts in URLs

[userv-utils] / git-daemon / git-daemon.pl

diff --git a/git-daemon/git-daemon.pl b/git-daemon/git-daemon.pl
index 5458c08fcd2c77036fcf34261d900640fbbb010e..a17412f1fa9ccf28c11246d3ae71e41d27faecfe 100755 (executable)
--- a/git-daemon/git-daemon.pl
+++ b/git-daemon/git-daemon.pl
@@ -17,8 +17,8 @@ use POSIX;
 use Socket;
 use Sys::Syslog;
 
 use Socket;
 use Sys::Syslog;
 

-use vars qw{ %vhost_default_user %vhost_user_from_tilde
-             $TILDE $REPO $HOSTNAME };
+use vars qw{ $TILDE $REPO $HOSTNAME
+   %vhost_default_user %vhost_tilde_is_user %vhost_tilde_forbidden };

 
 use lib '/etc/userv';
 require 'git-daemon-vhosts.pl';
 
 use lib '/etc/userv';
 require 'git-daemon-vhosts.pl';


@@ -67,8 +67,9 @@ unless ($line =~ m{^git-upload-pack (?:~($TILDE)/)?($REPO[.]git)\0host=($HOSTNAM
 my ($tilde,$repo,$host) = ($1,$2,$3);
 my $url = $tilde ? "git://$host/~$tilde/$repo" : "git://$host/$repo";
 
 my ($tilde,$repo,$host) = ($1,$2,$3);
 my $url = $tilde ? "git://$host/~$tilde/$repo" : "git://$host/$repo";
 

-my $user = $vhost_user_from_tilde{$host} ? $tilde : $vhost_default_user{$host};
-fail "no user configuration for $url" unless defined $user;
+fail "tilde forbidden for $url" if defined $tilde and $vhost_tilde_forbidden{$host};
+my $user = $vhost_tilde_is_user{$host} ? $tilde : $vhost_default_user{$host};
+fail "no user configured for $url" unless defined $user;

 syslog 'info', "$peer $user $url";
 
 my @opts = ("-DHOST=$host", "-DREPO=$repo");
 syslog 'info', "$peer $user $url";
 
 my @opts = ("-DHOST=$host", "-DREPO=$repo");