tor-commits August 2020

tor-commits@lists.torproject.org

18 participants
1961 discussions

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 16 Aug '20

16 Aug '20

commit 35c724ee94a688990b6375fc8a7ed9dfc36775b5 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Aug 16 03:45:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/contents+es.po b/contents+es.po index dd8ff3817c..d0dee55388 100644 --- a/contents+es.po +++ b/contents+es.po @@ -10120,12 +10120,17 @@ msgid "" "`/var/lib/tor/pt_state/obfs4_bridgeline.txt` and paste the entire bridge " "line into Tor Browser:" msgstr "" +"Si quieres conectarte a tu puente manualmente, necesitarás conocer su " +"certificado obfs4. Mira el archivo " +"`/var/lib/tor/pt_state/obfs4_bridgeline.txt` , y pega la línea completa " +"'Bridge' dentro del Navegador Tor:" #: https//community.torproject.org/relay/setup/bridge/post-install/ #: (content/relay-operations/technical-setup/bridge/post-install/contents+en.lrpage.body) msgid "" "Bridge obfs4 <IP ADDRESS>:<PORT> <FINGERPRINT> cert=<CERTIFICATE> iat-mode=0" msgstr "" +"Bridge obfs4 <IP ADDRESS>:<PORT> <FINGERPRINT> cert=<CERTIFICATE> iat-mode=0" #: https//community.torproject.org/relay/setup/bridge/post-install/ #: (content/relay-operations/technical-setup/bridge/post-install/contents+en.lrpage.body) @@ -10135,6 +10140,10 @@ msgid "" "`<FINGERPRINT>`, not `<HASHED FINGERPRINT>`; and that `<PORT>` is the obfs4 " "port you chose - and not the OR port." msgstr "" +"Necesitarás reemplazar `<IP ADDRESS>`, `<PORT>`, y `<FINGERPRINT>` con los " +"valores reales, los cuales puedes encontrar en el registro tor. Asegúrate de" +" usar `<FINGERPRINT>`, no `<HASHED FINGERPRINT>`; y que `<PORT>` sea el " +"puerto obfs4 que elegiste - y no el puerto OR." #: https//community.torproject.org/relay/setup/bridge/post-install/ #: (content/relay-operations/technical-setup/bridge/post-install/contents+en.lrpage.body) @@ -10145,21 +10154,26 @@ msgid "" "having set up the bridge, it takes approximately three hours for the bridge " "to show up in Relay Search." msgstr "" +"Finalmente, puedes monitorear el uso de tu puente obfs4 con [Búsqueda de " +"Repetidores](https://metrics.torproject.org/rs.html#search). Solo ingresa el" +" `<HASHED FINGERPRINT>` de tu puente en el formulario y haz clic en " +"\"Buscar\". Luego de haber configurado al puente, lleva aproximadamente tres" +" horas para que aparezca en Búsqueda de Repetidores." #: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/ #: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.title) msgid "Debian / Ubuntu" -msgstr "" +msgstr "Debian / Ubuntu" #: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/ #: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.subtitle) msgid "How to deploy an obfs4 bridge on Debian / Ubuntu" -msgstr "" +msgstr "Como desplegar un puente obfs4 en Debian / Ubuntu" #: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/ #: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body) msgid "### 1. Install Tor" -msgstr "" +msgstr "### 1. Instala Tor" #: https//community.torproject.org/relay/setup/bridge/debian-ubuntu/ #: (content/relay-operations/technical-setup/bridge/debian-ubuntu/contents+en.lrpage.body)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 16 Aug '20

16 Aug '20

