tor-commits March 2014

tor-commits@lists.torproject.org

22 participants
2036 discussions

[bridgedb/develop] Update copyright year in lib/bridgedb/test/test_parse_networkstatus.py.
by isis＠torproject.org 04 Mar '14

04 Mar '14

commit 019859f2d0f7b2edcfe58cbdc5512cf3348f4dcb Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 4 04:32:06 2014 +0000 Update copyright year in lib/bridgedb/test/test_parse_networkstatus.py. --- lib/bridgedb/test/test_parse_networkstatus.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/test/test_parse_networkstatus.py b/lib/bridgedb/test/test_parse_networkstatus.py index 46bd90d..6a89c25 100644 --- a/lib/bridgedb/test/test_parse_networkstatus.py +++ b/lib/bridgedb/test/test_parse_networkstatus.py @@ -3,10 +3,8 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# please also see AUTHORS file -# :copyright: (c) 2013, Isis Lovecruft -# (c) 2007-2013, The Tor Project, Inc. -# (c) 2007-2013, all entities within the AUTHORS file +# :copyright: (c) 2013-2014, Isis Lovecruft +# (c) 2007-2014, The Tor Project, Inc. # :license: 3-Clause BSD, see LICENSE for licensing information """Unittests for the :mod:`bridgedb.parse.networkstatus` module.

1 0

[bridgedb/develop] Fix indentation of docstring parameters in HTTPServer.WebResourceBridges.
by isis＠torproject.org 04 Mar '14

04 Mar '14

commit ba592b4890837ad0eed08a761a273d1d4f7e5277 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 4 04:36:54 2014 +0000 Fix indentation of docstring parameters in HTTPServer.WebResourceBridges. --- lib/bridgedb/HTTPServer.py | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index fb1fb7f..724e8cd 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -241,31 +241,29 @@ class WebResourceOptions(twisted.web.resource.Resource): render_POST = render_GET + class WebResourceBridges(twisted.web.resource.Resource): """This resource is used by Twisted Web to give a web page with some bridges in response to a request.""" + isLeaf = True def __init__(self, distributor, schedule, N=1, useForwardedHeader=False, includeFingerprints=True, domains=None): """Create a new WebResource. - :type distributor: :class:`IPBasedDistributor` - :param distributor: The mechanism to retrieve bridges for - this distributor - :type schedule: :class:`IntervalSchedule` - :param schedule: The time period used to tweak the bridge - selection procedure. - :param int N: The number of bridges to hand out per query. - :param bool useForwardedHeader: Whether or not we should - use the the - X-Forwarded-For header - instead of the source IP - address. - :param bool includeFingerprints: Do we include the - bridge's fingerprint - in the response? - :param list domains: The list of email provider - domain names we support. (unused) + + :type distributor: :class:`IPBasedDistributor` + :param distributor: The mechanism to retrieve bridges for this + distributor. + :type schedule: :class:`IntervalSchedule` + :param schedule: The time period used to tweak the bridge selection + procedure. + :param int N: The number of bridges to hand out per query. + :param bool useForwardedHeader: Whether or not we should use the the + X-Forwarded-For header instead of the + source IP address. + :param bool includeFingerprints: Do we include the bridge's + fingerprint in the response? """ gettext.install("bridgedb", unicode=True) twisted.web.resource.Resource.__init__(self)

1 0

[bridgedb/develop] Add a module docstring to bridgedb.crypto.
by isis＠torproject.org 04 Mar '14

04 Mar '14

commit a41cf0d90fd80243c0e0b81a1648c5f19598772c Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 4 04:46:27 2014 +0000 Add a module docstring to bridgedb.crypto. --- lib/bridgedb/crypto.py | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/crypto.py b/lib/bridgedb/crypto.py index 6b16e49..d615489 100644 --- a/lib/bridgedb/crypto.py +++ b/lib/bridgedb/crypto.py @@ -3,17 +3,33 @@ # This file is part of BridgeDB, a Tor bridge distribution system. # # :authors: Isis Lovecruft 0xA3ADB67A2CDB8B35 <isis(a)torproject.org> -# please also see AUTHORS file -# :copyright: (c) 2007-2013, The Tor Project, Inc. -# (c) 2007-2013, all entities within the AUTHORS file +# :copyright: (c) 2007-2014, The Tor Project, Inc. +# (c) 2013-2014, Isis Lovecruft +# (c) 2007-2014, all entities within the AUTHORS file # :license: 3-clause BSD, see included LICENSE for information +"""crypto - BridgeDB general cryptographic utilities. + +**Module Overview:** + +.. + crypto + |_getKey() - Load the master key from a file, or create a new one. + | + \_SSLVerifyingContextFactory - OpenSSL.SSL.Context factory which verifies + | certificate chains and matches hostnames. + |_getContext() - Retrieve an SSL context configured for certificate + | verification. + |_getHostnameFromURL() - Parses the hostname from the request URL. + \_verifyHostname() - Check that the cert CN matches the request + hostname. + +""" from __future__ import absolute_import from __future__ import unicode_literals import logging - import os import OpenSSL.rand

