March 2014 - tor-commits - lists.torproject.org

[bridgedb/master] Merge branch 'release-0.1.5'
by isis＠torproject.org 16 Mar '14

16 Mar '14

1 0

[bridgedb/master] Make the remoteip configurable during recaptcha verification
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 7e4a11343d19ee21b18189c41979251c452dc928 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Fri Feb 7 23:20:31 2014 +0000 Make the remoteip configurable during recaptcha verification Closes #10834 --- bridgedb.conf | 3 +++ lib/bridgedb/HTTPServer.py | 15 +++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/bridgedb.conf b/bridgedb.conf index 9bf414a..d223875 100644 --- a/bridgedb.conf +++ b/bridgedb.conf @@ -223,6 +223,9 @@ RECAPTCHA_ENABLED = False RECAPTCHA_PUB_KEY = '' RECAPTCHA_PRIV_KEY = '' +# The remoteip we send to reCAPTCHA during verification +RECAPTCHA_REMOTEIP = '' + #------------------------------- # Email Distribution Options \ #------------------------------------------------------------------------------ diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 633d903..fb1fb7f 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -113,11 +113,13 @@ def replaceErrorPage(error, template_name=None): class CaptchaProtectedResource(twisted.web.resource.Resource): def __init__(self, useRecaptcha=False, recaptchaPrivKey='', - recaptchaPubKey='', useForwardedHeader=False, resource=None): + recaptchaPubKey='', remoteip='', useForwardedHeader=False, + resource=None): self.isLeaf = resource.isLeaf self.useForwardedHeader = useForwardedHeader self.recaptchaPrivKey = recaptchaPrivKey self.recaptchaPubKey = recaptchaPubKey + self.recaptchaRemoteIP = remoteip self.resource = resource def getClientIP(self, request): @@ -182,9 +184,12 @@ class CaptchaProtectedResource(twisted.web.resource.Resource): except: return redirectTo(request.URLPath(), request) - # generate a random IP for the captcha submission - remote_ip = '%d.%d.%d.%d' % (randint(1,255),randint(1,255), - randint(1,255),randint(1,255)) + if self.recaptchaRemoteIP: + remote_ip = self.recaptchaRemoteIP + else: + # generate a random IP for the captcha submission + remote_ip = '%d.%d.%d.%d' % (randint(1,255),randint(1,255), + randint(1,255),randint(1,255)) recaptcha_response = captcha.submit(challenge, response, self.recaptchaPrivKey, remote_ip) @@ -464,6 +469,7 @@ def addWebServer(cfg, dist, sched): RECAPTCHA_ENABLED RECAPTCHA_PUB_KEY RECAPTCHA_PRIV_KEY + RECAPTCHA_REMOTEIP dist -- an IPBasedDistributor object. sched -- an IntervalSchedule object. """ @@ -487,6 +493,7 @@ def addWebServer(cfg, dist, sched): protected = CaptchaProtectedResource( recaptchaPrivKey=cfg.RECAPTCHA_PRIV_KEY, recaptchaPubKey=cfg.RECAPTCHA_PUB_KEY, + remoteip=cfg.RECAPTCHA_REMOTEIP, useForwardedHeader=cfg.HTTP_USE_IP_FROM_FORWARDED_HEADER, resource=resource) httpdist.putChild('bridges', protected)

1 0

[bridgedb/develop] Update CHANGELOG entry for bridgedb-0.1.5.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit ae6c59f6eea4b13ea6c008ac9df9e9e8f432fd4a Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Mar 16 18:09:15 2014 +0000 Update CHANGELOG entry for bridgedb-0.1.5. --- CHANGELOG | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index bfe527e..b8c9d71 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,12 +1,27 @@ Changes in version 0.1.5 - 2014-02-27 BridgeDB 0.1.5 includes fixes for the following bugs: + * FIXES #9264 Problem with transport lines in BridgeDB's bridge + pool assignment files * FIXES #10809 reCAPTCHA on bridges.torproject.org are impossible to solve for humans - * FIXES #10834 - -Including the following general changes: - * CHANGES the reCaptcha remote IP address to be either a - configurable value, or random (as it was previously). + * FIXES #10834 Configurable reCAPTCHA remoteip + * FIXES #11127 reCaptcha verification is hardcoded to use + plaintext HTTP + +And includes the following general changes: + * CHANGES the way the client's IP address is reported to the + reCaptcha API server. Previously, for each client request, a + completely random IP address was generated, and BridgeDB lied to + the reCaptcha server by sending this random IP and saying that it + was the client's IP. With these changes, BridgeDB can be + configured to report a static IP address (it's own IP) as the + client's IP, in the hopes that the IP whitelisting used by + reCaptcha makes the returned CAPTCHAs less impossible to solve. + * ADDS the ability to use a local cache of CAPTCHAs created by + scripting Gimp with Python. See: + https://github.com/isislovecruft/gimp-captcha + * USES TLS during CAPTCHA solution verification when using + reCaptcha. Changes in version 0.1.4 - 2014-02-21