commit a50bdd4eba81bde673de7ab08ba71a2039fdfd22 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Aug 16 03:15:10 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/contents+es.po b/contents+es.po index fc08e9a669..dd8ff3817c 100644 --- a/contents+es.po +++ b/contents+es.po @@ -10054,7 +10054,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) msgid "### 5. Final Notes" -msgstr "" +msgstr "### 5. Notas Finales" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) @@ -10066,21 +10066,28 @@ msgid "" "bridge is now running, check out the [post-install " "notes](https://community.torproject.org/relay/setup/bridge/post-install/)." msgstr "" +"Si estás teniendo problemas para configurar tu puente, hecha un vistazo a " +"[nuestra sección de ayuda](https://community.torproject.org/relay/getting-" +"help/). Si tu puente está corriendo ahora, comprueba las [notas " +"posinstalación](https://community.torproject.org/relay/setup/bridge/post-" +"install/)." #: https//community.torproject.org/relay/setup/bridge/post-install/ #: (content/relay-operations/technical-setup/bridge/post-install/contents+en.lrpage.title) msgid "Post-install" -msgstr "" +msgstr "Posinstalación" #: https//community.torproject.org/relay/setup/bridge/post-install/ #: (content/relay-operations/technical-setup/bridge/post-install/contents+en.lrpage.subtitle) msgid "How to find your bridge in Relay Search and connect manually" msgstr "" +"Cómo encontrar tu puente en la Búsqueda de Repetidores y conectarse " +"manualmente" #: https//community.torproject.org/relay/setup/bridge/post-install/ #: (content/relay-operations/technical-setup/bridge/post-install/contents+en.lrpage.body) msgid "Congrats!" -msgstr "" +msgstr "¡Felicitaciones!" #: https//community.torproject.org/relay/setup/bridge/post-install/ #: (content/relay-operations/technical-setup/bridge/post-install/contents+en.lrpage.body) @@ -10094,6 +10101,16 @@ msgid "" "bridge sees users. Finally, there aren't many bridge users out there, so you" " cannot expect your bridge to be as popular as a relay." msgstr "" +"Si llegaste hasta este punto, significa que tu puente obfs4 está corriendo y" +" siendo distribuído por BridgeDB a usuarios censurados. Ten en cuenta que " +"puede tomar varios días o semanas hasta que veas un conjunto de usuarios " +"consistentes, por lo que no te acobardes si no ves conexiones de usuarios " +"desde el principio. BridgeDB usa cuatro métodos para la distribución de " +"puentes: HTTPS, Moat, correo electrónico y manual. Algunos métodos son " +"usados más que otros, lo cual afecta trambién al tiempo que pase hasta que " +"tu puente vea usuarios. Finalmente, no hay muchos usuarios de puentes allá " +"afuera, por lo que no puedes esperar que el tuyo sea tan popular como un " +"repetidor." #: https//community.torproject.org/relay/setup/bridge/post-install/ #: (content/relay-operations/technical-setup/bridge/post-install/contents+en.lrpage.body)

1 0

[stem/master] Add CONTROLLER_WAIT stream status
by atagar＠torproject.org 16 Aug '20

16 Aug '20

commit 224b202ee31203b5b7036e159d796ed768d4113c Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Aug 12 18:02:53 2020 -0700 Add CONTROLLER_WAIT stream status Stream event status added in... https://gitweb.torproject.org/torspec.git/commit/?id=8761aa0 --- stem/__init__.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/stem/__init__.py b/stem/__init__.py index ce8d70a9..5e45aab0 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -251,19 +251,20 @@ Library for working with the tor process. State that a stream going through tor can have. Tor may provide states not in this enum. - ================= =========== - StreamStatus Description - ================= =========== - **NEW** request for a new connection - **NEWRESOLVE** request to resolve an address - **REMAP** address is being re-mapped to another - **SENTCONNECT** sent a connect cell along a circuit - **SENTRESOLVE** sent a resolve cell along a circuit - **SUCCEEDED** stream has been established - **FAILED** stream is detached, and won't be re-established - **DETACHED** stream is detached, but might be re-established - **CLOSED** stream has closed - ================= =========== + =================== =========== + StreamStatus Description + =================== =========== + **NEW** request for a new connection + **NEWRESOLVE** request to resolve an address + **REMAP** address is being re-mapped to another + **SENTCONNECT** sent a connect cell along a circuit + **SENTRESOLVE** sent a resolve cell along a circuit + **SUCCEEDED** stream has been established + **FAILED** stream is detached, and won't be re-established + **DETACHED** stream is detached, but might be re-established + **CONTROLLER_WAIT** awaiting a controller's ATTACHSTREAM request + **CLOSED** stream has closed + =================== =========== .. data:: StreamClosureReason (enum) @@ -917,6 +918,7 @@ StreamStatus = stem.util.enum.UppercaseEnum( 'SUCCEEDED', 'FAILED', 'DETACHED', + 'CONTROLLER_WAIT', 'CLOSED', )

