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

[bridgedb/master] Add more logging to add() in bridgedb.proxy.ProxySet.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit eb529724bc1e664675fe386ebbe3e1666b721558 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 10 07:53:38 2015 +0000 Add more logging to add() in bridgedb.proxy.ProxySet. --- lib/bridgedb/proxy.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/proxy.py b/lib/bridgedb/proxy.py index d954213..6b6f6ac 100644 --- a/lib/bridgedb/proxy.py +++ b/lib/bridgedb/proxy.py @@ -164,6 +164,7 @@ class ProxySet(MutableSet): ip = isIPAddress(ip) if ip: if self._proxies.isdisjoint(set(ip)): + logging.debug("Adding %s to proxy list %r..." % (ip, self)) self._proxies.add(ip) self._proxydict[ip] = tag if tag else time.time() return True

1 0

[bridgedb/master] Fix Travis-CI build issue with group-writable PYTHON_EGG_CACHE dir.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit cbc3e2d0e110107b5c064cfd8b54ecbfafc80265 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 10 22:14:02 2015 +0000 Fix Travis-CI build issue with group-writable PYTHON_EGG_CACHE dir. Travis-CI issue #1748 [0] was causing non-deterministic CI test failures, particularly in the lib/bridgedb/test/test_https.py integration tests which use the Python mechanize module to test the HTTPS server. [0] This is a known Python security issue, particularly for WSGI server setup. [2] [3] The fix is quite simple, just set the PYTHON_EGG_CACHE environment variable to something unique to each CI build and ensure that the PYTHON_EGG_CACHE directory exists. * FIXES issues with non-deterministic Travis-CI test failures due to a known security hole in shared Python .egg cache directories. [0]: https://github.com/travis-ci/travis-ci/issues/1748 [1]: https://travis-ci.org/isislovecruft/bridgedb/jobs/50169439#L1763 [2]: https://stackoverflow.com/questions/2192323/what-is-the-python-egg-cache-py… [3]: https://github.com/pypa/virtualenv/issues/459 --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.travis.yml b/.travis.yml index 412622b..7e4f6f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,15 @@ addons: - bridges.torproject.org env: + global: + # Fixes Travis-CI issue #1748, which was causing non-deterministic CI test failures, + # particularly in the lib/bridgedb/test/test_https.py integration tests which use + # the Python mechanize module to test the HTTPS server. + # See https://github.com/travis-ci/travis-ci/issues/1748 + # https://travis-ci.org/isislovecruft/bridgedb/jobs/50169439#L1763 + # https://stackoverflow.com/questions/2192323/what-is-the-python-egg-cache-py… + # https://github.com/pypa/virtualenv/issues/459 + - PYTHON_EGG_CACHE="${HOME}/.python-eggs-$(echo $RANDOM$PPID$RANDOM | sha256sum | cut -d ' ' -f 1)" matrix: - TWISTED_VERSION=13.2.0 PYOPENSSL_VERSION=0.13.1 @@ -39,6 +48,7 @@ matrix: before_install: - sudo apt-get update + - mkdir $PYTHON_EGG_CACHE install: - sudo apt-get install -qq --no-install-suggests --no-install-recommends build-essential openssl sqlite3 libgpgme11 libgpgme11-dev python-dev python-setuptools

1 0

[bridgedb/master] Return from generateQR() if the qrcode module isn't imported.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 6293394fba0f6dbf00223435d15b301cd7fb712b Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 10 04:26:14 2015 +0000 Return from generateQR() if the qrcode module isn't imported. --- lib/bridgedb/qrcodes.py | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/bridgedb/qrcodes.py b/lib/bridgedb/qrcodes.py index 8016262..0aa1e8f 100644 --- a/lib/bridgedb/qrcodes.py +++ b/lib/bridgedb/qrcodes.py @@ -43,6 +43,7 @@ def generateQR(bridgelines, imageFormat=u'JPEG', bridgeSchema=False): if not qrcode: logging.info("Not creating QRCode for bridgelines; no qrcode module.") + return try: if bridgeSchema:

1 0

[bridgedb/master] Merge branch 'fix/4405-tor-exit-check_2_r1' into develop
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 5a950766a3dd1786132de486748da7e30b57d0b2 Merge: 177edfd 645058e Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 10 08:29:53 2015 +0000 Merge branch 'fix/4405-tor-exit-check_2_r1' into develop lib/bridgedb/Main.py | 16 ---------------- lib/bridgedb/proxy.py | 1 + 2 files changed, 1 insertion(+), 16 deletions(-)

1 0