1 0

[bridgedb/develop] Merge branch 'master' into develop
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit d40b410899b3a5f071ba7f750f2db481800a181f Merge: ac9aa95 783babc Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Mar 16 19:02:28 2014 +0000 Merge branch 'master' into develop

1 0

[bridgedb/develop] Merge branch 'release-0.1.5'
by isis＠torproject.org 16 Mar '14

16 Mar '14

1 0

[bridgedb/develop] Only read emails into logger if configured to log emails.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit ac9aa95dab176e5aeb263ba9b482b7dea71a00b6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sun Mar 16 18:29:03 2014 +0000 Only read emails into logger if configured to log emails. The variable name and logging text stating that the "email body" was being logged was untrue ― the entire email text was logged, including headers, which completely nullified all the other efforts to use SAFE_LOGGING and keep client email addresses out of BridgeDB's log files. In commit 3a3fe60e159bfcb93f51cff861a0db794b867ad4, these lines were changed to use `Util.logSafely(f.read())`. However, this is inefficient. We shouldn't bother reading the entire email file if the `Util.logSafely()` is only going to rewrite those contents with the string `[scrubbed]`. * CHANGE the way the `bridgedb.EmailServer.composeEmail()` function logs email contents to use SAFE_LOGGING more efficiently. --- lib/bridgedb/EmailServer.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index 82a99ed..f301eb8 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -427,9 +427,15 @@ def composeEmail(fromAddr, clientAddr, subject, body, msgID=False, else: mailbody.write(body) + # Only log the email text (including all headers) if SAFE_LOGGING is + # disabled: + if not Util.safe_logging: + f.seek(0) + logging.debug("Email contents:\n%s" % f.read()) + else: + logging.debug("Email text for %r created." % Util.logSafely(clientAddr)) f.seek(0) - logging.debug("Email body:\n%s" % Util.logSafely(f.read())) - f.seek(0) + return clientAddr, f def getGPGContext(cfg):

1 0

[bridgedb/master] Don't log emails if SAFE_LOGGING is enabled.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 3a3fe60e159bfcb93f51cff861a0db794b867ad4 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 22 00:15:23 2014 +0000 Don't log emails if SAFE_LOGGING is enabled. --- lib/bridgedb/EmailServer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/EmailServer.py b/lib/bridgedb/EmailServer.py index c37713e..82a99ed 100644 --- a/lib/bridgedb/EmailServer.py +++ b/lib/bridgedb/EmailServer.py @@ -428,7 +428,7 @@ def composeEmail(fromAddr, clientAddr, subject, body, msgID=False, mailbody.write(body) f.seek(0) - logging.debug("Email body:\n%s" % f.read()) + logging.debug("Email body:\n%s" % Util.logSafely(f.read())) f.seek(0) return clientAddr, f

1 0

[bridgedb/master] Merge branch 'master' into develop
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit befe5d49c53c2c3eff3c1a46535cbc834b6db329 Merge: e5bc105 e2f859c Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Feb 21 23:28:27 2014 +0000 Merge branch 'master' into develop

1 0

[bridgedb/master] Skip coverage branch testing for those which include ``pass``.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 63a41751b7a05f340196af8c2871770ad805a480 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 4 04:30:33 2014 +0000 Skip coverage branch testing for those which include ``pass``. --- .coveragerc | 1 + 1 file changed, 1 insertion(+) diff --git a/.coveragerc b/.coveragerc index 46c0c56..569fd88 100644 --- a/.coveragerc +++ b/.coveragerc @@ -18,6 +18,7 @@ exclude_lines = pragma: no cover # don't complain if the code doesn't hit unimplemented sections: raise NotImplementedError + pass # don't complain if non-runnable or debuging code isn't run: if 0: if False:

1 0

[bridgedb/master] Merge remote-tracking branch 'tpo-sysrqb/bug10834' into develop
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 2b8b557c2bd3526029b2a09bb48ba95c9e20ff3e Merge: 3a3fe60 7e4a113 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Feb 24 17:01:44 2014 +0000 Merge remote-tracking branch 'tpo-sysrqb/bug10834' into develop bridgedb.conf | 3 +++ lib/bridgedb/HTTPServer.py | 15 +++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-)

1 0