October 2019 - tor-commits - lists.torproject.org

[bridgedb/develop] Update Twisted to 19.7.0.
by phw＠torproject.org 04 Oct '19

04 Oct '19

commit 4ee54ce81a5ef7466067f3637258e4aa6de541bc Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Sep 12 16:27:11 2019 -0700 Update Twisted to 19.7.0. In the process, we can also get rid of our build matrix because there's no longer a need to test different Twisted (or pyOpenSSL) versions. We had to fix a number of issues to support the latest Twisted version: * Change Reactor() to createReactor() in a unit test. * Invoke unit tests with "-m twisted.trial" instead of "$(TRIAL)" to unbreak our code coverage reporting. * Use absolute paths for our translations because otherwise our new unit test invocation with "-m twisted.trial" would look in the wrong place and fail. --- .travis.requirements.txt | 1 + .travis.yml | 26 +------------------------- Makefile | 2 +- bridgedb/distributors/https/server.py | 2 +- bridgedb/test/test_crypto.py | 2 +- bridgedb/translations.py | 2 +- requirements.txt | 2 +- scripts/install-dependencies | 5 ++--- 8 files changed, 9 insertions(+), 33 deletions(-) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index 9d69ab7..2f8d861 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -23,6 +23,7 @@ Mako==1.1.0 ipaddr==2.2.0 pygeoip==0.3.2 PyCryptodome==3.9.0 +Twisted==19.7.0 gnupg==2.3.1 pillow==6.1.0 qrcode==6.1 diff --git a/.travis.yml b/.travis.yml index 9ec71fc..c0499b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,30 +32,6 @@ env: # 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: - # What we're running on polyanthum - - TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=17.5.0 - # Debian Stretch - - TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0 - # Debian experimental (all other versions of Debian have the same dependency versions right now) - - TWISTED_VERSION=17.1.0 PYOPENSSL_VERSION=17.5.0 - -matrix: - include: - - python: "pypy" - env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=17.5.0 - - python: "pypy" - env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0 - allow_failures: - - python: "2.7" - env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0 - - python: "2.7" - env: TWISTED_VERSION=17.1.0 PYOPENSSL_VERSION=17.5.0 - - python: "pypy" - env: TWISTED_VERSION=16.1.1 PYOPENSSL_VERSION=17.5.0 - - python: "pypy" - env: TWISTED_VERSION=16.6.0 PYOPENSSL_VERSION=17.5.0 - fast_finish: true before_install: - sudo apt-get update @@ -63,7 +39,7 @@ before_install: - chmod -R og-w $PYTHON_EGG_CACHE install: - - TWISTED_VERSION=$TWISTED_VERSION PYOPENSSL_VERSION=$PYOPENSSL_VERSION ./scripts/install-dependencies + - ./scripts/install-dependencies - make install # Start a BridgeDB instance before running the tests: diff --git a/Makefile b/Makefile index 428f004..08c2fbd 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ ifeq ($(PYTHON_IMPLEMENTATION),PyPy) @echo "Detected PyPy... not running coverage." python setup.py test else - coverage run --rcfile=".coveragerc" $(TRIAL) ./bridgedb/test/test_*.py + coverage run --rcfile=".coveragerc" -m twisted.trial ./bridgedb/test/test_*.py coverage report --rcfile=".coveragerc" endif diff --git a/bridgedb/distributors/https/server.py b/bridgedb/distributors/https/server.py index e5df7da..81bc353 100644 --- a/bridgedb/distributors/https/server.py +++ b/bridgedb/distributors/https/server.py @@ -69,7 +69,7 @@ from bridgedb.util import replaceControlChars #: The path to the HTTPS distributor's web templates. (Should be the #: "templates" directory in the same directory as this file.) -TEMPLATE_DIR = os.path.join(os.path.dirname(__file__), 'templates') +TEMPLATE_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'templates') # Setting `filesystem_checks` to False is recommended for production servers, # due to potential speed increases. This means that the atimes of the Mako diff --git a/bridgedb/test/test_crypto.py b/bridgedb/test/test_crypto.py index 10974bb..7a34671 100644 --- a/bridgedb/test/test_crypto.py +++ b/bridgedb/test/test_crypto.py @@ -329,7 +329,7 @@ class SSLVerifyingContextFactoryTests(unittest.TestCase, def setUp(self): """Create a fake reactor for these tests.""" - self.reactor = self.Reactor() + self.reactor = self.createReactor() self.url = 'https://www.example.com/someresource.html#andatag' def test_getHostnameFromURL(self): diff --git a/bridgedb/translations.py b/bridgedb/translations.py index f3e6ed4..7429b60 100644 --- a/bridgedb/translations.py +++ b/bridgedb/translations.py @@ -17,7 +17,7 @@ from bridgedb import safelog from bridgedb.parse import headers -TRANSLATIONS_DIR = os.path.join(os.path.dirname(__file__), 'i18n') +TRANSLATIONS_DIR = os.path.join(os.path.abspath(os.path.dirname(__file__)), 'i18n') def getFirstSupportedLang(langs): diff --git a/requirements.txt b/requirements.txt index 1b25a90..3bb970e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ Babel==2.7.0 BeautifulSoup==3.2.1 Mako==1.1.0 -Twisted==16.6.0 +Twisted==19.7.0 ipaddr==2.2.0 pyOpenSSL==19.0.0 pygeoip==0.3.2 diff --git a/scripts/install-dependencies b/scripts/install-dependencies index cffef18..923b51e 100755 --- a/scripts/install-dependencies +++ b/scripts/install-dependencies @@ -31,11 +31,10 @@ done $SUDO $APT_GET install ${APT_FLAGS} ${MISSING} -# When running on Travis, be sure that environment variables are passed from -# .travis.yml to this script: +# When running on Travis, we are installing a few extra packages, e.g., to +# determine code coverage. if [ "$TRAVIS" == "true" ] ; then $PIP install $PIP_FLAGS -r "$HERE/../.travis.requirements.txt" - $PIP install $PIP_FLAGS "Twisted==$TWISTED_VERSION" "pyOpenSSL==$PYOPENSSL_VERSION" else $PIP install $PIP_FLAGS -r "$HERE/../requirements.txt" fi

