From ababda6a0a20e20256963a266e972f18b119c5b6 Mon Sep 17 00:00:00 2001 From: Mike Crute Date: Fri, 25 Feb 2011 13:27:05 -0600 Subject: Adding more detailed logging --- lock-repo.py | 7 +++++-- validate-login.py | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lock-repo.py b/lock-repo.py index e3de55a..d18bfa1 100755 --- a/lock-repo.py +++ b/lock-repo.py @@ -13,10 +13,13 @@ import repolib def check_repo(env, log): - repo = repolib.Repository(env['SSH_HG_REPO']) + user, repo = env['SSH_HG_USER'], env['SSH_HG_REPO'] + log.debug("Lockcheck perms for %s on %s", user, repo) + + repo = repolib.Repository(repo) repo.load_from_hgrc() - if not repo.can_be_written_by(env['SSH_HG_USER']): + if not repo.can_be_written_by(user) log.error("You can not write to this repository.") return 1 diff --git a/validate-login.py b/validate-login.py index bd87fff..770b76d 100755 --- a/validate-login.py +++ b/validate-login.py @@ -28,8 +28,11 @@ def parse_path(): def main(argv): log = repolib.get_logger('validate-login') - + user = argv[-1] path = parse_path() + + log.debug("Validating login for %r on %r", user, path) + if path: repo = repolib.Repository(path) repo.repo_path = os.getcwd() @@ -47,7 +50,6 @@ def main(argv): log.error("Could not read repo config") return 1 - user = argv[-1] if not repo.can_be_read_by(user): log.error("You can not read this repository") return 1 @@ -55,6 +57,7 @@ def main(argv): os.environ['SSH_HG_USER'] = user os.environ['SSH_HG_REPO'] = repo.full_path + log.debug("All checks passed, serving.") dispatch.dispatch(['-R', path, 'serve', '--stdio']) -- cgit v1.2.3