1 0

[stem/master] Drop unused mapaddress integ test
by atagar＠torproject.org 16 Aug '20

16 Aug '20

commit 092ddb1df7ce4bc8f2edd4834cbe41d5147d3b7f Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Aug 13 17:57:39 2020 -0700 Drop unused mapaddress integ test Nick provided an alternate test rather than adjusting the existing one... https://trac.torproject.org/projects/tor/ticket/25611 I'm not entirely clear what the issue was but that's an old issue so simply dropping the obsolete test. --- test/integ/control/controller.py | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 59a7222c..db59ccf2 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -1202,48 +1202,8 @@ class TestController(unittest.TestCase): await controller.close_stream('blarg') @test.require.controller - @test.require.online @async_test async def test_mapaddress(self): - self.skipTest('(https://trac.torproject.org/projects/tor/ticket/25611)') - runner = test.runner.get_runner() - - async with await runner.get_tor_controller() as controller: - await controller.map_address({'1.2.1.2': 'ifconfig.me'}) - - s = None - response = None - - # try up to 10 times to rule out transient network failures - - for _ in range(10): - try: - s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.settimeout(30) - s.connect(('127.0.0.1', int(await controller.get_conf('SocksPort')))) - test.network.negotiate_socks(s, '1.2.1.2', 80) - s.sendall(stem.util.str_tools._to_bytes(test.network.IP_REQUEST)) # make the http request for the ip address - response = s.recv(1000) - - if response: - break - except (stem.ProtocolError, socket.timeout): - continue - finally: - if s: - s.close() - - self.assertTrue(response) - - # everything after the blank line is the 'data' in a HTTP response. - # The response data for our request for request should be an IP address + '\n' - - ip_addr = response[response.find(b'\r\n\r\n'):].strip() - self.assertTrue(stem.util.connection.is_valid_ipv4_address(stem.util.str_tools._to_unicode(ip_addr)), "'%s' isn't an address" % ip_addr) - - @test.require.controller - @async_test - async def test_mapaddress_offline(self): runner = test.runner.get_runner() async with await runner.get_tor_controller() as controller:

1 0

[stem/master] Unassign MAPADDRESS when destination is None
by atagar＠torproject.org 16 Aug '20

16 Aug '20