1 0

[bridgedb/develop] Update to pylint version 2.4.2.
by phw＠torproject.org 04 Oct '19

04 Oct '19

commit 2d3ef0a8ce5a01ff641aed43efd90d49405a42fd Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Sep 12 15:56:19 2019 -0700 Update to pylint version 2.4.2. The bug that was once the reason to stick with version 1.1.0 has seen been resolved: <https://github.com/PyCQA/pylint/issues/203> --- .test.requirements.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.test.requirements.txt b/.test.requirements.txt index 2b6da2f..298d61a 100644 --- a/.test.requirements.txt +++ b/.test.requirements.txt @@ -8,7 +8,5 @@ coverage==4.5.4 mechanize==0.4.3 pep8==1.7.1 -# pylint must be pinned until pylint bug #203 is fixed. See -# https://bitbucket.org/logilab/pylint/issue/203/importing-namespace-packages… -pylint==1.1.0 +pylint==2.4.2 sure==1.4.11

1 0

[bridgedb/develop] Require exactly pillow version 6.1.0.
by phw＠torproject.org 04 Oct '19

04 Oct '19

commit f78db9b955bdca354dd8db6a1f552d869c1f6cbc Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Sep 12 16:38:26 2019 -0700 Require exactly pillow version 6.1.0. This makes the pillow requirement consistent with all other requirements, which are pinned to a specific version. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 05d5444..d5a3c9f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ PyCryptodome==3.9.0 Twisted==19.7.0 gnupg==2.3.1 ipaddr==2.2.0 -pillow>=6.1.0 +pillow==6.1.0 pyOpenSSL==19.0.0 pygeoip==0.3.2 qrcode==6.1