1 0

[torbrowser/master] Bump versions for 3.6-beta-1 (for demo purposes).
by mikeperry＠torproject.org 04 Mar '14

04 Mar '14

commit 7b7206d7b20edecf9c277cde6ac4f800e214ee18 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Mar 3 19:01:37 2014 -0800 Bump versions for 3.6-beta-1 (for demo purposes). --- build-scripts/recommended-versions | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index c712801..437bd40 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -4,5 +4,8 @@ "3.5.2-Windows", "3.5.2.1-Linux", "3.5.2.1-MacOS", -"3.5.2.1-Windows" +"3.5.2.1-Windows", +"3.6-beta-1-Linux", +"3.6-beta-1-MacOS", +"3.6-beta-1-Windows" ]

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by mikeperry＠torproject.org 04 Mar '14

04 Mar '14

commit 95a9ea0a59f98379cf109a7868774cc5ab4a99fa Merge: 920c4d3 7b7206d Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Mar 3 19:02:02 2014 -0800 Merge branch 'maint-2.4' build-scripts/recommended-versions | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)

1 0

[torbrowser/maint-2.4] Bump versions for 3.6-beta-1 (for demo purposes).
by mikeperry＠torproject.org 04 Mar '14

04 Mar '14

1 0

[stem/master] Support for HS_DESC events
by atagar＠torproject.org 04 Mar '14

04 Mar '14