[bridgedb/master] Remove unused bridgedb.Main.loadProxyList().
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 645058edcddca928abb0ac85c764a7bb99a43f06 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 10 07:55:28 2015 +0000 Remove unused bridgedb.Main.loadProxyList(). --- lib/bridgedb/Main.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/lib/bridgedb/Main.py b/lib/bridgedb/Main.py index ff4aca8..a3c88d9 100644 --- a/lib/bridgedb/Main.py +++ b/lib/bridgedb/Main.py @@ -184,22 +184,6 @@ def load(state, splitter, clear=False): state.save() return -def loadProxyList(cfg): - ipset = {} - for fname in cfg.PROXY_LIST_FILES: - f = open(fname, 'r') - for line in f: - line = line.strip() - if line.startswith("#"): - continue - elif isIPAddress(line): - ipset[line] = True - elif line: - logging.info("Skipping line %r in %s: not an IP.", - line, fname) - f.close() - return ipset - def _reloadFn(*args): """Placeholder callback function for :func:`_handleSIGHUP`.""" return True

1 0

[bridgedb/master] Fix typo in bridgedb.qrcodes.generateQR().
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 99f3b3f978dbacdfdf45bca8d7a6339e03d94af1 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 10 04:26:56 2015 +0000 Fix typo in bridgedb.qrcodes.generateQR(). --- lib/bridgedb/qrcodes.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/bridgedb/qrcodes.py b/lib/bridgedb/qrcodes.py index 0aa1e8f..0b576e3 100644 --- a/lib/bridgedb/qrcodes.py +++ b/lib/bridgedb/qrcodes.py @@ -71,8 +71,7 @@ def generateQR(bridgelines, imageFormat=u'JPEG', bridgeSchema=False): except KeyError as error: logging.error(str(error)) logging.debug(("It seems python-imaging doesn't understand how to " - "save in the %s format.") % imgFormat) + "save in the %s format.") % imageFormat) except Exception as error: logging.error(("There was an error while attempting to generate the " "QRCode: %s") % str(error)) -

1 0

[bridgedb/master] Merge branch 'fix/11345-qrcodes_r2' into develop
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 177edfd8a0a232796973b20d7c3222ba66478309 Merge: a973271 129dc99 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 10 06:04:02 2015 +0000 Merge branch 'fix/11345-qrcodes_r2' into develop lib/bridgedb/qrcodes.py | 8 ++-- lib/bridgedb/test/test_qrcodes.py | 73 +++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 4 deletions(-)

1 0

[bridgedb/master] Merge branch 'hotfix/0.2.4-travis-pyeggcache' into develop
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 2c9ef89e6778b3c37bb2140ab4e111ed0c587186 Merge: 5a95076 cbc3e2d Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 10 22:50:22 2015 +0000 Merge branch 'hotfix/0.2.4-travis-pyeggcache' into develop .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+)

1 0

[bridgedb/master] Add Travis-CI matrix element for Twisted-15.0.0 and allow failures.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit 4dccceed2feaadc86296598e16c9ce04ad5c8b4e Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 10 22:23:16 2015 +0000 Add Travis-CI matrix element for Twisted-15.0.0 and allow failures. We'll now test for the very latest and greatest Twisted, but we don't care if tests run on Twisted-15.0.0 fail. Twisted-15.0.0 isn't included yet in any Debian distribution channel. --- .travis.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index df8b54f..9da619d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,6 @@ notifications: python: - "2.7" - - "pypy" addons: hosts: @@ -36,14 +35,22 @@ env: # https://github.com/pypa/virtualenv/issues/459 - PYTHON_EGG_CACHE="${HOME}/.python-eggs-$(echo $RANDOM$PPID$RANDOM | sha256sum | cut -d ' ' -f 1)" matrix: + # Debian Wheezy - TWISTED_VERSION=13.2.0 PYOPENSSL_VERSION=0.13.1 + # Debian Jessie + - TWISTED_VERSION=14.0.2 PYOPENSSL_VERSION=0.14 matrix: include: - python: "2.7" + env: TWISTED_VERSION=15.0.0 PYOPENSSL_VERSION=0.14 + - python: "pypy" env: TWISTED_VERSION=14.0.2 PYOPENSSL_VERSION=0.14 allow_failures: + - python: "2.7" + env: TWISTED_VERSION=15.0.0 PYOPENSSL_VERSION=0.14 - python: "pypy" + env: TWISTED_VERSION=14.0.2 PYOPENSSL_VERSION=0.14 fast_finish: true before_install:

1 0

[bridgedb/master] Update Travis-CI matrix variable TWISTED_VERSION to 14.0.2.
by isis＠torproject.org 21 Mar '15

21 Mar '15

commit d478a4166497303b28c60000e4fb3374743ae6c5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Feb 10 22:20:47 2015 +0000 Update Travis-CI matrix variable TWISTED_VERSION to 14.0.2. This is currently the next version of Twisted available in Debian Jessie. * UPDATE .travis.yml TWISTED_VERSION from 14.0.0 to 14.0.2. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7e4f6f2..df8b54f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,7 @@ env: matrix: include: - python: "2.7" - env: TWISTED_VERSION=14.0.0 PYOPENSSL_VERSION=0.14 + env: TWISTED_VERSION=14.0.2 PYOPENSSL_VERSION=0.14 allow_failures: - python: "pypy" fast_finish: true

1 0