diff options
| author | Ian Jackson <ian@chiark.greenend.org.uk> | 2010-05-22 20:05:51 +0100 |
|---|---|---|
| committer | Ian Jackson <ian@chiark.greenend.org.uk> | 2010-05-22 20:05:51 +0100 |
| commit | 9bbb6177dcbb0b385f35da3fd23f032fa426bc1a (patch) | |
| tree | 4b9d9f509e6517eb5daa8c647132d33d8f4c8904 /git-daemon | |
| parent | 4063cda31f0713f3baacbcee47ff1b4e760145aa (diff) | |
| download | userv-utils-9bbb6177dcbb0b385f35da3fd23f032fa426bc1a.tar.gz | |
Better handling of .git suffixes
Diffstat (limited to 'git-daemon')
| -rwxr-xr-x | git-daemon/git-service.in | 14 | ||||
| -rw-r--r-- | git-daemon/git-urlmap | 2 | ||||
| -rw-r--r-- | git-daemon/read-urlmap | 3 |
3 files changed, 12 insertions, 7 deletions
diff --git a/git-daemon/git-service.in b/git-daemon/git-service.in index 75e64d5..2b8aff3 100755 --- 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 10aaed2..5a4e07e 100644 --- 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 0fd760f..696ee65 100644 --- 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); |