1 0

[bridgedb/develop] Use canonical package names.
by phw＠torproject.org 04 Oct '19

04 Oct '19

commit 14dfd92ec825b1689da4b5c3438463249a37b9a0 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Oct 1 10:10:58 2019 -0700 Use canonical package names. Let's capitalise packages correctly. --- .travis.requirements.txt | 4 ++-- requirements.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.requirements.txt b/.travis.requirements.txt index 4d451da..3e768d2 100644 --- a/.travis.requirements.txt +++ b/.travis.requirements.txt @@ -16,14 +16,14 @@ Babel==2.7.0 BeautifulSoup==3.2.1 Mako==1.1.0 -PyCryptodome==3.9.0 +pycryptodome==3.9.0 Twisted==19.7.0 coverage==4.5.4 coveralls==1.8.2 gnupg==2.3.1 ipaddr==2.2.0 mechanize==0.4.3 -pillow==6.1.0 +Pillow==6.1.0 pygeoip==0.3.2 qrcode==6.1 service_identity==18.1.0 diff --git a/requirements.txt b/requirements.txt index d5a3c9f..6944d1a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ Babel==2.7.0 BeautifulSoup==3.2.1 Mako==1.1.0 -PyCryptodome==3.9.0 +pycryptodome==3.9.0 Twisted==19.7.0 gnupg==2.3.1 ipaddr==2.2.0 -pillow==6.1.0 +Pillow==6.1.0 pyOpenSSL==19.0.0 pygeoip==0.3.2 qrcode==6.1

1 0

[bridgedb/develop] Merge branch 'fix/29484' into develop
by phw＠torproject.org 04 Oct '19

04 Oct '19

commit 53bcb77571c7a1f6c60bef44fefb1ef39cd65c7f Merge: 44d6ed3 edf27d1 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Oct 3 15:34:57 2019 -0700 Merge branch 'fix/29484' into develop .test.requirements.txt | 12 +++++------- .travis.requirements.txt | 31 ++++++++++++++++--------------- .travis.yml | 28 ++-------------------------- CHANGELOG | 6 ++++++ Makefile | 2 +- bridgedb/distributors/email/server.py | 3 ++- bridgedb/distributors/https/server.py | 2 +- bridgedb/test/test_crypto.py | 2 +- bridgedb/test/test_email_dkim.py | 2 +- bridgedb/test/test_email_server.py | 2 +- bridgedb/test/test_persistent.py | 8 ++++---- bridgedb/translations.py | 2 +- doc/HACKING.md | 17 +++++++++++++++++ requirements.txt | 26 +++++++++++++------------- scripts/install-dependencies | 5 ++--- 15 files changed, 73 insertions(+), 75 deletions(-)

1 0

[bridgedb/develop] Add instructions on how to update dependencies.
by phw＠torproject.org 04 Oct '19

04 Oct '19

commit 73053db105605f74af02f9475ef30377b74be89d Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Oct 2 09:48:14 2019 -0700 Add instructions on how to update dependencies. --- doc/HACKING.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/doc/HACKING.md b/doc/HACKING.md index a8ec640..5993696 100644 --- a/doc/HACKING.md +++ b/doc/HACKING.md @@ -34,6 +34,22 @@ we make are: ## Making a release +### Updating dependencies + +We maintain three requirements.txt files: + +* requirements.txt (for BridgeDB) +* .travis.requirements.txt (for Travis CI) +* .test.requirements.txt (for unit tests) + +Each of these files contains pinned dependencies, which are guaranteed to work +for a given release. Before releasing a new version of BridgeDB, we should +update our dependencies. The tool [pur][pur] (available through pip) helps us +with this. It checks a given requirements.txt file and updates each dependency +to its latest version: + + pur -r REQUIREMENTS_FILE + ### Bumping the version number Bumping the version number at release time (which, for BridgeDB really means @@ -67,3 +83,4 @@ References ---------- [trac]: https://trac.torproject.org/projects/tor/query?status=!closed&component=Cir… [workflow]: https://nvie.com/posts/a-successful-git-branching-model/ +[pur]: https://pypi.org/project/pur/