commit d5eabee949f3bbee347db11525978be45b00725c Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 3 15:59:17 2014 -0800 Support for HS_DESC events Adding support for tor's now HS_DESC events... https://gitweb.torproject.org/torspec.git/commitdiff/a67ac4d https://trac.torproject.org/10807 --- stem/__init__.py | 42 ++++++++++++++++++++++++++++++++++++++++++ stem/control.py | 3 ++- stem/response/events.py | 33 +++++++++++++++++++++++++++++++++ stem/version.py | 2 ++ test/unit/response/events.py | 26 ++++++++++++++++++++++++++ 5 files changed, 105 insertions(+), 1 deletion(-) diff --git a/stem/__init__.py b/stem/__init__.py index 2663b45..ff344c8 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -392,6 +392,32 @@ Library for working with the tor process. **RELAY** relay token bucket **ORCONN** bucket used for OR connections =============== =========== + +.. data:: HSDescAction (enum) + + Action beeing taken in a HS_DESC event. + + =============== =========== + HSDescAction Description + =============== =========== + **REQUESTED** uncached hidden service descriptor is being requested + **RECEIVED** hidden service descriptor has been retrieved + **IGNORE** fetched descriptor was ignored because we already have its v0 descriptor + **FAILED** we were unable to retrieve the descriptor + =============== =========== + +.. data:: HSAuth (enum) + + Type of authentication being used for a HS_DESC event. + + ================= =========== + HSAuth Description + ================= =========== + **NO_AUTH** no authentication + **BASIC_AUTH** general hidden service authentication + **STEALTH_AUTH** authentication method that hides service activity from unauthorized clients + **UNKNOWN** unrecognized method of authentication + ================= =========== """ __version__ = '1.1.1-dev' @@ -429,6 +455,8 @@ __all__ = [ "CircClosureReason", "CircEvent", "HiddenServiceState", + "HSAuth", + "HSDescAction", "RelayEndReason", "StreamStatus", "StreamClosureReason", @@ -736,3 +764,17 @@ TokenBucket = stem.util.enum.UppercaseEnum( "RELAY", "ORCONN", ) + +HSDescAction = stem.util.enum.UppercaseEnum( + "REQUESTED", + "RECEIVED", + "IGNORE", + "FAILED", +) + +HSAuth = stem.util.enum.UppercaseEnum( + "NO_AUTH", + "BASIC_AUTH", + "STEALTH_AUTH", + "UNKNOWN", +) diff --git a/stem/control.py b/stem/control.py index 9dff578..b0832ed 100644 --- a/stem/control.py +++ b/stem/control.py @@ -122,6 +122,7 @@ providing its own for interacting at a higher level. **DESCCHANGED** :class:`stem.response.events.DescChangedEvent` **ERR** :class:`stem.response.events.LogEvent` **GUARD** :class:`stem.response.events.GuardEvent` + **HS_DIR** :class:`stem.response.events.HSDescEvent` **INFO** :class:`stem.response.events.LogEvent` **NEWCONSENSUS** :class:`stem.response.events.NewConsensusEvent` **NEWDESC** :class:`stem.response.events.NewDescEvent` @@ -2589,7 +2590,7 @@ def _parse_circ_path(path): def _parse_circ_entry(entry): """ Parses a single relay's 'LongName' or 'ServerID'. See the - :func:`~_stem.control._parse_circ_path` function for more information. + :func:`~stem.control._parse_circ_path` function for more information. :param str entry: relay information to be parsed diff --git a/stem/response/events.py b/stem/response/events.py index 931127d..082ecb1 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -570,6 +570,38 @@ class GuardEvent(Event): self._log_if_unrecognized('status', stem.GuardStatus) +class HSDescEvent(Event): + """ + Event triggered when we fetch a hidden service descriptor that presently isn't in our cache. + + The HS_DESC event was introduced in tor version 0.2.5.2-alpha. + + :var stem.HSDescAction action: what is happening with the descriptor + :var str address: hidden service address + :var stem.HSAuth authentication: service's authentication method + :var str directory: hidden service directory servicing the request + :var str directory_fingerprint: hidden service directory's finterprint + :var str directory_nickname: hidden service directory's nickname if it was provided + :var str descriptor_id: descriptor identifier + """ + + _VERSION_ADDED = stem.version.Requirement.EVENT_HS_DESC + _POSITIONAL_ARGS = ("action", "address", "authentication", "directory", "descriptor_id") + + def _parse(self): + self.directory_fingerprint = None + self.directory_nickname = None + + try: + self.directory_fingerprint, self.directory_nickname = \ + stem.control._parse_circ_entry(self.directory) + except stem.ProtocolError: + raise stem.ProtocolError("HS_DESC's directory doesn't match a ServerSpec: %s" % self) + + self._log_if_unrecognized('action', stem.HSDescAction) + self._log_if_unrecognized('authentication', stem.HSAuth) + + class LogEvent(Event): """ Tor logging event. These are the most visible kind of event since, by @@ -1164,6 +1196,7 @@ EVENT_TYPE_TO_CLASS = { "DESCCHANGED": DescChangedEvent, "ERR": LogEvent, "GUARD": GuardEvent, + "HS_DESC": HSDescEvent, "INFO": LogEvent, "NEWCONSENSUS": NewConsensusEvent, "NEWDESC": NewDescEvent, diff --git a/stem/version.py b/stem/version.py index d0dae78..e3ba69b 100644 --- a/stem/version.py +++ b/stem/version.py @@ -47,6 +47,7 @@ easily parsed and compared, for instance... **EVENT_CIRC_BW** CIRC_BW events **EVENT_CELL_STATS** CELL_STATS events **EVENT_TB_EMPTY** TB_EMPTY events + **EVENT_HS_DESC** HS_DESC events **EXTENDCIRCUIT_PATH_OPTIONAL** EXTENDCIRCUIT queries can omit the path if the circuit is zero **FEATURE_EXTENDED_EVENTS** 'EXTENDED_EVENTS' optional feature **FEATURE_VERBOSE_NAMES** 'VERBOSE_NAMES' optional feature @@ -349,6 +350,7 @@ Requirement = stem.util.enum.Enum( ("EVENT_CIRC_BW", Version('0.2.5.2-alpha')), ("EVENT_CELL_STATS", Version('0.2.5.2-alpha')), ("EVENT_TB_EMPTY", Version('0.2.5.2-alpha')), + ("EVENT_HS_DESC", Version('0.2.5.2-alpha')), ("EXTENDCIRCUIT_PATH_OPTIONAL", Version("0.2.2.9")), ("FEATURE_EXTENDED_EVENTS", Version("0.2.2.1-alpha")), ("FEATURE_VERBOSE_NAMES", Version("0.2.2.1-alpha")), diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 23e682e..28de639 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -192,6 +192,12 @@ GUARD_NEW = "650 GUARD ENTRY $36B5DBA788246E8369DBAF58577C6BC044A9A374 NEW" GUARD_GOOD = "650 GUARD ENTRY $5D0034A368E0ABAF663D21847E1C9B6CFA09752A GOOD" GUARD_BAD = "650 GUARD ENTRY $5D0034A368E0ABAF663D21847E1C9B6CFA09752A=caerSidi BAD" +HS_DESC_EVENT = "650 HS_DESC REQUESTED ajhb7kljbiru65qo NO_AUTH \ +$67B2BDA4264D8A189D9270E28B1D30A262838243=europa1 b3oeducbhjmbqmgw2i3jtz4fekkrinwj" + +HS_DESC_NO_DESC_ID = "650 HS_DESC REQUESTED ajhb7kljbiru65qo NO_AUTH \ +$67B2BDA4264D8A189D9270E28B1D30A262838243" + # NEWCONSENSUS event from v0.2.1.30. NEWCONSENSUS_EVENT = """650+NEWCONSENSUS @@ -730,6 +736,26 @@ class TestEvents(unittest.TestCase): self.assertEqual("caerSidi", event.endpoint_nickname) self.assertEqual(GuardStatus.BAD, event.status) + def test_hs_desc_event(self): + event = _get_event(HS_DESC_EVENT) + + self.assertTrue(isinstance(event, stem.response.events.HSDescEvent)) + self.assertEqual(HS_DESC_EVENT.lstrip("650 "), str(event)) + self.assertEqual(HSDescAction.REQUESTED, event.action) + self.assertEqual("ajhb7kljbiru65qo", event.address) + self.assertEqual(HSAuth.NO_AUTH, event.authentication) + self.assertEqual("$67B2BDA4264D8A189D9270E28B1D30A262838243=europa1", event.directory) + self.assertEqual("67B2BDA4264D8A189D9270E28B1D30A262838243", event.directory_fingerprint) + self.assertEqual("europa1", event.directory_nickname) + self.assertEqual("b3oeducbhjmbqmgw2i3jtz4fekkrinwj", event.descriptor_id) + + event = _get_event(HS_DESC_NO_DESC_ID) + + self.assertEqual("$67B2BDA4264D8A189D9270E28B1D30A262838243", event.directory) + self.assertEqual("67B2BDA4264D8A189D9270E28B1D30A262838243", event.directory_fingerprint) + self.assertEqual(None, event.directory_nickname) + self.assertEqual(None, event.descriptor_id) + def test_newdesc_event(self): event = _get_event(NEWDESC_SINGLE) expected_relays = (("B3FA3110CC6F42443F039220C134CBD2FC4F0493", "Sakura"),)

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 03 Mar '14