commit cba4c3fbeb8f39e5dd494624c3fffba57628866a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 15 14:47:20 2020 -0700 Unassign MAPADDRESS when destination is None Integration tests should undo any configuration changes they make to avoid unintentionally impacting later tests. Initially it was unclear to me how to unassign MAPADDRESS, but I filed the following to clarify this... https://gitlab.torproject.org/tpo/core/tor/-/issues/40104 --- stem/control.py | 10 +++------- test/integ/control/controller.py | 30 +++++++++++++++++------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/stem/control.py b/stem/control.py index 9efc6e04..678afa8f 100644 --- a/stem/control.py +++ b/stem/control.py @@ -3872,12 +3872,8 @@ class Controller(BaseController): async def map_address(self, mapping: Mapping[str, str]) -> Dict[str, str]: """ - Map addresses to replacement addresses. Tor replaces subseqent connections - to the original addresses with the replacement addresses. - - If the original address is a null address, i.e., one of '0.0.0.0', '::0', or - '.' Tor picks an original address itself and returns it in the reply. If the - original address is already mapped to a different address the mapping is + Replace Tor connections for the given addresses with alternate + destionations. If the destination is **None** then its mapping will be removed. :param mapping: mapping of original addresses to replacement addresses @@ -3889,7 +3885,7 @@ class Controller(BaseController): * :class:`stem.OperationFailed` if Tor couldn't fulfill the request """ - mapaddress_arg = ' '.join(['%s=%s' % (k, v) for (k, v) in list(mapping.items())]) + mapaddress_arg = ' '.join(['%s=%s' % (k, v if v else k) for (k, v) in list(mapping.items())]) response = await self.msg('MAPADDRESS %s' % mapaddress_arg) return stem.response._convert_to_mapaddress(response).entries diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index db59ccf2..8fc0e099 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -1210,16 +1210,14 @@ class TestController(unittest.TestCase): # try mapping one element, ensuring results are as expected map1 = {'1.2.1.2': 'ifconfig.me'} - x = await controller.map_address(map1) - self.assertEqual(x, map1) + self.assertEqual(map1, await controller.map_address(map1)) # try mapping two elements, ensuring results are as expected map2 = {'1.2.3.4': 'foobar.example.com', '1.2.3.5': 'barfuzz.example.com'} - x = await controller.map_address(map2) - self.assertEqual(x, map2) + self.assertEqual(map2, await controller.map_address(map2)) # try mapping zero elements @@ -1229,22 +1227,22 @@ class TestController(unittest.TestCase): # try a virtual mapping to IPv4, the default virtualaddressrange is 127.192.0.0/10 map3 = {'0.0.0.0': 'quux'} - x = await controller.map_address(map3) - self.assertEquals(len(x), 1) - addr1, target = list(x.items())[0] + response = await controller.map_address(map3) + self.assertEquals(len(response), 1) + addr1, target = list(response.items())[0] - self.assertTrue(addr1.startswith('127.'), '%s did not start with 127.' % addr1) - self.assertEquals(target, 'quux') + self.assertTrue('%s did not start with 127.' % addr1, addr1.startswith('127.')) + self.assertEquals('quux', target) # try a virtual mapping to IPv6, the default IPv6 virtualaddressrange is FE80::/10 map4 = {'::': 'quibble'} - x = await controller.map_address(map4) - self.assertEquals(len(x), 1) - addr2, target = list(x.items())[0] + response = await controller.map_address(map4) + self.assertEquals(1, len(response)) + addr2, target = list(response.items())[0] self.assertTrue(addr2.startswith('[fe'), '%s did not start with [fe.' % addr2) - self.assertEquals(target, 'quibble') + self.assertEquals('quibble', target) async def address_mappings(addr_type): response = await controller.get_info(['address-mappings/%s' % addr_type]) @@ -1281,6 +1279,12 @@ class TestController(unittest.TestCase): self.assertEquals({}, await address_mappings('config')) + # revert these address mappings + + mapped_addresses = (await address_mappings('control')).keys() + await controller.map_address(dict([(addr, None) for addr in mapped_addresses])) + self.assertEquals({}, await address_mappings('control')) + @test.require.controller @test.require.online @async_test

1 0

[stem/master] Accept all 2xx response codes
by atagar＠torproject.org 16 Aug '20

16 Aug '20

