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

[bridgedb/master] Fix monarchic typo and inaccurate class docstring in test_txrecaptcha.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 84dd0f3e563f8373886f846544bfbfa687e00026 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 12 23:40:11 2014 +0000 Fix monarchic typo and inaccurate class docstring in test_txrecaptcha. --- lib/bridgedb/test/test_txrecaptcha.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/test/test_txrecaptcha.py b/lib/bridgedb/test/test_txrecaptcha.py index 8226b6d..c7dcbb1 100644 --- a/lib/bridgedb/test/test_txrecaptcha.py +++ b/lib/bridgedb/test/test_txrecaptcha.py @@ -228,10 +228,10 @@ class SubmitTests(unittest.TestCase): class MiscTests(unittest.TestCase): - """Tests for :func:`~bridgedb.txrecaptcha._cbRequest`.""" + """Tests for miscellaneous functions in :mod:`~bridgedb.txrecaptcha`.""" def test_cbRequest(self): - """Send a :class:`MockResponse` and check that thee resulting protocol + """Send a :class:`MockResponse` and check that the resulting protocol is a :class:`~bridgedb.txrecaptcha.RecaptchaResponseProtocol`. """ response = MockResponse()

1 0

[bridgedb/master] Fix coverage skips for Tests.py; skip __init__.py and sitecustomize.py.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 5a615c71852f65a00cfc01b206e93107dc4c0d14 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 13 00:27:10 2014 +0000 Fix coverage skips for Tests.py; skip __init__.py and sitecustomize.py. --- .coveragerc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.coveragerc b/.coveragerc index 569fd88..ab8753b 100644 --- a/.coveragerc +++ b/.coveragerc @@ -12,7 +12,9 @@ omit = */test* */_langs* */_version* - bridgedb/Tests.py + */__init__* + */Tests* + */sitecustomize* # Regexes for lines to exclude from report generation: exclude_lines = pragma: no cover

1 0

[bridgedb/master] Add requirements-doc.txt for dependencies for building Sphinx docs.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 38b3e622add3e647ad8870dc144bf9a7c2fe6db3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 13 00:29:48 2014 +0000 Add requirements-doc.txt for dependencies for building Sphinx docs. --- requirements-doc.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/requirements-doc.txt b/requirements-doc.txt new file mode 100644 index 0000000..3e38d59 --- /dev/null +++ b/requirements-doc.txt @@ -0,0 +1,9 @@ +# These are the required dependencies for building BridgeDB's Sphinx +# documentation. You will also need all the requirements listed in +# requirements.txt. + +sphinxjp.themes.basicstrap==0.3.1 +sphinx-argparse==0.1.4 +sphinxcontrib-fulltoc==1.0 +sphinxcontrib-zopeext==0.2.1 +docutils==0.11

1 0

[bridgedb/master] Log fingerprint safely and safely iterate over long lists
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 22b1e2eb898a77e269673bc495b3d412ee4c8673 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Mar 13 12:31:45 2014 +0000 Log fingerprint safely and safely iterate over long lists --- lib/bridgedb/Bridges.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 1dc4f4e..579dfee 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -1251,8 +1251,9 @@ class FilteredBridgeSplitter(BridgeHolder): return index = 0 - logging.debug("Inserting %s into %s ring" % (bridge.fingerprint, self.key)) - for old_bridge in self.bridges: + logging.debug("Inserting %s into splitter" + % (Util.logSafely(bridge.fingerprint))) + for old_bridge in self.bridges[:]: if bridge.fingerprint == old_bridge.fingerprint: self.bridges[index] = bridge break

1 0

[bridgedb/master] Readd COLLECT_TIMESTAMPS in Main.load()
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit b0e7ef1a5eb4f358d1ad39a6500ec1a43bc09d57 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Thu Mar 13 12:39:36 2014 +0000 Readd COLLECT_TIMESTAMPS in Main.load() It looks like this was accidently deleted in 967f1a6a4290154977ab7c0cc2cbe0560d7246ce when we changed how we parsed the bridge descriptors. This was originally added in 11b83c612090d673d4f23ccaf85be66ec5588e8a. --- lib/bridgedb/Main.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index 28d6c8f..adedfaf 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -124,17 +124,18 @@ def load(state, splitter, clear=False): logging.info("Opening bridge-server-descriptor file: '%s'" % fname) f = open(fname, 'r') desc_digests.update(Bridges.getDescriptorDigests(f)) - for bridge in bridges.values(): - if bridge.getID() in timestamps.keys(): - ts = timestamps[bridge.getID()][:] - ts.sort() - for timestamp in ts: - logging.debug( - "Adding/updating timestamps in BridgeHistory for "\ - "'%s' in database: %s" - % (bridge.fingerprint, timestamp)) - bridgedb.Stability.addOrUpdateBridgeHistory( - bridge, timestamp) + if state.COLLECT_TIMESTAMPS: + for bridge in bridges.values(): + if bridge.getID() in timestamps.keys(): + ts = timestamps[bridge.getID()][:] + ts.sort() + for timestamp in ts: + logging.debug( + "Adding/updating timestamps in BridgeHistory for "\ + "'%s' in database: %s" + % (bridge.fingerprint, timestamp)) + bridgedb.Stability.addOrUpdateBridgeHistory( + bridge, timestamp) logging.debug("Closing bridge-server-descriptor file: '%s'" % fname) f.close()

1 0

[bridgedb/master] Merge branch 'fix/10809-gimp-captcha_r1' into develop
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 35effa8311cc7fa0fec9b4395c125cdd4052eed5 Merge: aec0a06 f508c2d Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 15 03:35:57 2014 +0000 Merge branch 'fix/10809-gimp-captcha_r1' into develop .gitignore | 3 + bridgedb.conf | 17 +- captchas/Tvx74PMy.jpg | Bin 0 -> 61434 bytes doc/sphinx/source/bridgedb.Raptcha.rst | 8 - doc/sphinx/source/bridgedb.captcha.rst | 8 + doc/sphinx/source/bridgedb.rst | 2 +- doc/sphinx/source/conf.py | 2 +- lib/bridgedb/Bridges.py | 33 +-- lib/bridgedb/Dist.py | 45 ++-- lib/bridgedb/HTTPServer.py | 447 ++++++++++++++++++++++++++------ lib/bridgedb/Main.py | 10 +- lib/bridgedb/Raptcha.py | 40 --- lib/bridgedb/captcha.py | 260 +++++++++++++++++++ lib/bridgedb/crypto.py | 127 ++++++++- lib/bridgedb/templates/captcha.html | 18 +- lib/bridgedb/test/test_captcha.py | 237 +++++++++++++++++ requirements.txt | 1 + 17 files changed, 1052 insertions(+), 206 deletions(-)

1 0

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

16 Mar '14

commit aec0a06c7cb61b2ef429b2164de576f74ad5b3a4 Merge: 38b3e62 b0e7ef1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Mar 13 22:35:55 2014 +0000 Merge remote-tracking branch 'tpo-sysrqb/bug9264_rebased_3_r1' into develop lib/bridgedb/Bridges.py | 11 ++++++++++- lib/bridgedb/Main.py | 22 ++++++++++++---------- lib/bridgedb/test/test_Bridges.py | 30 ++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 11 deletions(-)

1 0

[bridgedb/master] 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/master] Merge branch 'fix/11127-recaptcha-ssl_10809r1_r1' into develop
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 8d927c1bf3e1ad7fb8b09c1884f6667cf89596f9 Merge: 35effa8 84dd0f3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Mar 15 07:43:05 2014 +0000 Merge branch 'fix/11127-recaptcha-ssl_10809r1_r1' into develop lib/bridgedb/HTTPServer.py | 7 +- lib/bridgedb/captcha.py | 3 +- lib/bridgedb/crypto.py | 98 ++++++++++++- lib/bridgedb/test/test_crypto.py | 104 +++++++++++++ lib/bridgedb/test/test_txrecaptcha.py | 261 +++++++++++++++++++++++++++++++++ lib/bridgedb/txrecaptcha.py | 215 +++++++++++++++++++++++++++ 6 files changed, 683 insertions(+), 5 deletions(-)

1 0

[bridgedb/master] 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