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

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 25 Mar '15

25 Mar '15

commit b759266b35527f711f4796c4cbb55b21f03dfce2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 25 13:45:44 2015 +0000 Update translations for torbutton-torbuttonproperties --- fa/torbutton.properties | 4 ++-- pt/torbutton.properties | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fa/torbutton.properties b/fa/torbutton.properties index 9a32070..969526e 100644 --- a/fa/torbutton.properties +++ b/fa/torbutton.properties @@ -55,8 +55,8 @@ torbutton.popup.confirm_plugins = پلاگینها مانند فلش، میتو torbutton.popup.never_ask_again = دیگر هیچگاه این را از من نپرس torbutton.popup.confirm_newnym = مرورگر Tor همه پنجره ها و تب ها را می بندد. همه جلسات وب سایت شود از دست خواهد رفت\n\nآیا می خواهید راه اندازی مجدد مرورگر Tor الان انجام شود تا هویت خود را تنظیم مجدد کنید؟\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification = منوی پیاز سبز در حال حاضر یک نوار لغزنده امنیتی که به شما اجازه می دهد سطح امنیتی خود را تنظیم کنید. آن را چک کنید! +torbutton.slider_notification_button = باز کردن تنظیمات امنیتی # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=این وب‌سایت (%S) سعی دارد اطلاعات بوم تصویر HTML5 را دریافت کند که ممکن است برای شناسایی منحصر به فرد کامپیوتر شما استفاده شود.\n\nآیا مرورگر تور میبایست اجازه دریافت این اطلاعات را بدهد؟ diff --git a/pt/torbutton.properties b/pt/torbutton.properties index 7c927d8..47788e2 100644 --- a/pt/torbutton.properties +++ b/pt/torbutton.properties @@ -4,7 +4,7 @@ torbutton.circuit_display.internet = Internet torbutton.circuit_display.ip_unknown = IP desconhecido torbutton.circuit_display.onion_site = Sítio do Onion torbutton.circuit_display.this_browser = Este navegador -torbutton.circuit_display.relay = relay +torbutton.circuit_display.relay = retransmitir torbutton.circuit_display.tor_bridge = Ponte torbutton.circuit_display.unknown_country = País desconhecido torbutton.panel.tooltip.disabled = Clique para ativar o Tor @@ -55,8 +55,8 @@ torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy an torbutton.popup.never_ask_again = Não voltar a perguntar-me torbutton.popup.confirm_newnym = O Navegador Tor irá fechar todas as janela e separadores. Estarão perdidas todas sessões do sítio da Web.\n\nReiniciar o Navegador Tor para repor a sua identidade?\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification = O menu cebola verde tem agora um cursor de segurança que o deixa ajustar o seu nível de segurança. Dê uma vista de olhos! +torbutton.slider_notification_button = Abra as definições de segurança # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Este site (%S) tentou extrair informação HTML5, que pode ser usada para identificar claramente o seu computador.\n\nQuer que o navegador Tor permita que o site extraia a informação HTML5?

1 0

[tor/master] More addrs in HACKING
by nickm＠torproject.org 25 Mar '15

25 Mar '15

