From e8c48e9f4c6fd033e81f54d408ca1d01f5ddb065 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Fri, 2 Jan 2015 12:20:09 +0100 Subject: git-serve.py: Relax path validation Make the terminating slash in repository URLs optional. Signed-off-by: Lukas Fleischer --- scripts/git-integration/git-serve.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'scripts/git-integration') diff --git a/scripts/git-integration/git-serve.py b/scripts/git-integration/git-serve.py index 3669a737..c81887b9 100755 --- a/scripts/git-integration/git-serve.py +++ b/scripts/git-integration/git-serve.py @@ -26,9 +26,12 @@ ssh_cmdline = config.get('serve', 'ssh-cmdline') def repo_path_validate(path): if not path.startswith(repo_base_path): return False - if not path.endswith('.git/'): + if path.endswith('.git'): + repo = path[len(repo_base_path):-4] + elif path.endswith('.git/'): + repo = path[len(repo_base_path):-5] + else: return False - repo = path[len(repo_base_path):-5] return re.match(repo_regex, repo) def repo_path_get_pkgbase(path): -- cgit v1.2.3-24-g4f1b