From 1bb8dcfacc899f809edb6418c745345fc813655a Mon Sep 17 00:00:00 2001 From: Seth Schoen Date: Sun, 18 Nov 2012 22:37:20 -0800 Subject: [PATCH] further minor logging improvements --- server-ca/chocolate.py | 1 + server-ca/testchallenge-daemon.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server-ca/chocolate.py b/server-ca/chocolate.py index 45770bc3a..c58cb4f46 100755 --- a/server-ca/chocolate.py +++ b/server-ca/chocolate.py @@ -240,6 +240,7 @@ class session(object): csr = m.request.csr sig = m.request.sig self.log("new session from %s" % web.ctx.ip) + self.log("full session ID: %s" % self.id) # Check whether we are the intended recipient of the request. Doing this # before the hashcash check is more work for the server but gives a more # helpful error message (because the hashcash will be wrong automatically diff --git a/server-ca/testchallenge-daemon.py b/server-ca/testchallenge-daemon.py index 30b6c0c83..a2ea42c30 100755 --- a/server-ca/testchallenge-daemon.py +++ b/server-ca/testchallenge-daemon.py @@ -65,8 +65,9 @@ def testchallenge(session): dvsni_ext = r.hget(challenge, "dvsni:ext") direct_result, direct_reason, direct_peername = verify_challenge(name, dvsni_r, dvsni_nonce, False) proxy_result, proxy_reason, proxy_peername = verify_challenge(name, dvsni_r, dvsni_nonce, True) - log("\t...direct probe: %s (%s) to %s" % (direct_result, direct_reason, direct_peername), session) - log("\tTor proxy probe: %s (%s)" % (proxy_result, proxy_reason), session) + log("\t* direct probe: %s (%s)" % (direct_result, direct_reason), session) + log("\t* probe was issued to %s" % direct_peername, session) + log("\t* Tor proxy probe: %s (%s)" % (proxy_result, proxy_reason), session) if direct_result and proxy_result: r.hset(challenge, "satisfied", True) else: