- tor-commits - lists.torproject.org

[stem/master] Utility to test client usage in integ tests
by atagar＠torproject.org 23 Dec '12

23 Dec '12

commit 0c4cb6d69e1b47faad757402fb666d6310252c09 Merge: cfc745e 8aba54d Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 22 16:29:51 2012 -0800 Utility to test client usage in integ tests Utility class to make it easy to use the tor instance that we have for testing for client traffic... https://trac.torproject.org/7693 test/__init__.py | 1 + test/network.py | 248 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 249 insertions(+), 0 deletions(-)

1 0

[stem/master] Dropping test.network.Socks interlink
by atagar＠torproject.org 23 Dec '12

23 Dec '12

commit 8aba54d53bc2738ecea503ec09e71a32edb5cc0a Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Dec 22 16:27:32 2012 -0800 Dropping test.network.Socks interlink The ":class: `~test.network.Socks`" had a couple issues... * there's a space between the :class: and back-tic (not sure if that's a problem for sphinx, but definitely different) * we can't use things like :class: within the preformatted text block --- test/network.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/network.py b/test/network.py index 6f81e9d..ea15de7 100644 --- a/test/network.py +++ b/test/network.py @@ -9,7 +9,7 @@ the tor network. Socks - Communicate through a SOCKS5 proxy with a socket interface - SocksPatch - Force socket-using code to use :class: `~test.network.Socks` + SocksPatch - Force socket-using code to use test.network.Socks """ import functools

1 0

[stem/master] Advertise network module inside test
by atagar＠torproject.org 23 Dec '12

23 Dec '12

commit 31cbbbad01230b26722c7524617518f2228e55f1 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Tue Dec 18 06:21:13 2012 -0700 Advertise network module inside test Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/__init__.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/test/__init__.py b/test/__init__.py index e7add66..2f35bf7 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -5,6 +5,7 @@ Unit and integration tests for the stem library. __all__ = [ "check_whitespace", "mocking", + "network", "output", "prompt", "runner",

1 0

[stem/master] Add SocksPatch to socksify network-using Python code
by atagar＠torproject.org 23 Dec '12

23 Dec '12

commit 270f173deddd2e3dded794d23306f1f32b78d400 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Mon Dec 17 20:03:29 2012 -0700 Add SocksPatch to socksify network-using Python code A context manager which helps re-direct network socket traffic, from existing code, through the tor process. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/network.py | 39 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 37 insertions(+), 2 deletions(-) diff --git a/test/network.py b/test/network.py index 6ab17f5..6f81e9d 100644 --- a/test/network.py +++ b/test/network.py @@ -8,13 +8,20 @@ the tor network. +- SocksError - Reports problems returned by the SOCKS proxy. Socks - Communicate through a SOCKS5 proxy with a socket interface + + SocksPatch - Force socket-using code to use :class: `~test.network.Socks` """ +import functools import socket import struct import stem.util.connection +# Store a reference to the original class so we can find it after +# monkey patching. +_socket_socket = socket.socket + SOCKS5_NOAUTH_GREETING = (0x05, 0x01, 0x00) SOCKS5_NOAUTH_RESPONSE = (0x05, 0x00) SOCKS5_CONN_BY_IPV4 = (0x05, 0x01, 0x00, 0x01) @@ -52,7 +59,7 @@ class SocksError(ProxyError): code = self.code return "[%s] %s" % (code, self._ERROR_MESSAGE[code]) -class Socks(socket.socket): +class Socks(_socket_socket): """ A **socket.socket**-like interface through a SOCKS5 proxy connection. Tor does not support proxy authentication, so neither does this class. @@ -181,7 +188,7 @@ class Socks(socket.socket): :raises: :class:`test.SocksError` for any errors """ - socket.socket.connect(self, (self._proxy_addr[0], self._proxy_addr[1])) + _socket_socket.connect(self, (self._proxy_addr[0], self._proxy_addr[1])) # ask for non-authenticated connection self.sendall(self._ints_to_bytes(SOCKS5_NOAUTH_GREETING)) response = self._bytes_to_ints(self._recvall(2)) @@ -211,3 +218,31 @@ class Socks(socket.socket): raise NotImplementedError +class SocksPatch(object): + """ + Monkey-patch **socket.socket** to use :class:`~test.network.Socks`, instead. + Classes in the patched context (e.g. urllib.urlopen in the example below) + do not use the SOCKS5 proxy for domain name resolution and such information + may be leaked. + + :: + + import urllib + from test.network import SocksPatch + + with SocksPatch(('127.0.0.1', 9050)): + with urllib.urlopen("https://www.torproject.org") as f: + for line in f.readline(): + print line + """ + + def __init__(self, *args, **kwargs): + self._partial = functools.partial(Socks, *args, **kwargs) + + def __enter__(self): + socket.socket = self._partial + return self + + def __exit__(self, exit_type, value, traceback): + socket.socket = _socket_socket +

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 23 Dec '12

23 Dec '12

commit 0cdbf220d7fa46a04bb36d574a71d30726c09914 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 23 00:15:26 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 9d119b8..6e64a7b 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-12-22 22:32+0000\n" +"PO-Revision-Date: 2012-12-23 00:11+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -1749,7 +1749,7 @@ msgstr "¡Conectado a la red Tor!" msgctxt "MainWindow" msgid "miscellaneous" -msgstr "Miscelanea" +msgstr "miscelánea" msgctxt "MainWindow" msgid "identity mismatch" @@ -1773,7 +1773,7 @@ msgstr "error de lectura/escritura" msgctxt "MainWindow" msgid "no route to host" -msgstr "no hay ruta hacia el anfitrión (host)" +msgstr "no hay ruta hacia el servidor (host)" msgctxt "MainWindow" msgid "insufficient resources"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 23 Dec '12

23 Dec '12

commit a8088fcb83314a8279202430de87bdc97df66188 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 23 00:15:23 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 9d119b8..6e64a7b 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-12-22 22:32+0000\n" +"PO-Revision-Date: 2012-12-23 00:11+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -1749,7 +1749,7 @@ msgstr "¡Conectado a la red Tor!" msgctxt "MainWindow" msgid "miscellaneous" -msgstr "Miscelanea" +msgstr "miscelánea" msgctxt "MainWindow" msgid "identity mismatch" @@ -1773,7 +1773,7 @@ msgstr "error de lectura/escritura" msgctxt "MainWindow" msgid "no route to host" -msgstr "no hay ruta hacia el anfitrión (host)" +msgstr "no hay ruta hacia el servidor (host)" msgctxt "MainWindow" msgid "insufficient resources"

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 23 Dec '12

23 Dec '12

commit 840d7553c6c082ab36dd5353c516e21cf4aa5f3f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 23 00:15:21 2012 +0000 Update translations for vidalia_completed --- es/vidalia_es.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 37c6fb6..6b8e051 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-12-22 22:30+0000\n" +"PO-Revision-Date: 2012-12-23 00:14+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -1771,7 +1771,7 @@ msgstr "Conectando a la red Tor" msgctxt "MainWindow" msgid "Establishing a Tor circuit" -msgstr "Estableciendo un circuito Tor" +msgstr "Estableciendo un circuito a través de Tor" msgctxt "MainWindow" msgid "Connected to the Tor network!" @@ -1783,7 +1783,7 @@ msgstr "miscelánea" msgctxt "MainWindow" msgid "identity mismatch" -msgstr "no hay coincidencia de identidad" +msgstr "las identidades no coinciden" msgctxt "MainWindow" msgid "done" @@ -1799,11 +1799,11 @@ msgstr "tiempo de espera de conexión agotado" msgctxt "MainWindow" msgid "read/write error" -msgstr "error de escritura/lectura" +msgstr "error de lectura/escritura" msgctxt "MainWindow" msgid "no route to host" -msgstr "no hay ruta hacia el host" +msgstr "no hay ruta hacia el servidor (host)" msgctxt "MainWindow" msgid "insufficient resources"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 23 Dec '12

23 Dec '12

commit d6a866e78962208575a87ab768db6bbbf193284c Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 23 00:15:15 2012 +0000 Update translations for vidalia --- es/vidalia_es.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 37c6fb6..6b8e051 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-12-22 22:30+0000\n" +"PO-Revision-Date: 2012-12-23 00:14+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -1771,7 +1771,7 @@ msgstr "Conectando a la red Tor" msgctxt "MainWindow" msgid "Establishing a Tor circuit" -msgstr "Estableciendo un circuito Tor" +msgstr "Estableciendo un circuito a través de Tor" msgctxt "MainWindow" msgid "Connected to the Tor network!" @@ -1783,7 +1783,7 @@ msgstr "miscelánea" msgctxt "MainWindow" msgid "identity mismatch" -msgstr "no hay coincidencia de identidad" +msgstr "las identidades no coinciden" msgctxt "MainWindow" msgid "done" @@ -1799,11 +1799,11 @@ msgstr "tiempo de espera de conexión agotado" msgctxt "MainWindow" msgid "read/write error" -msgstr "error de escritura/lectura" +msgstr "error de lectura/escritura" msgctxt "MainWindow" msgid "no route to host" -msgstr "no hay ruta hacia el host" +msgstr "no hay ruta hacia el servidor (host)" msgctxt "MainWindow" msgid "insufficient resources"

1 0

[translation/vidalia_alpha_completed] Update translations for vidalia_alpha_completed
by translation＠torproject.org 22 Dec '12

22 Dec '12

commit 5521a0ac3c166593d7063f949427400371526653 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 22 22:45:23 2012 +0000 Update translations for vidalia_alpha_completed --- es/vidalia_es.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 7eebed4..9d119b8 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-12-22 19:37+0000\n" +"PO-Revision-Date: 2012-12-22 22:32+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -1725,11 +1725,11 @@ msgstr "Cargando el estado de la red" msgctxt "MainWindow" msgid "Loading authority certificates" -msgstr "Cargando los certificados de autoridad (de red Tor)" +msgstr "Cargando los certificados de autoridades" msgctxt "MainWindow" msgid "Requesting relay information" -msgstr "Solicitando información del repetidor (relay)" +msgstr "Solicitando información del repetidor" msgctxt "MainWindow" msgid "Loading relay information"

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 22 Dec '12

22 Dec '12

commit 340a921de8663ea0630e7e064429d8000bfd1280 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Dec 22 22:45:20 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 7eebed4..9d119b8 100644 --- a/es/vidalia_es.po +++ b/es/vidalia_es.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-12-22 19:37+0000\n" +"PO-Revision-Date: 2012-12-22 22:32+0000\n" "Last-Translator: strel <strelnic(a)gmail.com>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n" "MIME-Version: 1.0\n" @@ -1725,11 +1725,11 @@ msgstr "Cargando el estado de la red" msgctxt "MainWindow" msgid "Loading authority certificates" -msgstr "Cargando los certificados de autoridad (de red Tor)" +msgstr "Cargando los certificados de autoridades" msgctxt "MainWindow" msgid "Requesting relay information" -msgstr "Solicitando información del repetidor (relay)" +msgstr "Solicitando información del repetidor" msgctxt "MainWindow" msgid "Loading relay information"

1 0