December 2012 - tor-commits - lists.torproject.org

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

23 Dec '12

commit 37f74b7e582d298df7e89f6ce7ff20e3e09d657a Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 23 00:45:23 2012 +0000 Update translations for vidalia_alpha --- es/vidalia_es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 6e64a7b..813dd09 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-23 00:11+0000\n" +"PO-Revision-Date: 2012-12-23 00:17+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" @@ -1811,7 +1811,7 @@ msgctxt "MainWindow" msgid "" "Vidalia was unable to start Tor. Check your settings to ensure the correct " "name and location of your Tor executable is specified." -msgstr "Vidalia no pudo iniciar Tor. Verifique sus preferencias para asegurar que estén especificados el nombre correcto y la ubicación de su ejecutable Tor." +msgstr "Vidalia no pudo iniciar Tor. Revise sus preferencias para asegurarse de que están especificados el nombre y la ubicación correctos de su ejecutable Tor." msgctxt "MainWindow" msgid "Connecting to Tor"

1 0

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

23 Dec '12

commit c39627417f91977e7176535bec4dc4fde0b21f2b Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 23 00:45:20 2012 +0000 Update translations for vidalia_completed --- es/vidalia_es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 6b8e051..4dd8e7a 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-23 00:14+0000\n" +"PO-Revision-Date: 2012-12-23 00:18+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" @@ -1845,7 +1845,7 @@ msgctxt "MainWindow" msgid "" "Vidalia was unable to start Tor. Check your settings to ensure the correct " "name and location of your Tor executable is specified." -msgstr "Vidalia no pudo iniciar Tor. Compruebe su configuración para cerciorarse de que incluyen el nombre correcto y la ubicación de su ejecutable Tor." +msgstr "Vidalia no pudo iniciar Tor. Revise sus preferencias para asegurarse de que están especificados el nombre y la ubicación correctos de su ejecutable Tor." msgctxt "MainWindow" msgid "Connecting to Tor"

1 0

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

23 Dec '12

commit 3578193b8ba3ae7fc47968fc1f326f74de0bd73e Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 23 00:45:15 2012 +0000 Update translations for vidalia --- es/vidalia_es.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/vidalia_es.po b/es/vidalia_es.po index 6b8e051..4dd8e7a 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-23 00:14+0000\n" +"PO-Revision-Date: 2012-12-23 00:18+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" @@ -1845,7 +1845,7 @@ msgctxt "MainWindow" msgid "" "Vidalia was unable to start Tor. Check your settings to ensure the correct " "name and location of your Tor executable is specified." -msgstr "Vidalia no pudo iniciar Tor. Compruebe su configuración para cerciorarse de que incluyen el nombre correcto y la ubicación de su ejecutable Tor." +msgstr "Vidalia no pudo iniciar Tor. Revise sus preferencias para asegurarse de que están especificados el nombre y la ubicación correctos de su ejecutable Tor." msgctxt "MainWindow" msgid "Connecting to Tor"

1 0

[stem/master] Add exception classes to test.network module
by atagar＠torproject.org 23 Dec '12

23 Dec '12

commit bf6651aa0121e51e938e87608a4df69c0e80c917 Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Mon Dec 17 19:20:23 2012 -0700 Add exception classes to test.network module Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/network.py | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/test/network.py b/test/network.py index 1c9be61..72bfca7 100644 --- a/test/network.py +++ b/test/network.py @@ -1,5 +1,41 @@ """ Helper functions and classes to support tests which need to connect through the tor network. + +:: + + ProxyError - Base error for proxy issues. + +- SocksError - Reports problems returned by the SOCKS proxy. """ +class ProxyError(Exception): + """ Base error for proxy issues. """ + +class SocksError(ProxyError): + """ + Exception raised for any problems returned by the SOCKS proxy. + + :var int code: error code returned by the SOCKS proxy + """ + + # Error messages copied from http://en.wikipedia.org/wiki/SOCKS, + # retrieved 2012-12-15 17:09:21. + _ERROR_MESSAGE = { + 0x01: "general failure", + 0x02: "connection not allowed by ruleset", + 0x03: "network unreachable", + 0x04: "host unreachable", + 0x05: "connection refused by destination host", + 0x06: "TTL expired", + 0x07: "command not supported / protocol error", + 0x08: "address type not supported", + } + + def __init__(self, code): + self.code = code + + def __str__(self): + code = 0x01 + if self.code in self._ERROR_MESSAGE: + code = self.code + return "[%s] %s" % (code, self._ERROR_MESSAGE[code])

1 0

[stem/master] Add Socks class to handle a socket connection through a SOCKS5 proxy
by atagar＠torproject.org 23 Dec '12

23 Dec '12