03 Mar '14

commit ff1a9b1810bb8430ce5df2b55605fbaadcf7ab8f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 3 21:15:23 2014 +0000 Update translations for https_everywhere_completed --- es/https-everywhere.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/es/https-everywhere.properties b/es/https-everywhere.properties index e18817e..60fcf60 100644 --- a/es/https-everywhere.properties +++ b/es/https-everywhere.properties @@ -1,8 +1,8 @@ -https-everywhere.menu.globalEnable = Activar HTTPS Everywhere -https-everywhere.menu.globalDisable = Desactivar HTTPS Everywhere +https-everywhere.menu.globalEnable = Activar HTTPS en todas partes +https-everywhere.menu.globalDisable = Desactivar HTTPS en todas partes https-everywhere.menu.enableDisable = Habilitar/Deshabilitar reglas https-everywhere.menu.noRules = (No hay reglas para esta página) https-everywhere.menu.unknownRules = (No se conocen reglas para esta página) -https-everywhere.toolbar.hint = HTTPS Everywhere no está activo. Puede activarlo sitio por sitio haciendo clic en el icono de la barra de direcciones. -https-everywhere.migration.notification0 = Para implementar esta reparación crucial, esta actualización restablece sus preferencias de reglas de HTTPS Everywhere a los valores predeterminados. -https-everywhere.menu.ruleset-tests = Ejecutar pruebas del conjunto de reglas de HTTPS Everywhere +https-everywhere.toolbar.hint = HTTPS en todas partes no está activo. Puede activarlo sitio por sitio haciendo clic en el icono de la barra de direcciones. +https-everywhere.migration.notification0 = Para implementar esta reparación crucial, esta actualización restablece sus preferencias de reglas de HTTPS en todas partes a los valores predeterminados. +https-everywhere.menu.ruleset-tests = Ejecutar pruebas del conjunto de reglas de HTTPS en todas partes

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 03 Mar '14