commit 8d1effca8fa37062ada130cfe50955ff9bb0359b Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Aug 13 17:32:10 2020 -0700 Accept all 2xx response codes Tor uses a similar response code scheme as HTTP (2xx = ok, 4xx = error, 5xx = fatal). Most successful responses are 250, but better to accept all 2xx codes. --- stem/response/__init__.py | 6 +++--- test/unit/response/getconf.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stem/response/__init__.py b/stem/response/__init__.py index 5749fbcb..b4c7aed5 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -235,13 +235,13 @@ class ControlMessage(object): def is_ok(self) -> bool: """ - Checks if any of our lines have a 250, 251 or 252 response. + Checks if any of our lines have a 2xx response. - :returns: **True** if any lines have a 250, 251 or 252 response code, **False** otherwise + :returns: **True** if any lines have a 2xx response code, **False** otherwise """ for code, _, _ in self._parsed_content: - if code in ['250', '251', '252']: + if code.isdigit() and (200 <= int(code) < 300): return True return False diff --git a/test/unit/response/getconf.py b/test/unit/response/getconf.py index c9765fcf..9d1b1b96 100644 --- a/test/unit/response/getconf.py +++ b/test/unit/response/getconf.py @@ -31,7 +31,7 @@ UNRECOGNIZED_KEY_RESPONSE = '''552-Unrecognized configuration key "brickroad" INVALID_RESPONSE = """\ 123-FOO -232 BAR""" +532 BAR""" class TestGetConfResponse(unittest.TestCase):

1 0

[stem/master] Missing changelog entries
by atagar＠torproject.org 16 Aug '20

16 Aug '20

commit 1b301bd651519022f3ac0172c2907b9a7df5d5fe Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Aug 13 17:14:38 2020 -0700 Missing changelog entries --- docs/change_log.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/change_log.rst b/docs/change_log.rst index f76b933f..ca7aeba7 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -46,6 +46,14 @@ Unreleased The following are only available within Stem's `git repository <download.html>`_. + * **General** + + * Stem now requires Python 3.6+. Support for deprecated Python versions (2.6 -> 3.5) has been removed. + * Deprecated methods and attributes have been removed. + * Our API now provides `type hints <https://blog.atagar.com/may2020/>`_. + * Migrated to `asyncio <https://docs.python.org/3/library/asyncio.html>`_. Stem can now be used by `both synchronous and asynchronous applications <https://blog.atagar.com/july2020/>`_. + * Installation has migrated from distutils to setuptools. + * **Controller** * Socket based control connections often raised BrokenPipeError when closed

1 0

[stem/master] Support mixed MAPADDRESS response
by atagar＠torproject.org 16 Aug '20

16 Aug '20

commit 2e66a4846e980ce70bca40bea968b89909130029 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 15 16:56:18 2020 -0700 Support mixed MAPADDRESS response Recently tor documented that MAPADDRESS can contain a mixture of successful and failed responses... https://gitweb.torproject.org/torspec.git/commit/?id=1417af05de247d9f858863… Such a response didn't break us, our map_address() method simply ignored the failures and returned a dictionary with whatever mappings succeeded. However, we should provide our caller with failures as well for completeness. This breaks backward compatibility in a couple ways... 1. Our map_address() method now returns a MapAddressResponse rather than a dictionary. 2. Renamed MapAddressResponse's "entries" attribute to "mappings". Personally I'd prefer if MAPADDRESS was all-or-nothing (that is to say, if any entry is malformed then reject the request). That would produce a simpler API for our callers. But I don't control that so this is the method response we'll need to supply. --- stem/control.py | 7 ++++--- stem/response/mapaddress.py | 27 ++++++++++++++++++--------- test/integ/control/controller.py | 24 ++++++++++++++++++++---- test/unit/response/mapaddress.py | 6 +++--- 4 files changed, 45 insertions(+), 19 deletions(-) diff --git a/stem/control.py b/stem/control.py index 678afa8f..e1c68ce9 100644 --- a/stem/control.py +++ b/stem/control.py @@ -3870,7 +3870,7 @@ class Controller(BaseController): return value - async def map_address(self, mapping: Mapping[str, str]) -> Dict[str, str]: + async def map_address(self, mapping: Mapping[str, str]) -> 'stem.response.mapaddress.MapAddressResponse': """ Replace Tor connections for the given addresses with alternate destionations. If the destination is **None** then its mapping will be @@ -3878,7 +3878,8 @@ class Controller(BaseController): :param mapping: mapping of original addresses to replacement addresses - :returns: **dict** with 'original -> replacement' address mappings + :returns: :class:`~stem.response.mapaddress.MapAddressResponse` with the + address mappings and failrues :raises: * :class:`stem.InvalidRequest` if the addresses are malformed @@ -3887,7 +3888,7 @@ class Controller(BaseController): mapaddress_arg = ' '.join(['%s=%s' % (k, v if v else k) for (k, v) in list(mapping.items())]) response = await self.msg('MAPADDRESS %s' % mapaddress_arg) - return stem.response._convert_to_mapaddress(response).entries + return stem.response._convert_to_mapaddress(response) async def drop_guards(self) -> None: """ diff --git a/stem/response/mapaddress.py b/stem/response/mapaddress.py index 92ce16d2..69877109 100644 --- a/stem/response/mapaddress.py +++ b/stem/response/mapaddress.py @@ -7,10 +7,20 @@ import stem.socket class MapAddressResponse(stem.response.ControlMessage): """ - Reply for a MAPADDRESS query. - Doesn't raise an exception unless no addresses were mapped successfully. + MAPADDRESS reply. Responses can contain a mixture of successes and failures, + such as... - :var dict entries: mapping between the original and replacement addresses + :: + + 512-syntax error: invalid address '@@@' + 250 1.2.3.4=tor.freehaven.net + + This only raises an exception if **every** mapping fails. Otherwise + **mapped** enumerates our successes and **failures** lists any + failure messages. + + :var dict mapped: mapping between the original and replacement addresses + :var list failures: failure listed within this reply :raises: * :class:`stem.OperationFailed` if Tor was unable to satisfy the request @@ -18,10 +28,6 @@ class MapAddressResponse(stem.response.ControlMessage): """ def _parse_message(self) -> None: - # Example: - # 250-127.192.10.10=torproject.org - # 250 1.2.3.4=tor.freehaven.net - if not self.is_ok(): for code, _, message in self.content(): if code == '512': @@ -31,12 +37,15 @@ class MapAddressResponse(stem.response.ControlMessage): else: raise stem.ProtocolError('MAPADDRESS returned unexpected response code: %s', code) - self.entries = {} + self.mapped = {} + self.failures = [] for code, _, message in self.content(): if code == '250': try: key, value = message.split('=', 1) - self.entries[key] = value + self.mapped[key] = value except ValueError: raise stem.ProtocolError(None, "MAPADDRESS returned '%s', which isn't a mapping" % message) + else: + self.failures.append(message) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 8fc0e099..9c077966 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -1210,14 +1210,14 @@ class TestController(unittest.TestCase): # try mapping one element, ensuring results are as expected map1 = {'1.2.1.2': 'ifconfig.me'} - self.assertEqual(map1, await controller.map_address(map1)) + self.assertEqual(map1, (await controller.map_address(map1)).mapped) # try mapping two elements, ensuring results are as expected map2 = {'1.2.3.4': 'foobar.example.com', '1.2.3.5': 'barfuzz.example.com'} - self.assertEqual(map2, await controller.map_address(map2)) + self.assertEqual(map2, (await controller.map_address(map2)).mapped) # try mapping zero elements @@ -1229,7 +1229,7 @@ class TestController(unittest.TestCase): map3 = {'0.0.0.0': 'quux'} response = await controller.map_address(map3) self.assertEquals(len(response), 1) - addr1, target = list(response.items())[0] + addr1, target = list(response.mapped.items())[0] self.assertTrue('%s did not start with 127.' % addr1, addr1.startswith('127.')) self.assertEquals('quux', target) @@ -1239,7 +1239,7 @@ class TestController(unittest.TestCase): map4 = {'::': 'quibble'} response = await controller.map_address(map4) self.assertEquals(1, len(response)) - addr2, target = list(response.items())[0] + addr2, target = list(response.mapped.items())[0] self.assertTrue(addr2.startswith('[fe'), '%s did not start with [fe.' % addr2) self.assertEquals('quibble', target) @@ -1285,6 +1285,22 @@ class TestController(unittest.TestCase): await controller.map_address(dict([(addr, None) for addr in mapped_addresses])) self.assertEquals({}, await address_mappings('control')) + @test.require.controller + @async_test + async def test_mapaddress_mixed_response(self): + runner = test.runner.get_runner() + + async with await runner.get_tor_controller() as controller: + # mix a valid and invalid mapping + + response = await controller.map_address({ + '1.2.1.2': 'ifconfig.me', + 'foo': '@@@', + }) + + self.assertEqual({'1.2.1.2': 'ifconfig.me'}, response.mapped) + self.assertEqual(["syntax error: invalid address '@@@'"], response.failures) + @test.require.controller @test.require.online @async_test diff --git a/test/unit/response/mapaddress.py b/test/unit/response/mapaddress.py index 7482507d..177ce95c 100644 --- a/test/unit/response/mapaddress.py +++ b/test/unit/response/mapaddress.py @@ -35,7 +35,7 @@ class TestMapAddressResponse(unittest.TestCase): """ control_message = ControlMessage.from_str('250 foo=bar\r\n', 'MAPADDRESS') - self.assertEqual({'foo': 'bar'}, control_message.entries) + self.assertEqual({'foo': 'bar'}, control_message.mapped) def test_batch_response(self): """ @@ -50,7 +50,7 @@ class TestMapAddressResponse(unittest.TestCase): } control_message = ControlMessage.from_str(BATCH_RESPONSE, 'MAPADDRESS', normalize = True) - self.assertEqual(expected, control_message.entries) + self.assertEqual(expected, control_message.mapped) def test_invalid_requests(self): """ @@ -61,7 +61,7 @@ class TestMapAddressResponse(unittest.TestCase): self.assertRaises(stem.InvalidRequest, stem.response.convert, 'MAPADDRESS', control_message) control_message = ControlMessage.from_str(PARTIAL_FAILURE_RESPONSE, 'MAPADDRESS', normalize = True) - self.assertEqual({'23': '324'}, control_message.entries) + self.assertEqual({'23': '324'}, control_message.mapped) def test_invalid_response(self): """

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 15 Aug '20

15 Aug '20

commit fc6bd601462a44568289444db3767baf8cc94e44 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 15 21:48:06 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ar.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contents+ar.po b/contents+ar.po index 06616294ec..eed991c5f1 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -10449,6 +10449,8 @@ msgid "" "The Tor Project maintains its own [RPM package " "repository](https://rpm.torproject.org) for CentOS and RHEL and Fedora." msgstr "" +"يحتفظ مشروع Tor بـ [مستودع حزم RPM] الخاص به (https://rpm.torproject.org) لـ" +" CentOS و RHEL و Fedora." #: https//support.torproject.org/rpm/tor-rpm-install/ #: (content/rpm/install/contents+en.lrquestion.description)

1 0

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 15 Aug '20

15 Aug '20

commit d4f3cd9ec5f757922ef6151e6402fcad3546f1fe Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 15 21:45:11 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/contents+es.po b/contents+es.po index 540ed1db27..fc08e9a669 100644 --- a/contents+es.po +++ b/contents+es.po @@ -9857,39 +9857,42 @@ msgid "" "talk to `tor` over the loopback interface - do not forget to whitelist the " "**ExtORPort**." msgstr "" +"* ¿Estás usando un cortafuegos con tu NetBSD? Si es así, asegúrate que " +"`obfs4proxy` pueda hablar con `tor` a través del interfaz loopback - no " +"olvides pones en la lista blanca al **ExtORPort**." #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) msgid "### 3. Start `tor`:" -msgstr "" +msgstr "### 3. Inicia `tor`:" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) #: https//community.torproject.org/relay/setup/guard/netbsd/ #: (content/relay-operations/technical-setup/guard/netbsd/contents+en.lrpage.body) msgid "ln -sf /usr/pkg/share/examples/rc.d/tor /etc/rc.d/tor" -msgstr "" +msgstr "ln -sf /usr/pkg/share/examples/rc.d/tor /etc/rc.d/tor" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) #: https//community.torproject.org/relay/setup/guard/netbsd/ #: (content/relay-operations/technical-setup/guard/netbsd/contents+en.lrpage.body) msgid "echo \"tor=YES\" >> /etc/rc.conf" -msgstr "" +msgstr "echo \"tor=YES\" >> /etc/rc.conf" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) #: https//community.torproject.org/relay/setup/guard/netbsd/ #: (content/relay-operations/technical-setup/guard/netbsd/contents+en.lrpage.body) msgid "/etc/rc.d/tor start" -msgstr "" +msgstr "/etc/rc.d/tor start" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) #: https//community.torproject.org/relay/setup/bridge/docker/ #: (content/relay-operations/technical-setup/bridge/docker/contents+en.lrpage.body) msgid "### 4. Monitor your logs" -msgstr "" +msgstr "### 4. Monitorea tus registros" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) @@ -9901,11 +9904,13 @@ msgid "" "To confirm your bridge is running with no issues, you should see something " "like this:" msgstr "" +"Para confirmar que tu puente está corriendo sin problemas, debieras ver algo" +" como esto:" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) msgid "tail /var/log/messages" -msgstr "" +msgstr "tail /var/log/messages" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) @@ -9925,6 +9930,8 @@ msgid "" "[notice] Your Tor server's identity key fingerprint is '<NICKNAME> " "<FINGERPRINT>'" msgstr "" +"[notice] Your Tor server's identity key fingerprint is '<NICKNAME> " +"<FINGERPRINT>'" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) @@ -9944,6 +9951,8 @@ msgid "" "[notice] Your Tor bridge's hashed identity key fingerprint is '<NICKNAME> " "<HASHED FINGERPRINT>'" msgstr "" +"[notice] Your Tor bridge's hashed identity key fingerprint is '<NICKNAME> " +"<HASHED FINGERPRINT>'" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) @@ -9960,7 +9969,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/openbsd/ #: (content/relay-operations/technical-setup/bridge/openbsd/contents+en.lrpage.body) msgid "[notice] Registered server transport 'obfs4' at '[::]:46396'" -msgstr "" +msgstr "[notice] Registered server transport 'obfs4' at '[::]:46396'" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) @@ -9980,6 +9989,8 @@ msgid "" "[notice] Tor has successfully opened a circuit. Looks like client " "functionality is working." msgstr "" +"[notice] Tor has successfully opened a circuit. Looks like client " +"functionality is working." #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) @@ -9996,7 +10007,7 @@ msgstr "" #: https//community.torproject.org/relay/setup/bridge/openbsd/ #: (content/relay-operations/technical-setup/bridge/openbsd/contents+en.lrpage.body) msgid "[notice] Bootstrapped 100%: Done" -msgstr "" +msgstr "[notice] Bootstrapped 100%: Done" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) @@ -10016,6 +10027,8 @@ msgid "" "[notice] Now checking whether ORPort <redacted>:3818 is reachable... (this " "may take up to 20 minutes -- look for log messages indicating success)" msgstr "" +"[notice] Now checking whether ORPort <redacted>:3818 is reachable... (this " +"may take up to 20 minutes -- look for log messages indicating success)" #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body) @@ -10035,6 +10048,8 @@ msgid "" "[notice] Self-testing indicates your ORPort is reachable from the outside. " "Excellent. Publishing server descriptor." msgstr "" +"[notice] Self-testing indicates your ORPort is reachable from the outside. " +"Excellent. Publishing server descriptor." #: https//community.torproject.org/relay/setup/bridge/netbsd/ #: (content/relay-operations/technical-setup/bridge/netbsd/contents+en.lrpage.body)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2020