commit f31dc84f03c528a3dc1aba984d742696fcb353e9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 25 09:16:42 2015 -0400 More addrs in HACKING --- doc/HACKING | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/HACKING b/doc/HACKING index 7707cc7..bd52903 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -565,8 +565,9 @@ on dist-master. 9) Email the packagers (cc'ing tor-assistants) that a new tarball is up. The current list of packagers is: - {weasel,gk} at torproject dot org + {weasel,gk,mikeperry} at torproject dot org {blueness} at gentoo dot org + {paul} at invizbox dot io 10) Add the version number to Trac. To do this, go to Trac, log in, select "Admin" near the top of the screen, then select "Versions" from

1 0

[tor/master] clean up list of paths that cannot be relative
by nickm＠torproject.org 25 Mar '15

25 Mar '15

commit e5e2644f235eae698378427f0b12c9e3b0786d4a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 25 09:16:04 2015 -0400 clean up list of paths that cannot be relative --- src/or/config.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 936c5c1..68157a1 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2601,8 +2601,6 @@ warn_about_relative_paths(or_options_t *options) options->ExtORPortCookieAuthFile); warn_if_option_path_is_relative("DirPortFrontPage", options->DirPortFrontPage); - warn_if_option_path_is_relative("PortForwardingHelper", - options->PortForwardingHelper); warn_if_option_path_is_relative("V3BandwidthsFile", options->V3BandwidthsFile); warn_if_option_path_is_relative("ControlPortWriteToFile", @@ -2611,7 +2609,6 @@ warn_about_relative_paths(or_options_t *options) warn_if_option_path_is_relative("GeoIPv6File",options->GeoIPv6File); warn_if_option_path_is_relative("Log",options->DebugLogFile); warn_if_option_path_is_relative("AccelDir",options->AccelDir); - warn_if_option_path_is_relative("Log",options->DebugLogFile); warn_if_option_path_is_relative("DataDirectory",options->DataDirectory); warn_if_option_path_is_relative("PidFile",options->PidFile);

1 0

[translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties
by translation＠torproject.org 25 Mar '15

25 Mar '15

commit ad51bcce125f05ee0efe05f4a5b2d269464189d5 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 25 12:15:48 2015 +0000 Update translations for torbutton-torbuttonproperties --- de/torbutton.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/de/torbutton.properties b/de/torbutton.properties index 68a7aea..0c46117 100644 --- a/de/torbutton.properties +++ b/de/torbutton.properties @@ -55,8 +55,8 @@ torbutton.popup.confirm_plugins = Erweiterungen wie Flash können ihre Privatsph torbutton.popup.never_ask_again = Nicht mehr nachfragen torbutton.popup.confirm_newnym = Tor-Browser wird alle Fenster und Reiter schließen. Alle Internetseitensitzungen gehen verloren.\n\nTor-Browser jetzt neu starten, um Ihre Identität zurückzusetzen?\n\n -torbutton.slider_notification = The green onion menu has now a security slider which lets you adjust your security level. Check it out! -torbutton.slider_notification_button = Open security settings +torbutton.slider_notification = Das grüne Onion Menü hat jetzt einen Sicherheits-Regler welches Ihr Sicherheits-Level einstellt. Probier's aus! +torbutton.slider_notification_button = Öffne Sicherheits-Einstellungen # Canvas permission prompt. Strings are kept here for ease of translation. canvas.siteprompt=Die Internetseite (%S) hat versucht, HTML5-Canvas-Bilddaten zu extrahieren, die verwendet werden können, um Ihren Rechner eindeutig zu identifizieren. \n\nSoll Tor-Browser es dieser Internetseite erlauben HTML5-Canvas-Bilddaten zu extrahieren?

1 0

[bridgedb/develop] Merge branch 'hotfix/0.3.0-twisted-14.0.2_r1' into develop
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 8f53b62ff569e11574fc5b3171e88c774821f257 Merge: 26b047d 6be3a91 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 25 04:02:07 2015 +0000 Merge branch 'hotfix/0.3.0-twisted-14.0.2_r1' into develop .travis.requirements.txt | 1 + lib/bridgedb/parse/versions.py | 11 ++++++-- lib/bridgedb/test/test_crypto.py | 18 +++++++++++++ lib/bridgedb/txrecaptcha.py | 55 ++++++++++++++++++++++++++++++++++---- requirements.txt | 1 + 5 files changed, 79 insertions(+), 7 deletions(-)

1 0

[bridgedb/develop] Change TLS cert checking in txrecaptcha to work with Twisted>=14.0.0.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 6be3a91e82f80cdc6c19f55d021580a65b64f115 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 25 01:46:25 2015 +0000 Change TLS cert checking in txrecaptcha to work with Twisted>=14.0.0. --- lib/bridgedb/txrecaptcha.py | 55 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 50 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/txrecaptcha.py b/lib/bridgedb/txrecaptcha.py index a8a0532..3666904 100644 --- a/lib/bridgedb/txrecaptcha.py +++ b/lib/bridgedb/txrecaptcha.py @@ -25,6 +25,8 @@ which are copyright the authors of the recaptcha-client_ package. import logging import urllib +from OpenSSL.crypto import FILETYPE_PEM +from OpenSSL.crypto import load_certificate from twisted import version as _twistedversion from twisted.internet import defer @@ -40,13 +42,33 @@ from zope.interface import implements from bridgedb.crypto import SSLVerifyingContextFactory - #: This was taken from recaptcha.client.captcha.API_SSL_SERVER. API_SSL_SERVER = API_SERVER = "https://www.google.com/recaptcha/api" API_SSL_VERIFY_URL = "%s/verify" % API_SSL_SERVER -# `t.w.client.HTTPConnectionPool` isn't available in Twisted-12.0.0 (see -# ticket #11219): +#: (type: `OpenSSL.crypto.X509`) Only trust certificate for the reCAPTCHA +#: :data:`API_SSL_SERVER` which were signed by the Google Internet Authority CA. +GOOGLE_INTERNET_AUTHORITY_CA_CERT = load_certificate(FILETYPE_PEM, bytes("""\ +-----BEGIN CERTIFICATE----- +MIICsDCCAhmgAwIBAgIDFXfhMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVT +MRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0 +aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTIxMjEyMTU1ODUwWhcNMTMxMjMxMTU1ODUw +WjBGMQswCQYDVQQGEwJVUzETMBEGA1UEChMKR29vZ2xlIEluYzEiMCAGA1UEAxMZ +R29vZ2xlIEludGVybmV0IEF1dGhvcml0eTCBnzANBgkqhkiG9w0BAQEFAAOBjQAw +gYkCgYEAye23pIucV+eEPkB9hPSP0XFjU5nneXQUr0SZMyCSjXvlKAy6rWxJfoNf +NFlOCnowzdDXxFdF7dWq1nMmzq0yE7jXDx07393cCDaob1FEm8rWIFJztyaHNWrb +qeXUWaUr/GcZOfqTGBhs3t0lig4zFEfC7wFQeeT9adGnwKziV28CAwEAAaOBozCB +oDAfBgNVHSMEGDAWgBRI5mj5K9KylddH2CMgEE8zmJCf1DAdBgNVHQ4EFgQUv8Aw +6/VDET5nup6R+/xq2uNrEiQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8E +BAMCAQYwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nZW90cnVzdC5jb20v +Y3Jscy9zZWN1cmVjYS5jcmwwDQYJKoZIhvcNAQEFBQADgYEAvprjecFG+iJsxzEF +ZUNgujFQodUovxOWZshcnDW7fZ7mTlk3zpeVJrGPZzhaDhvuJjIfKqHweFB7gwB+ +ARlIjNvrPq86fpVg0NOTawALkSqOUMl3MynBQO+spR7EHcRbADQ/JemfTEh2Ycfl +vZqhEFBfurZkX0eTANq98ZvVfpg= +-----END CERTIFICATE-----""")) + +# `t.w.client.HTTPConnectionPool` isn't available in Twisted-12.0.0 +# (see ticket #11219: https://bugs.torproject.org/11219) _connectionPoolAvailable = _twistedversion >= Version('twisted', 12, 1, 0) if _connectionPoolAvailable: logging.info("Using HTTPConnectionPool for reCaptcha API server.") @@ -61,6 +83,23 @@ else: _agent = client.Agent(reactor) +# Twisted>=14.0.0 changed the way in which hostname verification works. +if _twistedversion >= Version('twisted', 14, 0, 0): + from twisted.internet._sslverify import OpenSSLCertificateAuthorities + + class RecaptchaOpenSSLCertificateAuthorities(OpenSSLCertificateAuthorities): + """The trusted CAs for connecting to reCAPTCHA servers.""" + #: A list of `OpenSSL.crypto.X509` objects. + caCerts = [GOOGLE_INTERNET_AUTHORITY_CA_CERT,] + def __init__(self): + super(RecaptchaOpenSSLCertificateAuthorities, self).__init__(self.caCerts) + + class RecaptchaPolicyForHTTPS(client.BrowserLikePolicyForHTTPS): + _trustRoot = RecaptchaOpenSSLCertificateAuthorities() + def __init__(self): + super(RecaptchaPolicyForHTTPS, self).__init__(trustRoot=self._trustRoot) + + def _setAgent(agent): """Set the global :attr:`agent`. @@ -86,15 +125,21 @@ def _getAgent(reactor=reactor, url=API_SSL_VERIFY_URL, connectTimeout=30, :api:`twisted.internet.reactor.connectSSL` for specifying the connection timeout. (default: ``30``) """ + # Twisted>=14.0.0 changed the way in which hostname verification works. + if _twistedversion >= Version('twisted', 14, 0, 0): + contextFactory = RecaptchaPolicyForHTTPS() + else: + contextFactory = SSLVerifyingContextFactory(url) + if _connectionPoolAvailable: return client.Agent(reactor, - contextFactory=SSLVerifyingContextFactory(url), + contextFactory=contextFactory, connectTimeout=connectTimeout, pool=_pool, **kwargs) else: return client.Agent(reactor, - contextFactory=SSLVerifyingContextFactory(url), + contextFactory=contextFactory, connectTimeout=connectTimeout, **kwargs)

1 0

[bridgedb/develop] Fix syntax error in bridgedb.pot file.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 9ec5a96a437edd203ea0979a9a60c0297619f426 Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 25 09:47:43 2015 +0000 Fix syntax error in bridgedb.pot file. --- lib/bridgedb/i18n/templates/bridgedb.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/i18n/templates/bridgedb.pot b/lib/bridgedb/i18n/templates/bridgedb.pot index 28e4fd9..bd10a21 100644 --- a/lib/bridgedb/i18n/templates/bridgedb.pot +++ b/lib/bridgedb/i18n/templates/bridgedb.pot @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: bridgedb 0.2.4-234-g193c80a-dirty\n" -"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…' +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'" "POT-Creation-Date: 2015-03-19 22:13+0000\n" "PO-Revision-Date: 2015-03-19 22:13+0000\n" "Last-Translator: Isis Lovecruft <isis(a)torproject.org>\n"

1 0

[bridgedb/develop] Check envvar before using easy_install to install setup.py requires.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit d035fe64d85b12e6dbc5ebb23093e876f83b6d0a Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 23 03:00:26 2015 +0000 Check envvar before using easy_install to install setup.py requires. If there is an environment variable BRIDGEDB_INSTALL_DEPENDENCIES=0, then the setup.py script will not use easy_install to install dependencies. The default when using `make install` is to avoid using easy_install; the default when calling `python setup.py install` is to use easy_install. Until now, on BridgeDB's production server, `echo > requirements.txt` was run to avoid allowing easy_install to search for dependencies. This removes the need to do that. We shouldn't be erasing the requirements.txt file anymore, because it is kept under revision control and versioneer (which uses `git describe --tags --dirty --always` to dynamically determine the BridgeDB package version at install time) will add '-dirty' to the end of the version number if we change anything in the repo. Adding '-dirty' to the package version causes it to be invalid according to PEP440, causing other random failures such as the inability to discover scripts and packaged data which pkg_resources. --- Makefile | 4 ++-- setup.py | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 8b6358b..c6c0442 100644 --- a/Makefile +++ b/Makefile @@ -22,11 +22,11 @@ pyflakes: install: -python setup.py compile_catalog - python setup.py install --record installed-files.txt + BRIDGEDB_INSTALL_DEPENDENCIES=0 python setup.py install --record installed-files.txt force-install: -python setup.py compile_catalog - python setup.py install --force --record installed-files.txt + BRIDGEDB_INSTALL_DEPENDENCIES=0 python setup.py install --force --record installed-files.txt uninstall: touch installed-files.txt diff --git a/setup.py b/setup.py index 5e5de39..9402071 100644 --- a/setup.py +++ b/setup.py @@ -264,8 +264,19 @@ class runTests(setuptools.Command): sys.path = old_path +# If there is an environment variable BRIDGEDB_INSTALL_DEPENDENCIES=0, it will +# disable checking for, fetching, and installing BridgeDB's dependencies with +# easy_install. +# +# Setting BRIDGEDB_INSTALL_DEPENDENCIES=0 is *highly* recommended, because +# easy_install is a security nightmare. Automatically installing dependencies +# is enabled by default, however, because this is how all Python packages are +# supposed to work. +if bool(int(os.environ.get("BRIDGEDB_INSTALL_DEPENDENCIES", 1))): + requires, deplinks = get_requirements() +else: + requires, deplinks = [], [] -requires, deplinks = get_requirements() setuptools.setup( name='bridgedb',

1 0

[bridgedb/develop] Update CHANGELOG for bridgedb-0.3.1.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 217b918e72b0fbba261dc32dd3a2d58ec1cd5ab5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 24 00:50:33 2015 +0000 Update CHANGELOG for bridgedb-0.3.1. --- CHANGELOG | 42 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index d0f99e1..279ad57 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,44 @@ -Changes in version 0.3.0 - XXX +Changes in version 0.3.1 - 2015-03-24 + + * FIXES #14065 https://bugs.torproject.org/14065 + When requesting vanilla IPv6 bridges from + https://bridges.torproject.org, BridgeDB would respond with IPv4 + addresses. It now correctly responds with IPv6 addresses. + +And includes the following general changes: + + * FIXES an issue with the filtering of hashrings while answering + requests for Pluggable Transports. (commit 3ef37df6) + + * FIXES the return value from the GnuPG interface initialization + function (bridgedb.crypto.initializeGnuPG) when creating a test + signature has failed. + + * CHANGES the way BridgeDB handles the case where it parses to + duplicate extrainfo descriptors (for the same Bridge) which also + have identical timestamps. Before, we assumed this wasn't + possible. It turns out that it not only is possible, but that + usually every batch of descriptors has at least one Bridge with + such a set of perfectly identical extrainfo descriptors. Even + stranger, it appears that only Bridges started for the first time + quite recently (within the last eight hours) display this + behaviour. BridgeDB now logs these errors, rather than leaving + them unhandled. + (commit a27d7905) + + * ADDS an environment variable check to setup.py which controls + whether the setup.py script tries to install the dependencies + listed in the requirements.txt file with easy_install. If the + environment variable BRIDGEDB_INSTALL_DEPENDENCIES=0, then + setup.py will not use easy_install. When BridgeDB is installed + via `make install` the default is to not use easy_install; + however, when installed via `python setup.py install`, the default + is to use easy_install to check for, find, and install + dependencies. (NOTE: the latter is *not* recommended.) + (commit d035fe64) + + +Changes in version 0.3.0 - 2015-03-21 * FIXES #2895 https://bugs.torproject.org/2895 BridgeDB no longer assumes that any extrainfo descriptor files are

1 0

[bridgedb/develop] Remove the need for the recaptcha-client dependency.
by isis＠torproject.org 25 Mar '15

25 Mar '15

commit 032ac80ad1f14e3a47a0c28a0e5fff1a787e8c8e Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Mar 25 01:24:47 2015 +0000 Remove the need for the recaptcha-client dependency. --- lib/bridgedb/txrecaptcha.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/txrecaptcha.py b/lib/bridgedb/txrecaptcha.py index 96b288c..a8a0532 100644 --- a/lib/bridgedb/txrecaptcha.py +++ b/lib/bridgedb/txrecaptcha.py @@ -25,9 +25,6 @@ which are copyright the authors of the recaptcha-client_ package. import logging import urllib -from recaptcha.client.captcha import API_SSL_SERVER -from recaptcha.client.captcha import RecaptchaResponse -from recaptcha.client.captcha import displayhtml from twisted import version as _twistedversion from twisted.internet import defer @@ -44,7 +41,8 @@ from zope.interface import implements from bridgedb.crypto import SSLVerifyingContextFactory -API_SERVER = API_SSL_SERVER +#: This was taken from recaptcha.client.captcha.API_SSL_SERVER. +API_SSL_SERVER = API_SERVER = "https://www.google.com/recaptcha/api" API_SSL_VERIFY_URL = "%s/verify" % API_SSL_SERVER # `t.w.client.HTTPConnectionPool` isn't available in Twisted-12.0.0 (see @@ -107,6 +105,15 @@ class RecaptchaResponseError(ValueError): """There was an error with the reCaptcha API server's response.""" +class RecaptchaResponse(object): + """Taken from recaptcha.client.captcha.`RecaptchaResponse`_. + .. RecaptchaResponse: https://code.google.com/p/recaptcha/source/browse/trunk/recaptcha-plugins/p… + """ + def __init__(self, is_valid, error_code=None): + self.is_valid = is_valid + self.error_code = error_code + + class RecaptchaResponseProtocol(protocol.Protocol): """HTML parser which creates a :class:`RecaptchaResponse` from the body of the reCaptcha API server's response.

1 0