summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Crute <mcrute@gmail.com>2011-02-25 13:27:05 -0600
committerMike Crute <mcrute@gmail.com>2011-02-25 13:27:05 -0600
commitababda6a0a20e20256963a266e972f18b119c5b6 (patch)
tree0384420369a1adcc58b274622cc0dc077a10c054
parent1d40d3931dd6778ced0a6a1eecd5acf39998c76f (diff)
downloadhg_hosting-ababda6a0a20e20256963a266e972f18b119c5b6.tar.bz2
hg_hosting-ababda6a0a20e20256963a266e972f18b119c5b6.tar.xz
hg_hosting-ababda6a0a20e20256963a266e972f18b119c5b6.zip
Adding more detailed logging
-rwxr-xr-xlock-repo.py7
-rwxr-xr-xvalidate-login.py7
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
13 13
14 14
15def check_repo(env, log): 15def check_repo(env, log):
16 repo = repolib.Repository(env['SSH_HG_REPO']) 16 user, repo = env['SSH_HG_USER'], env['SSH_HG_REPO']
17 log.debug("Lockcheck perms for %s on %s", user, repo)
18
19 repo = repolib.Repository(repo)
17 repo.load_from_hgrc() 20 repo.load_from_hgrc()
18 21
19 if not repo.can_be_written_by(env['SSH_HG_USER']): 22 if not repo.can_be_written_by(user)
20 log.error("You can not write to this repository.") 23 log.error("You can not write to this repository.")
21 return 1 24 return 1
22 25
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():
28 28
29def main(argv): 29def main(argv):
30 log = repolib.get_logger('validate-login') 30 log = repolib.get_logger('validate-login')
31 31 user = argv[-1]
32 path = parse_path() 32 path = parse_path()
33
34 log.debug("Validating login for %r on %r", user, path)
35
33 if path: 36 if path:
34 repo = repolib.Repository(path) 37 repo = repolib.Repository(path)
35 repo.repo_path = os.getcwd() 38 repo.repo_path = os.getcwd()
@@ -47,7 +50,6 @@ def main(argv):
47 log.error("Could not read repo config") 50 log.error("Could not read repo config")
48 return 1 51 return 1
49 52
50 user = argv[-1]
51 if not repo.can_be_read_by(user): 53 if not repo.can_be_read_by(user):
52 log.error("You can not read this repository") 54 log.error("You can not read this repository")
53 return 1 55 return 1
@@ -55,6 +57,7 @@ def main(argv):
55 os.environ['SSH_HG_USER'] = user 57 os.environ['SSH_HG_USER'] = user
56 os.environ['SSH_HG_REPO'] = repo.full_path 58 os.environ['SSH_HG_REPO'] = repo.full_path
57 59
60 log.debug("All checks passed, serving.")
58 dispatch.dispatch(['-R', path, 'serve', '--stdio']) 61 dispatch.dispatch(['-R', path, 'serve', '--stdio'])
59 62
60 63