03 Mar '14

commit f92b58f21d780066c05abafae20f6f2303d8de22 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 3 21:15:18 2014 +0000 Update translations for https_everywhere --- es/https-everywhere.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/es/https-everywhere.properties b/es/https-everywhere.properties index e18817e..60fcf60 100644 --- a/es/https-everywhere.properties +++ b/es/https-everywhere.properties @@ -1,8 +1,8 @@ -https-everywhere.menu.globalEnable = Activar HTTPS Everywhere -https-everywhere.menu.globalDisable = Desactivar HTTPS Everywhere +https-everywhere.menu.globalEnable = Activar HTTPS en todas partes +https-everywhere.menu.globalDisable = Desactivar HTTPS en todas partes https-everywhere.menu.enableDisable = Habilitar/Deshabilitar reglas https-everywhere.menu.noRules = (No hay reglas para esta página) https-everywhere.menu.unknownRules = (No se conocen reglas para esta página) -https-everywhere.toolbar.hint = HTTPS Everywhere no está activo. Puede activarlo sitio por sitio haciendo clic en el icono de la barra de direcciones. -https-everywhere.migration.notification0 = Para implementar esta reparación crucial, esta actualización restablece sus preferencias de reglas de HTTPS Everywhere a los valores predeterminados. -https-everywhere.menu.ruleset-tests = Ejecutar pruebas del conjunto de reglas de HTTPS Everywhere +https-everywhere.toolbar.hint = HTTPS en todas partes no está activo. Puede activarlo sitio por sitio haciendo clic en el icono de la barra de direcciones. +https-everywhere.migration.notification0 = Para implementar esta reparación crucial, esta actualización restablece sus preferencias de reglas de HTTPS en todas partes a los valores predeterminados. +https-everywhere.menu.ruleset-tests = Ejecutar pruebas del conjunto de reglas de HTTPS en todas partes

1 0

[translation/gettor_completed] Update translations for gettor_completed
by translation＠torproject.org 03 Mar '14

03 Mar '14

commit 268e2a53ba79025ec32fb5f34fc7303344e1ce1a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 3 21:15:08 2014 +0000 Update translations for gettor_completed --- es/gettor.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/es/gettor.po b/es/gettor.po index 986dbbc..4733390 100644 --- a/es/gettor.po +++ b/es/gettor.po @@ -4,17 +4,18 @@ # # Translators: # Gioyik <gioyik(a)gmail.com>, 2011 +# henrycito <henry.izurieta(a)gmail.com>, 2014 # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009 # lenazun <lenazun(a)gmail.com>, 2011 -# strel <strelnic(a)gmail.com>, 2013 -# strel <strelnic(a)gmail.com>, 2012-2013 +# strel, 2013 +# strel, 2012-2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-01-19 13:40+0100\n" -"PO-Revision-Date: 2013-04-29 09:24+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-03 20:50+0000\n" +"Last-Translator: henrycito <henry.izurieta(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,7 +43,7 @@ msgid "" "We only process requests from email services that support \"DKIM\",\n" "which is an email feature that lets us verify that the address in the\n" "\"From\" line is actually the one who sent the mail." -msgstr "Sólo procesamos solicitudes provenientes de servicios de correo\nelectrónico con soporte \"DKIM\", una función de correo que nos\npermite verificar que la dirección en la línea \"De:\" es realmente\nla dirección desde la que se envió el correo." +msgstr "Sólo procesamos solicitudes provenientes de servicios de correo\nelectrónico con soporte \"DKIM\", una función de correo que nos\npermite verificar que la dirección en la línea \"De:\" es realmente\nla dirección desde la que se envió el correo. " #: lib/gettor/i18n.py:39 msgid ""

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2014