Better handling of .git suffixes

diff --git a/git-daemon/git-service.in b/git-daemon/git-service.in
index 75e64d57a2ed142cf670e67277cf0fd2d40c210f..2b8aff34e4705f441840a10490285bd264c1c5d7 100755 (executable)
--- a/git-daemon/git-service.in
+++ b/git-daemon/git-service.in
@@ -26,11 +26,15 @@ fail "No user $ENV{USER} mapping for $uri" unless defined $serve_user;
 
 $serve_dir = "$ENV{HOME}/$serve_dir" unless $serve_dir =~ m|^/|;
 
-fail "Bad subdirectory $serve_repo" unless $serve_repo =~ m/$repo_regexp/o;
-fail "bad config - repo-regexp does not capture" unless defined $1;
-my $sani_repo= $1;
-
-my $dir = $serve_dir.(length $sani_repo ? "/$sani_repo" : '');
+if (length $serve_repo) {
+    my $inspect= $serve_repo;
+    $inspect =~ s,^/,,;
+    fail "Bad subdirectory $serve_repo" unless $inspect =~ m/$repo_regexp/o;
+    fail "bad config - repo-regexp does not capture" unless defined $1;
+    $serve_repo= "/$1";
+}
+
+my $dir = $serve_dir.$serve_repo;
 
 my $path = $check_export ? "$dir/git-daemon-export-ok" : $dir;
 fail "$! $path" unless -e $path;

diff --git a/git-daemon/git-urlmap b/git-daemon/git-urlmap
index 10aaed26917eeee85cb5f29a91283ab9e8207a26..5a4e07ea3a1cc5bfa59355e19428a602a1c28db8 100644 (file)
--- a/git-daemon/git-urlmap
+++ b/git-daemon/git-urlmap
@@ -18,7 +18,7 @@
 #           regexp, which must contain a single matching
 #           group which is the filesystem pathname inside
 #           the <directory>.  The default is (Tcl syntax):
-#     repo-regexp {^(\w[-+._0-9A-Za-z]*)$}
+#     repo-regexp ^(w[-+._0-9A-Za-z]*/?\.git)$
 # 
 #     [no-]require-git-daemon-export-ok
 #           For per-user service.  Default is no-.

diff --git a/git-daemon/read-urlmap b/git-daemon/read-urlmap
index 0fd760f8c2c95b91756507c5ad528351ea2bf1b7..696ee654a33085f5beec817f9f57eb0ebd89cf34 100644 (file)
--- a/git-daemon/read-urlmap
+++ b/git-daemon/read-urlmap
@@ -34,7 +34,8 @@ fail "no config ??" unless @ARGV;
 fail "no specpath ??" unless length $specpath;
 
 our $uri = "git://$spechost/$specpath";
-our $repo_regexp= '^/*(\\w[-+._0-9A-Za-z]*)$';  # stupid emacs ';
+
+our $repo_regexp= '^(\\w[-+._0-9A-Za-z]*/?\.git)$';  # stupid emacs ';
 our $check_export= 0;
 
 our ($serve_user, $serve_dir, $serve_repo);