1 0

[bridgedb/develop] Add CHANGELOG entry.
by phw＠torproject.org 04 Oct '19

04 Oct '19

commit edf27d16c44401c2187505f8448915a0353fe334 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Sep 12 15:55:45 2019 -0700 Add CHANGELOG entry. --- CHANGELOG | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index c2fca89..48e18eb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -6,6 +6,12 @@ Changes in version A.B.C - YYYY-MM-DD also makes our implementation consistent with our (slightly updated) specification. + * FIXES https://bugs.torproject.org/29484 + Update BridgeDB's requirements to the latest respective versions. Among + others, this patch set updates Twisted to 19.7.0, pyOpenSSL to 19.0.0, + and replaces (the abandoned) PyCrypto with PyCryptodome, which fixes + security vulnerabilities. + Changes in version 0.8.2 - 2019-09-20 Updated translations for the following languages:

1 0

[bridgedb/develop] Update French translation.
by phw＠torproject.org 04 Oct '19

04 Oct '19

commit 41e38fca404d70e9c0f8f1ed7895524dc7504ac4 Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Sep 30 16:20:06 2019 -0700 Update French translation. --- bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po index 32c57a7..12d091d 100644 --- a/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po +++ b/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the BridgeDB project. # # Translators: +# Translators: # AO <ao(a)localizationlab.org>, 2018-2019 # apaddlingduck, 2014 # Boubou <cece31840(a)gmail.com>, 2015 @@ -30,7 +31,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2019-05-17 16:23+0000\n" +"PO-Revision-Date: 2019-09-23 19:14+0000\n" "Last-Translator: AO <ao(a)localizationlab.org>\n" "Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n" "MIME-Version: 1.0\n" @@ -121,7 +122,7 @@ msgstr "Étape %s1%s" #: bridgedb/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "Télécharger %s le Navigateur Tor %s" +msgstr "Téléchargez %s le Navigateur Tor %s" #: bridgedb/https/templates/index.html:25 #, python-format @@ -131,7 +132,7 @@ msgstr "Étape %s2%s" #: bridgedb/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "Obtenir des %s ponts %s" +msgstr "Obtenez des %s ponts %s" #: bridgedb/https/templates/index.html:36 #, python-format @@ -141,7 +142,7 @@ msgstr "Étape %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Maintenant, %s ajouter les ponts au navigateur Le Navigateur Tor %s" +msgstr "Maintenant, %s ajoutez les ponts au Navigateur Tor %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks!

1 0

[bridgedb/develop] Merge branch 'task/31903' into develop
by phw＠torproject.org 04 Oct '19

04 Oct '19

commit 44d6ed319f8c6f8c43ea0db2eb8c0e64c3d73b50 Merge: 0751ad7 a93a636 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Oct 3 15:16:37 2019 -0700 Merge branch 'task/31903' into develop bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 9 +- bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 2 +- bridgedb/i18n/templates/bridgedb.pot | 312 ++++++++++++++++--------------- 3 files changed, 167 insertions(+), 156 deletions(-)

1 0

[bridgedb/develop] Use last-available translation to fix unit test.
by phw＠torproject.org 04 Oct '19

04 Oct '19

commit d9d886f15aad518713a08650002e32abe9cdf73e Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Oct 1 12:04:19 2019 -0700 Use last-available translation to fix unit test. When we last updated our translations, in commit 968a5db, the Dutch translation for "What are bridges?" disappared, which broke a unit test. This commit re-adds this particular translation -- it does seem correct, after all. --- bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po index 1348231..62ada3b 100644 --- a/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po +++ b/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po @@ -268,7 +268,7 @@ msgstr "" #: bridgedb/strings.py:101 msgid "What are bridges?" -msgstr "" +msgstr "Wat zijn bridges?" #: bridgedb/strings.py:102 #, python-format

1 0