commit 4485657e3840f0ea9d9fc96623dd7f50a476a79d Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Mon Dec 17 20:02:22 2012 -0700 Add Socks class to handle a socket connection through a SOCKS5 proxy I attempted to keep this generic and open enough that IPV6 support can be easily added at a later date. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/network.py | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 172 insertions(+), 0 deletions(-) diff --git a/test/network.py b/test/network.py index 72bfca7..6ab17f5 100644 --- a/test/network.py +++ b/test/network.py @@ -6,8 +6,20 @@ the tor network. ProxyError - Base error for proxy issues. +- SocksError - Reports problems returned by the SOCKS proxy. + + Socks - Communicate through a SOCKS5 proxy with a socket interface """ +import socket +import struct + +import stem.util.connection + +SOCKS5_NOAUTH_GREETING = (0x05, 0x01, 0x00) +SOCKS5_NOAUTH_RESPONSE = (0x05, 0x00) +SOCKS5_CONN_BY_IPV4 = (0x05, 0x01, 0x00, 0x01) +SOCKS5_CONN_BY_NAME = (0x05, 0x01, 0x00, 0x03) + class ProxyError(Exception): """ Base error for proxy issues. """ @@ -39,3 +51,163 @@ class SocksError(ProxyError): if self.code in self._ERROR_MESSAGE: code = self.code return "[%s] %s" % (code, self._ERROR_MESSAGE[code]) + +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. + + This class supports the context manager protocol. When used this way, the + socket will automatically close when leaving the context. An example: + + :: + + from test.network import Socks + + with Socks(('127.0.0.1', 9050)) as socks: + socks.settimeout(2) + socks.connect(('www.torproject.org', 443)) + """ + + def __init__(self, proxy_addr, family = socket.AF_INET, + type_ = socket.SOCK_STREAM, proto = 0, _sock = None): + """ + Creates a SOCKS5-aware socket which will route connections through the + proxy_addr SOCKS5 proxy. Currently, only IPv4 TCP connections are + supported, so the defaults for family and type_ are your best option. + + :param tuple proxy_addr: address of the SOCKS5 proxy, for IPv4 this + contains (host, port) + :param int family: address family of the socket + :param int type_: address type of the socket (see **socket.socket** for + more information about family and type_) + + :returns: :class:`~test.network.Socks` + """ + + _socket_socket.__init__(self, family, type_, proto, _sock) + self._proxy_addr = proxy_addr + + def __enter__(self, *args, **kwargs): + return self + + def __exit__(self, exit_type, value, traceback): + self.close() + return False + + def _recvall(self, expected_size): + """ + Returns expected number bytes from the socket, or dies trying. + + :param int expected_size: number of bytes to return + + :returns: + * **str** in Python 2 (bytes is str) + * **bytes** in Python 3 + + :raises: + * :class:`socket.error` for socket errors + * :class:`test.SocksError` if the received data was more that expected + """ + + while True: + response = self.recv(expected_size * 2) + + if len(response) == 0: + raise socket.error("socket closed unexpectedly?") + elif len(response) == expected_size: + return response + elif len(response) > expected_size: + raise SocksError(0x01) + + def _ints_to_bytes(self, integers): + """ + Returns a byte string converted from integers. + + :param list integers: list of ints to convert + + :returns: + * **str** in Python 2 (bytes is str) + * **bytes** in Python 3 + """ + + if bytes is str: + bytes_ = ''.join([chr(x) for x in integers]) # Python 2 + else: + bytes_ = bytes(integers) # Python 3 + return bytes_ + + def _bytes_to_ints(self, bytes_): + """ + Returns a tuple of integers converted from a string (Python 2) or + bytes (Python 3). + + :param str,bytes bytes_: byte string to convert + + :returns: **list** of ints + """ + + try: + integers = [ord(x) for x in bytes_] # Python 2 + except TypeError: + integers = [x for x in bytes_] # Python 3 + return tuple(integers) + + def _pack_string(self, string_): + """ + Returns a packed string for sending over a socket. + + :param str string_: string to convert + + :returns: + * **str** in Python 2 (bytes is str) + * **bytes** in Python 3 + """ + + try: + return struct.pack(">%ss" % len(string_), string_) + except struct.error: + # Python 3: encode str to bytes + return struct.pack(">%ss" % len(string_), string_.encode()) + + def connect(self, address): + + """ + Establishes a connection to address through the SOCKS5 proxy. + + :param tuple address: target address, for IPv4 this contains + (host, port) + + :raises: :class:`test.SocksError` for any errors + """ + + 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)) + if response != SOCKS5_NOAUTH_RESPONSE: + raise SocksError(0x01) + + if stem.util.connection.is_valid_ip_address(address[0]): + header = self._ints_to_bytes(SOCKS5_CONN_BY_IPV4) + header = header + socket.inet_aton(address[0]) + else: + # As a last gasp, try connecting by name + header = self._ints_to_bytes(SOCKS5_CONN_BY_NAME) + header = header + self._ints_to_bytes([len(address[0])]) + header = header + self._pack_string(address[0]) + + header = header + struct.pack(">H", address[1]) + self.sendall(header) + response = self._bytes_to_ints(self._recvall(10)) + # check the status byte + if response[1] != 0x00: + raise SocksError(response[1]) + + def connect_ex(self, address): + """ + Not Implemented. + """ + + raise NotImplementedError +

1 0

[stem/master] Add a new module to test to support network connections through tor
by atagar＠torproject.org 23 Dec '12

23 Dec '12

commit ef0cee8123578ed8ace0e3304735eb683dc6ca5e Author: Sean Robinson <seankrobinson(a)gmail.com> Date: Mon Dec 17 19:12:37 2012 -0700 Add a new module to test to support network connections through tor This module aims to provide basic connectivity options on which tests may be built. Signed-off-by: Sean Robinson <seankrobinson(a)gmail.com> --- test/network.py | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/test/network.py b/test/network.py new file mode 100644 index 0000000..1c9be61 --- /dev/null +++ b/test/network.py @@ -0,0 +1,5 @@ +""" +Helper functions and classes to support tests which need to connect through +the tor network. +""" +

1 0

[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