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

[stem/master] Adding a method for MAPADDRESS
by atagar＠torproject.org 24 Sep '12

24 Sep '12

commit 66dea047a651d595b755c754d84250cd1dd687ac Merge: 56a06b6 5a0da76 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 24 09:01:38 2012 -0700 Adding a method for MAPADDRESS Method to map address aliases. cr atagar (https://trac.torproject.org/6951) run_tests.py | 2 + stem/control.py | 26 ++++++++++++ stem/response/__init__.py | 16 +++++-- stem/response/mapaddress.py | 39 ++++++++++++++++++ stem/util/conf.py | 2 +- test/__init__.py | 1 + test/integ/control/controller.py | 26 ++++++++++++ test/runner.py | 2 +- test/unit/response/mapaddress.py | 83 ++++++++++++++++++++++++++++++++++++++ test/util.py | 66 ++++++++++++++++++++++++++++++ 10 files changed, 256 insertions(+), 7 deletions(-)

1 0

[stem/master] Fixing a bunch of things after cr #6951
by atagar＠torproject.org 24 Sep '12

24 Sep '12

commit ddf7aa7a21bfc8418488b27e05fa7e53ef4f514c Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Mon Sep 24 20:16:18 2012 +0530 Fixing a bunch of things after cr #6951 https://trac.torproject.org/projects/tor/ticket/6951 --- stem/control.py | 3 +- stem/response/mapaddress.py | 9 +++-- test/integ/control/controller.py | 8 +++- test/runner.py | 2 +- test/settings.cfg | 1 - test/unit/response/mapaddress.py | 3 +- test/util.py | 66 ++++++++++++++++++++++++++++++++++++++ test/utils.py | 61 ----------------------------------- 8 files changed, 82 insertions(+), 71 deletions(-) diff --git a/stem/control.py b/stem/control.py index 8b407cb..a5a7868 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1148,7 +1148,8 @@ class Controller(BaseController): :returns: dictionary with original -> replacement address mappings """ - response = self.msg("MAPADDRESS %s" % " ".join([k + "=" + mapping[k] for k in mapping.iterkeys()])) + mapaddress_arg = " ".join(["%s=%s" % (k, v) for (k, v) in mapping.items()]) + response = self.msg("MAPADDRESS %s" % mapaddress_arg) stem.response.convert("MAPADDRESS", response) return response.entries diff --git a/stem/response/mapaddress.py b/stem/response/mapaddress.py index 2d1a498..d4e33de 100644 --- a/stem/response/mapaddress.py +++ b/stem/response/mapaddress.py @@ -31,8 +31,9 @@ class MapAddressResponse(stem.response.ControlMessage): for code, _, message in self.content(): if code == "250": - try: key, value = message.split("=", 1) - except ValueError: raise stem.socket.ProtocolError(None, "Not a mapping") - - self.entries[key] = value + try: + key, value = message.split("=", 1) + self.entries[key] = value + except ValueError: + raise stem.socket.ProtocolError(None, "MAPADDRESS returned '%s', which isn't a mapping" % message) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index f8fd56e..2af68c3 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -409,6 +409,7 @@ class TestController(unittest.TestCase): def test_mapaddress(self): if test.runner.require_control(self): return + elif test.runner.require_online(self): return runner = test.runner.get_runner() @@ -418,9 +419,12 @@ class TestController(unittest.TestCase): s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) s.connect(('127.0.0.1', int(controller.get_conf('SocksPort')))) test.utils.negotiate_socks(s, '1.2.1.2', 80) - s.sendall(test.utils.ip_request) + s.sendall(test.utils.ip_request) # make the http request for the ip address response = s.recv(1000) + + # 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("\r\n\r\n"):].strip() - socket.inet_aton(ip_addr) # validate IP + stem.util.connection.is_valid_ip_address(ip_addr) diff --git a/test/runner.py b/test/runner.py index b748bfe..a372c42 100644 --- a/test/runner.py +++ b/test/runner.py @@ -69,7 +69,7 @@ ERROR_ATTR = (term.Color.RED, term.Attr.BOLD) BASE_TORRC = """# configuration for stem integration tests DataDirectory %s -SocksPort 29327 +SocksPort 1112 DownloadExtraInfo 1 """ diff --git a/test/settings.cfg b/test/settings.cfg index 75d5078..44e28ab 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -76,7 +76,6 @@ target.prereq RUN_PTRACE => TORRC_DISABLE_DEBUGGER_ATTACHMENT # means that each of these targets will have a dedicated integration test run. target.torrc RUN_NONE => -target.torrc ONLINE => PORT target.torrc RUN_OPEN => PORT target.torrc RUN_PASSWORD => PORT, PASSWORD target.torrc RUN_COOKIE => PORT, COOKIE diff --git a/test/unit/response/mapaddress.py b/test/unit/response/mapaddress.py index b8045c1..3c2a372 100644 --- a/test/unit/response/mapaddress.py +++ b/test/unit/response/mapaddress.py @@ -62,8 +62,8 @@ class TestMapAddressResponse(unittest.TestCase): control_message = mocking.get_message(UNRECOGNIZED_KEYS_RESPONSE) self.assertRaises(stem.socket.InvalidRequest, stem.response.convert, "MAPADDRESS", control_message) - control_message = mocking.get_message(UNRECOGNIZED_KEYS_RESPONSE) expected = { "23": "324" } + control_message = mocking.get_message(PARTIAL_FAILURE_RESPONSE) stem.response.convert("MAPADDRESS", control_message) self.assertEqual(expected, control_message.entries) @@ -77,6 +77,7 @@ class TestMapAddressResponse(unittest.TestCase): control_message = mocking.get_message(INVALID_EMPTY_RESPONSE) self.assertRaises(stem.socket.ProtocolError, stem.response.convert, "MAPADDRESS", control_message) + control_message = mocking.get_message(INVALID_RESPONSE) self.assertRaises(stem.socket.ProtocolError, stem.response.convert, "MAPADDRESS", control_message) diff --git a/test/util.py b/test/util.py new file mode 100644 index 0000000..51e9bd9 --- /dev/null +++ b/test/util.py @@ -0,0 +1,66 @@ +import struct +import socket + +from stem.socket import ProtocolError +import test.runner + +error_msgs = { + 0x5a: "SOCKS4A request granted", + 0x5b: "SOCKS4A request rejected or failed", + 0x5c: "SOCKS4A request failed because client is not running identd (or not reachable from the server)", + 0x5d: "SOCKS4A request failed because client's identd could not confirm the user ID string in the request", +} + +ip_request = """GET /ip HTTP/1.0 +Host: ifconfig.me +Accept-Encoding: identity + +""" + +def external_ip(sock): + """ + Returns the externally visible IP address when using a SOCKS4a proxy. + Negotiates the socks connection, connects to ipconfig.me and requests + http://ifconfig.me/ip to find out the externally visible IP. + + :param socket sock: socket connected to a SOCKS4a proxy server + + :returns: externally visible IP address, or None if it isn't able to + """ + + try: + negotiate_socks(sock, "ifconfig.me", 80) + s.sendall(req) + response = s.recv(1000) + + # 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' + return response[response.find("\r\n\r\n"):].strip() + except: + pass + +def negotiate_socks(sock, host, port): + """ + Negotiate with a socks4a server. Closes the socket and raises an exception on + failure. + + :param socket sock: socket connected to socks4a server + :param str host: host to connect to + :param int port: port to connect to + + :raises: :class:`stem.socket.ProtocolError` if the socks server doesn't grant our request + + :returns: a list with the IP address and the port that the proxy connected to + """ + + # SOCKS4a request here - http://en.wikipedia.org/wiki/SOCKS#Protocol + request = "\x04\x01" + struct.pack("!H", port) + "\x00\x00\x00\x01" + "\x00" + host + "\x00" + sock.sendall(request) + response = sock.recv(8) + + if len(response) != 8 or response[0] != "\x00" or response[1] != "\x5a": + sock.close() + raise ProtocolError(error_msgs.get(response[1], "SOCKS server returned unrecognized error code")) + + return [socket.inet_ntoa(response[4:]), struct.unpack("!H", response[2:4])[0]] + diff --git a/test/utils.py b/test/utils.py deleted file mode 100644 index 8ed9297..0000000 --- a/test/utils.py +++ /dev/null @@ -1,61 +0,0 @@ -import struct -import socket - -from stem.socket import ProtocolError -import test.runner - -error_msgs = { - 0x5a: "SOCKS4A request granted", - 0x5b: "SOCKS4A request rejected or failed", - 0x5c: "SOCKS4A request failed because client is not running identd (or not reachable from the server)", - 0x5d: "SOCKS4A request failed because client's identd could not confirm the user ID string in the request", -} - -ip_request = """GET /ip HTTP/1.0 -Host: ifconfig.me -Accept-Encoding: identity - -""" - -def external_ip(sock): - """ - Returns the externally visible IP address when using a SOCKS4a proxy. - - :param socket sock: socket connected to a SOCKS4a proxy server - - :returns: externally visible IP address, or None if it isn't able to - """ - - try: - negotiate_socks(sock, "ifconfig.me", 80) - s.sendall(req) - response = s.recv(1000) - - return response[response.find("\n\n"):].strip() - except: - pass - -def negotiate_socks(sock, host, port): - """ - Negotiate with a socks4a server. Closes the socket and raises an exception on - failure. - - :param socket sock: socket connected to socks4a server - :param str host: host to connect to - :param int port: port to connect to - - :raises: :class:`stem.socket.ProtocolError` if the socks server doesn't grant our request - - :returns: a list with the IP address and the port that the proxy connected to - """ - - request = "\x04\x01" + struct.pack("!H", port) + "\x00\x00\x00\x01" + "\x00" + host + "\x00" - sock.sendall(request) - response = sock.recv(8) - - if len(response) != 8 or response[0] != "\x00" or response[1] != "\x5a": - sock.close() - raise ProtocolError(error_msgs.get(response[1], "SOCKS server returned unrecognized error code")) - - return [socket.inet_ntoa(response[4:]), struct.unpack("!H", response[2:4])[0]] -

1 0

[stem/master] Implement Controller.map_address
by atagar＠torproject.org 24 Sep '12

24 Sep '12

commit 8e54f37f64ea04a0772d825276f4e5e4a34d4df2 Author: Ravi Chandra Padmala <neenaoffline(a)gmail.com> Date: Wed Sep 5 18:29:10 2012 +0530 Implement Controller.map_address --- run_tests.py | 2 + stem/control.py | 25 +++++++++++ stem/response/__init__.py | 16 +++++-- stem/response/mapaddress.py | 38 +++++++++++++++++ test/__init__.py | 1 + test/integ/control/controller.py | 22 ++++++++++ test/runner.py | 2 +- test/settings.cfg | 1 + test/unit/response/mapaddress.py | 82 ++++++++++++++++++++++++++++++++++++++ test/utils.py | 61 ++++++++++++++++++++++++++++ 10 files changed, 244 insertions(+), 6 deletions(-) diff --git a/run_tests.py b/run_tests.py index 4ad551a..b6ee64a 100755 --- a/run_tests.py +++ b/run_tests.py @@ -27,6 +27,7 @@ import test.unit.response.getconf import test.unit.response.protocolinfo import test.unit.response.authchallenge import test.unit.response.singleline +import test.unit.response.mapaddress import test.unit.util.conf import test.unit.util.connection import test.unit.util.enum @@ -120,6 +121,7 @@ UNIT_TESTS = ( test.unit.response.getinfo.TestGetInfoResponse, test.unit.response.getconf.TestGetConfResponse, test.unit.response.singleline.TestSingleLineResponse, + test.unit.response.mapaddress.TestMapAddressResponse, test.unit.response.protocolinfo.TestProtocolInfoResponse, test.unit.response.authchallenge.TestAuthChallengeResponse, test.unit.connection.authentication.TestAuthenticate, diff --git a/stem/control.py b/stem/control.py index a9df1ba..8b407cb 100644 --- a/stem/control.py +++ b/stem/control.py @@ -30,6 +30,7 @@ interacting at a higher level. |- new_circuit - create new circuits |- extend_circuit - create new circuits and extend existing ones |- repurpose_circuit - change a circuit's purpose + |- map_address - maps one address to another such that connections to the original are replaced with the other |- get_version - convenience method to get tor version |- authenticate - convenience method to authenticate the controller +- protocolinfo - convenience method to get the protocol info @@ -1127,6 +1128,30 @@ class Controller(BaseController): raise stem.socket.ProtocolError("EXTENDCIRCUIT returned unexpected response code: %s" % response.code) return int(new_circuit) + + def map_address(self, mapping): + """ + 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 + removed. + + :param dict mapping: mapping of original addresses to replacement addresses + + :raises: + * :class:`stem.socket.InvalidRequest` if the addresses are malformed + * :class:`stem.socket.OperationFailed` if Tor couldn't fulfill the request + + :returns: dictionary with original -> replacement address mappings + """ + + response = self.msg("MAPADDRESS %s" % " ".join([k + "=" + mapping[k] for k in mapping.iterkeys()])) + stem.response.convert("MAPADDRESS", response) + + return response.entries def _case_insensitive_lookup(entries, key, default = UNDEFINED): """ diff --git a/stem/response/__init__.py b/stem/response/__init__.py index 14a0280..4a05be2 100644 --- a/stem/response/__init__.py +++ b/stem/response/__init__.py @@ -60,11 +60,14 @@ def convert(response_type, message, **kwargs): * **\*** GETINFO * **\*** GETCONF + * **&** **^** MAPADDRESS * PROTOCOLINFO * AUTHCHALLENGE * SINGLELINE **\*** can raise a :class:`stem.socket.InvalidArguments` exception + **^** can raise a :class:`stem.socket.InvalidRequest` exception + **&** can raise a :class:`stem.socket.OperationFailed` exception :param str response_type: type of tor response to convert to :param stem.response.ControlMessage message: message to be converted @@ -73,6 +76,7 @@ def convert(response_type, message, **kwargs): :raises: * :class:`stem.socket.ProtocolError` the message isn't a proper response of that type * :class:`stem.socket.InvalidArguments` the arguments given as input are invalid + * :class:`stem.socket.InvalidRequest` the arguments given as input are invalid * TypeError if argument isn't a :class:`stem.response.ControlMessage` or response_type isn't supported """ @@ -80,6 +84,7 @@ def convert(response_type, message, **kwargs): import stem.response.getconf import stem.response.protocolinfo import stem.response.authchallenge + import stem.response.mapaddress if not isinstance(message, ControlMessage): raise TypeError("Only able to convert stem.response.ControlMessage instances") @@ -87,10 +92,11 @@ def convert(response_type, message, **kwargs): response_types = { "GETINFO": stem.response.getinfo.GetInfoResponse, "GETCONF": stem.response.getconf.GetConfResponse, + "MAPADDRESS": stem.response.mapaddress.MapAddressResponse, "SINGLELINE": SingleLineResponse, "PROTOCOLINFO": stem.response.protocolinfo.ProtocolInfoResponse, "AUTHCHALLENGE": stem.response.authchallenge.AuthChallengeResponse, - } + } try: response_class = response_types[response_type] @@ -116,15 +122,15 @@ class ControlMessage(object): def is_ok(self): """ - Checks if all of our lines have a 250 response. + Checks if any of our lines have a 250 response. - :returns: True if all lines have a 250 response code, False otherwise + :returns: True if any lines have a 250 response code, False otherwise """ for code, _, _ in self._parsed_content: - if code != "250": return False + if code == "250": return True - return True + return False def content(self): """ diff --git a/stem/response/mapaddress.py b/stem/response/mapaddress.py new file mode 100644 index 0000000..2d1a498 --- /dev/null +++ b/stem/response/mapaddress.py @@ -0,0 +1,38 @@ +import stem.socket +import stem.response + +class MapAddressResponse(stem.response.ControlMessage): + """ + Reply for a MAPADDRESS query. + Doesn't raise an exception unless no addresses were mapped successfully. + + :var dict entries: mapping between the original and replacement addresses + + :raises: + * :class:`stem.socket.OperationFailed` if Tor was unable to satisfy the request + * :class:`stem.socket.InvalidRequest` if the addresses provided were invalid + """ + + def _parse_message(self): + # 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": + raise stem.socket.InvalidRequest(code, message) + elif code == "451": + raise stem.socket.OperationFailed(code, message) + else: + raise stem.socket.ProtocolError("MAPADDRESS returned unexpected response code: %s", code) + + self.entries = {} + + for code, _, message in self.content(): + if code == "250": + try: key, value = message.split("=", 1) + except ValueError: raise stem.socket.ProtocolError(None, "Not a mapping") + + self.entries[key] = value + diff --git a/test/__init__.py b/test/__init__.py index 78d6543..e46822c 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -8,5 +8,6 @@ __all__ = [ "output", "prompt", "runner", + "utils", ] diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 5f5113c..f8fd56e 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -6,6 +6,7 @@ from __future__ import with_statement import re import shutil +import socket import unittest import tempfile @@ -14,6 +15,7 @@ import stem.socket import stem.version import stem.response.protocolinfo import test.runner +import test.utils class TestController(unittest.TestCase): def test_from_port(self): @@ -352,6 +354,8 @@ class TestController(unittest.TestCase): Test controller.signal with valid and invalid signals. """ + if test.runner.require_control(self): return + with test.runner.get_runner().get_tor_controller() as controller: # valid signal controller.signal("CLEARDNSCACHE") @@ -401,4 +405,22 @@ class TestController(unittest.TestCase): self.assertRaises(stem.socket.InvalidRequest, controller.repurpose_circuit, 'f934h9f3h4', "fooo") self.assertRaises(stem.socket.InvalidRequest, controller.repurpose_circuit, '4', "fooo") + + def test_mapaddress(self): + + if test.runner.require_control(self): return + + runner = test.runner.get_runner() + + with runner.get_tor_controller() as controller: + controller.map_address({'1.2.1.2': 'ifconfig.me'}) + + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + s.connect(('127.0.0.1', int(controller.get_conf('SocksPort')))) + test.utils.negotiate_socks(s, '1.2.1.2', 80) + s.sendall(test.utils.ip_request) + response = s.recv(1000) + ip_addr = response[response.find("\r\n\r\n"):].strip() + + socket.inet_aton(ip_addr) # validate IP diff --git a/test/runner.py b/test/runner.py index cc8cf7b..b748bfe 100644 --- a/test/runner.py +++ b/test/runner.py @@ -69,7 +69,7 @@ ERROR_ATTR = (term.Color.RED, term.Attr.BOLD) BASE_TORRC = """# configuration for stem integration tests DataDirectory %s -SocksPort 0 +SocksPort 29327 DownloadExtraInfo 1 """ diff --git a/test/settings.cfg b/test/settings.cfg index 44e28ab..75d5078 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -76,6 +76,7 @@ target.prereq RUN_PTRACE => TORRC_DISABLE_DEBUGGER_ATTACHMENT # means that each of these targets will have a dedicated integration test run. target.torrc RUN_NONE => +target.torrc ONLINE => PORT target.torrc RUN_OPEN => PORT target.torrc RUN_PASSWORD => PORT, PASSWORD target.torrc RUN_COOKIE => PORT, COOKIE diff --git a/test/unit/response/mapaddress.py b/test/unit/response/mapaddress.py new file mode 100644 index 0000000..b8045c1 --- /dev/null +++ b/test/unit/response/mapaddress.py @@ -0,0 +1,82 @@ +""" +Unit tests for the stem.response.mapaddress.MapAddressResponse class. +""" + +import unittest + +import stem.socket +import stem.response +import stem.response.mapaddress +import test.mocking as mocking + +SINGLE_RESPONSE = """250 foo=bar""" + +BATCH_RESPONSE = """\ +250-foo=bar +250-baz=quux +250-gzzz=bzz +250 120.23.23.2=torproject.org""" + +INVALID_EMPTY_RESPONSE = "250 OK" +INVALID_RESPONSE = "250 foo is bar" + +PARTIAL_FAILURE_RESPONSE = """512-syntax error: mapping '2389' is not of expected form 'foo=bar' +512-syntax error: mapping '23' is not of expected form 'foo=bar'. +250 23=324""" + +UNRECOGNIZED_KEYS_RESPONSE = "512 syntax error: mapping '2389' is not of expected form 'foo=bar'" + +FAILED_RESPONSE = "451 Resource exhausted" + +class TestMapAddressResponse(unittest.TestCase): + def test_single_response(self): + """ + Parses a MAPADDRESS reply response with a single address mapping. + """ + + control_message = mocking.get_message(SINGLE_RESPONSE) + stem.response.convert("MAPADDRESS", control_message) + self.assertEqual({"foo": "bar"}, control_message.entries) + + def test_batch_response(self): + """ + Parses a MAPADDRESS reply with multiple address mappings + """ + + control_message = mocking.get_message(BATCH_RESPONSE) + stem.response.convert("MAPADDRESS", control_message) + + expected = { + "foo": "bar", + "baz": "quux", + "gzzz": "bzz", + "120.23.23.2": "torproject.org" + } + + self.assertEqual(expected, control_message.entries) + + def test_invalid_requests(self): + """ + Parses a MAPADDRESS replies that contain an error code due to hostname syntax errors. + """ + + control_message = mocking.get_message(UNRECOGNIZED_KEYS_RESPONSE) + self.assertRaises(stem.socket.InvalidRequest, stem.response.convert, "MAPADDRESS", control_message) + control_message = mocking.get_message(UNRECOGNIZED_KEYS_RESPONSE) + expected = { "23": "324" } + control_message = mocking.get_message(PARTIAL_FAILURE_RESPONSE) + stem.response.convert("MAPADDRESS", control_message) + self.assertEqual(expected, control_message.entries) + + def test_invalid_response(self): + """ + Parses a malformed MAPADDRESS reply that contains an invalid response code. + This is a proper controller message, but malformed according to the + MAPADDRESS's spec. + """ + + control_message = mocking.get_message(INVALID_EMPTY_RESPONSE) + self.assertRaises(stem.socket.ProtocolError, stem.response.convert, "MAPADDRESS", control_message) + control_message = mocking.get_message(INVALID_RESPONSE) + self.assertRaises(stem.socket.ProtocolError, stem.response.convert, "MAPADDRESS", control_message) + diff --git a/test/utils.py b/test/utils.py new file mode 100644 index 0000000..8ed9297 --- /dev/null +++ b/test/utils.py @@ -0,0 +1,61 @@ +import struct +import socket + +from stem.socket import ProtocolError +import test.runner + +error_msgs = { + 0x5a: "SOCKS4A request granted", + 0x5b: "SOCKS4A request rejected or failed", + 0x5c: "SOCKS4A request failed because client is not running identd (or not reachable from the server)", + 0x5d: "SOCKS4A request failed because client's identd could not confirm the user ID string in the request", +} + +ip_request = """GET /ip HTTP/1.0 +Host: ifconfig.me +Accept-Encoding: identity + +""" + +def external_ip(sock): + """ + Returns the externally visible IP address when using a SOCKS4a proxy. + + :param socket sock: socket connected to a SOCKS4a proxy server + + :returns: externally visible IP address, or None if it isn't able to + """ + + try: + negotiate_socks(sock, "ifconfig.me", 80) + s.sendall(req) + response = s.recv(1000) + + return response[response.find("\n\n"):].strip() + except: + pass + +def negotiate_socks(sock, host, port): + """ + Negotiate with a socks4a server. Closes the socket and raises an exception on + failure. + + :param socket sock: socket connected to socks4a server + :param str host: host to connect to + :param int port: port to connect to + + :raises: :class:`stem.socket.ProtocolError` if the socks server doesn't grant our request + + :returns: a list with the IP address and the port that the proxy connected to + """ + + request = "\x04\x01" + struct.pack("!H", port) + "\x00\x00\x00\x01" + "\x00" + host + "\x00" + sock.sendall(request) + response = sock.recv(8) + + if len(response) != 8 or response[0] != "\x00" or response[1] != "\x5a": + sock.close() + raise ProtocolError(error_msgs.get(response[1], "SOCKS server returned unrecognized error code")) + + return [socket.inet_ntoa(response[4:]), struct.unpack("!H", response[2:4])[0]] +

1 0

[compass/master] Merge remote-tracking branch 'gsathya/bug_6959'
by karsten＠torproject.org 24 Sep '12

24 Sep '12

commit efa195eb2f2f19eb2c996f58b7bf115f729b9471 Merge: 5ef9340 1840dba Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Sep 24 11:06:11 2012 -0400 Merge remote-tracking branch 'gsathya/bug_6959' templates/index.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[compass/master] Rename title to Compass
by karsten＠torproject.org 24 Sep '12

24 Sep '12

commit 1840dba1fc779b918ffb49476da93a15ef726395 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Mon Sep 24 07:29:47 2012 +0530 Rename title to Compass --- templates/index.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/index.html b/templates/index.html index 9ffe0d2..5ad2e60 100644 --- a/templates/index.html +++ b/templates/index.html @@ -2,7 +2,7 @@ <html lang="en"> <head> <meta charset="utf-8"> - <title>Tor Metrics</title> + <title>Compass</title> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="description" content="Tor relay stats"> <meta name="author" content="Sathyanarayanan Gunasekaran">

1 0

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 24 Sep '12

24 Sep '12

commit 5398a3101eb1d085266d9da558ed8f5282b76fb8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 24 09:45:08 2012 +0000 Update translations for orbot_completed --- values-fr/strings.xml | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/values-fr/strings.xml b/values-fr/strings.xml index ba64181..7139475 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -31,7 +31,6 @@ <string name="button_clear_log">Effacer le journal</string> <string name="menu_verify">Vérifier</string> <string name="menu_exit">Sortie</string> - <string name="powered_by">propulsé par le Projet Tor </string> <string name="press_to_start">- appuyez longtemps pour démarrer -</string> <string name="pref_trans_proxy_group">Proxy transparent (accès privilégié requis) </string> <string name="pref_trans_proxy_title">Proxy transparent</string> @@ -120,8 +119,9 @@ <string name="pref_entrance_node">Nœuds d\'entrée</string> <string name="pref_entrance_node_summary">Empreintes, pseudos, pays et adresses pour le premier saut</string> <string name="pref_entrance_node_dialog">Entrez les nœuds d\'entrée</string> - <string name="pref_use_whispercore">Utilisez WhisperCore</string> - <string name="pref_use_whispercore_summary">Utilisez les API propriétaires fournis par Netfilter WhisperSystems (dispositif nécessaire avec WhisperCore installé)</string> +  + <string name="pref_proxy_title">Proxy sortant</string> <string name="pref_proxy_type_title">Type de proxy</string> <string name="pref_proxy_type_summary">Protocole à utiliser pour le serveur proxy : HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Entrez le type de proxy</string> @@ -209,4 +209,6 @@ <string name="set_locale_summary">Choisir le lieu and la langue pour Orbot</string> <string name="wizard_locale_title">Choisir la langue</string> <string name="wizard_locale_msg">Laisser aux défaut ou changer la langue actuel</string> + <string name="powered_by">propulsé par le Projet Tor </string> + <string name="btn_save_settings">Sauver les Paramètres</string> </resources>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 24 Sep '12

24 Sep '12

commit 13d259adae779020fdbe2d36428382f1fb44f8cd Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 24 09:45:06 2012 +0000 Update translations for orbot --- values-fr/strings.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/values-fr/strings.xml b/values-fr/strings.xml index 4bd7784..7139475 100644 --- a/values-fr/strings.xml +++ b/values-fr/strings.xml @@ -121,7 +121,7 @@ <string name="pref_entrance_node_dialog">Entrez les nœuds d\'entrée</string>  - <string name="pref_proxy_title">Outbound Network Proxy</string> + <string name="pref_proxy_title">Proxy sortant</string> <string name="pref_proxy_type_title">Type de proxy</string> <string name="pref_proxy_type_summary">Protocole à utiliser pour le serveur proxy : HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Entrez le type de proxy</string> @@ -210,5 +210,5 @@ <string name="wizard_locale_title">Choisir la langue</string> <string name="wizard_locale_msg">Laisser aux défaut ou changer la langue actuel</string> <string name="powered_by">propulsé par le Projet Tor </string> - <string name="btn_save_settings">Save Settings</string> + <string name="btn_save_settings">Sauver les Paramètres</string> </resources>

1 0

[translation/vidalia_completed] Update translations for vidalia_completed
by translation＠torproject.org 24 Sep '12

24 Sep '12

commit 6509a967179edddf98f93963a40ef34157ece25a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 24 09:15:21 2012 +0000 Update translations for vidalia_completed --- fr/vidalia_fr.po | 117 ++++++++++++++++++++++++++++++++++------------------- 1 files changed, 75 insertions(+), 42 deletions(-) diff --git a/fr/vidalia_fr.po b/fr/vidalia_fr.po index f86736f..837dee5 100644 --- a/fr/vidalia_fr.po +++ b/fr/vidalia_fr.po @@ -1,5 +1,7 @@ +# # Translators: -# Translators: +# arpalord <arpalord(a)gmail.com>, 2012. +# Jonathan Metzman <jon.metzman(a)gmail.com>, 2012. # mehditaileb <mehditaileb(a)liberte-info.net>, 2011. # Pierre Antoine <pierre.antoine(a)ieee.org>, 2011. # runasand <runa.sandvik(a)gmail.com>, 2011. @@ -7,15 +9,15 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" -"POT-Creation-Date: 2011-09-07 14:40+0000\n" -"PO-Revision-Date: 2012-02-14 09:46+0000\n" -"Last-Translator: Pierre Antoine <pierre.antoine(a)ieee.org>\n" +"POT-Creation-Date: 2012-03-21 17:52+0000\n" +"PO-Revision-Date: 2012-09-24 09:06+0000\n" +"Last-Translator: arpalord <arpalord(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fr\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Vidalia ts2po 0.2\n" msgctxt "AboutDialog" @@ -201,6 +203,13 @@ msgstr "Configurer le port de contrôle automatiquement" msgctxt "AdvancedPage" msgid "" +"You've checked the autoconfiguration option for the ControlPort, but " +"provided no Data Directory. Please add one, or uncheck the \"Configure " +"ControlPort automatically\" option." +msgstr "Vous avez selectionné l'option d'autoconfiguration pour le ControlPort, mais sans renseigner le Data Directory. Merci de compléter, ou désélectionner l'option \"Configurer le ControlPort automatiquement\"." + +msgctxt "AdvancedPage" +msgid "" "Vidalia was unable to remove the Tor service.\n" "\n" "You may need to remove it manually." @@ -226,6 +235,23 @@ msgctxt "AppearancePage" msgid "Vidalia was unable to load the selected language translation." msgstr "Vidalia n'a pas pu charger la traduction sélectionnée." +msgctxt "AppearancePage" +msgid "" +"System Icon Preferences (changes will take effect when you restart Vidalia)" +msgstr "Afficher l'icône Préférences (les changements prendront effet au redémarrage de Vidalia)" + +msgctxt "AppearancePage" +msgid "Show the Tray Icon and Dock Icon (default)" +msgstr "Afficher les icônes du Tray et du Dock (défaut)" + +msgctxt "AppearancePage" +msgid "Hide the Tray Icon" +msgstr "Masquer l'icône du Tray" + +msgctxt "AppearancePage" +msgid "Hide the Dock Icon" +msgstr "Masquer l'icône du Dock" + msgctxt "BandwidthGraph" msgid "Since:" msgstr "Depuis :" @@ -1751,10 +1777,6 @@ msgid "Connected to the Tor network!" msgstr "Connecté au réseau Tor !" msgctxt "MainWindow" -msgid "Unrecognized startup status" -msgstr "Etat de lancement inconnu" - -msgctxt "MainWindow" msgid "miscellaneous" msgstr "divers" @@ -2066,6 +2088,24 @@ msgid "" msgstr "Tout ce qui sera envoyé à travers cette connexion pourrait être surveillé. Merci de vérifier la configuration de votre application et d'utiliser seulement des protocoles cryptés, tél que SSL, si possible." msgctxt "MainWindow" +msgid "Bootstrapping torrc from %1 to %2" +msgstr "Exécution de torrc de %1 à %2" + +msgctxt "MainWindow" +msgid "(probably Telnet)" +msgstr "(probablement Telnet)" + +msgctxt "MainWindow" +msgid "(probably an email client)" +msgstr "(probably un client de messagerie)" + +msgctxt "MainWindow" +msgid "" +"One of your applications %1 appears to be making a potentially unencrypted " +"and unsafe connection to port %2." +msgstr "Une de vos applications %1 semble réaliser une connexion non chiffrée au port %2." + +msgctxt "MainWindow" msgid "failed (%1)" msgstr "échec (%1)" @@ -2076,8 +2116,19 @@ msgid "" msgstr "Votre relais s'arrête.\nCliquer 'Arrêter' à nouveau pour arrêter votre relais immédiatement." msgctxt "MainWindow" -msgid "Bootstrapping torrc from %1 to %2" -msgstr "Exécution de torrc de %1 à %2" +msgid "" +"Vidalia can't find out how to talk to Tor because it can't access this file: %1\n" +"\n" +"Here's the last error message:\n" +"%2" +msgstr "Vidalia n'arrive pas à communiquer avec Tor car il ne peut accéder à ce fichier: %1\n\nVoici le dernier message d'erreur:\n%2" + +msgctxt "MainWindow" +msgid "" +"It seems Tor has stopped running since Vidalia started it.\n" +"\n" +"See the Advanced Message Log for more information." +msgstr "Tor semble être arrêté depuis le lancement de Vidalia.\n\nVeuillez consulter le journal des messages avancé pour plus d'informations." msgctxt "MainWindow" msgid "" @@ -2093,20 +2144,6 @@ msgid "" "Please check the message log for recent warning or error messages." msgstr "Vidalia a détecté que Tor s'est arrêté brutalement.\n\nVeuillez contrôler dans l'historique les derniers messages d'erreur ou d'alerte." -msgctxt "MainWindow" -msgid "(probably Telnet)" -msgstr "(probablement Telnet)" - -msgctxt "MainWindow" -msgid "(probably an email client)" -msgstr "(probably un client de messagerie)" - -msgctxt "MainWindow" -msgid "" -"One of your applications %1 appears to be making a potentially unencrypted " -"and unsafe connection to port %2." -msgstr "Une de vos applications %1 semble réaliser une connexion non chiffrée au port %2." - msgctxt "MessageLog" msgid "Error Setting Filter" msgstr "Erreur lors de l'application d'un filtre" @@ -2519,14 +2556,6 @@ msgid "Ctrl+F" msgstr "Ctrl+F" msgctxt "NetworkPage" -msgid "Invalid Bridge" -msgstr "Passerelle invalide" - -msgctxt "NetworkPage" -msgid "The specified bridge identifier is not valid." -msgstr "L'identifiant de passerelle spécifié est invalide." - -msgctxt "NetworkPage" msgid "Copy (Ctrl+C)" msgstr "Copier (Ctrl+C)" @@ -2659,13 +2688,13 @@ msgid "SOCKS 5" msgstr "SOCKS 5" msgctxt "NetworkPage" -msgid "HTTP" -msgstr "HTTP" - -msgctxt "NetworkPage" msgid "HTTP / HTTPS" msgstr "HTTP / HTTPS" +msgctxt "NetworkPage" +msgid "You must specify one or more bridges." +msgstr "Vous devez définir un ou plusieurs pont." + msgctxt "Policy" msgid "accept" msgstr "accepter" @@ -2843,10 +2872,6 @@ msgid "Run as a client only" msgstr "Lancer uniquement comme client" msgctxt "ServerPage" -msgid "Relay traffic for the Tor network" -msgstr "Relayer le trafic pour le réseau Tor" - -msgctxt "ServerPage" msgid "Relay Port:" msgstr "Port relais :" @@ -3091,6 +3116,14 @@ msgid "Automatically distribute my bridge address" msgstr "Attribuer automatiquemeny l'adresse de mon bridge" msgctxt "ServerPage" +msgid "Relay traffic for the Tor network (exit relay)" +msgstr "Trafic du relai pour le réseau Tor (point de sortie)" + +msgctxt "ServerPage" +msgid "Relay traffic inside the Tor network (non-exit relay)" +msgstr "Relay traffic inside the Tor network (non-exit relay)" + +msgctxt "ServerPage" msgid "Mirror the Relay Directory" msgstr "Héberger une copie du répertoire des relais" @@ -3243,7 +3276,7 @@ msgctxt "StatusEventWidget" msgid "" "The Tor software encountered an internal bug. Please report the following " "error message to the Tor developers at bugs.torproject.org: \"%1\"" -msgstr "Le programme Tor a rencontré une erreur interne. Merci de transmettre le message d'erruer suivant aux développeurs de Tor à bugs.torproject.org: \"%1\"\n" +msgstr "Le programme Tor a rencontré une erreur interne. Merci de transmettre le message d'erreur suivant aux développeurs de Tor à bugs.torproject.org: \"%1\"" msgctxt "StatusEventWidget" msgid ""

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 24 Sep '12

24 Sep '12

commit 517a45c03c726bd337251e0e758ff67070a858c9 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 24 09:15:18 2012 +0000 Update translations for vidalia --- fr/vidalia_fr.po | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fr/vidalia_fr.po b/fr/vidalia_fr.po index 8b07eb2..837dee5 100644 --- a/fr/vidalia_fr.po +++ b/fr/vidalia_fr.po @@ -10,7 +10,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-09-24 08:33+0000\n" +"PO-Revision-Date: 2012-09-24 09:06+0000\n" "Last-Translator: arpalord <arpalord(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -206,7 +206,7 @@ msgid "" "You've checked the autoconfiguration option for the ControlPort, but " "provided no Data Directory. Please add one, or uncheck the \"Configure " "ControlPort automatically\" option." -msgstr "" +msgstr "Vous avez selectionné l'option d'autoconfiguration pour le ControlPort, mais sans renseigner le Data Directory. Merci de compléter, ou désélectionner l'option \"Configurer le ControlPort automatiquement\"." msgctxt "AdvancedPage" msgid "" @@ -238,19 +238,19 @@ msgstr "Vidalia n'a pas pu charger la traduction sélectionnée." msgctxt "AppearancePage" msgid "" "System Icon Preferences (changes will take effect when you restart Vidalia)" -msgstr "" +msgstr "Afficher l'icône Préférences (les changements prendront effet au redémarrage de Vidalia)" msgctxt "AppearancePage" msgid "Show the Tray Icon and Dock Icon (default)" -msgstr "" +msgstr "Afficher les icônes du Tray et du Dock (défaut)" msgctxt "AppearancePage" msgid "Hide the Tray Icon" -msgstr "" +msgstr "Masquer l'icône du Tray" msgctxt "AppearancePage" msgid "Hide the Dock Icon" -msgstr "" +msgstr "Masquer l'icône du Dock" msgctxt "BandwidthGraph" msgid "Since:" @@ -2121,7 +2121,7 @@ msgid "" "\n" "Here's the last error message:\n" "%2" -msgstr "" +msgstr "Vidalia n'arrive pas à communiquer avec Tor car il ne peut accéder à ce fichier: %1\n\nVoici le dernier message d'erreur:\n%2" msgctxt "MainWindow" msgid ""

1 0

[translation/tsum_completed] Update translations for tsum_completed
by translation＠torproject.org 24 Sep '12

24 Sep '12

commit e3fb0df5b4ea4b081b7ae1348f9762caf1e6b6cd Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 24 09:15:11 2012 +0000 Update translations for tsum_completed --- fr/short-user-manual_fr_noimg.xhtml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fr/short-user-manual_fr_noimg.xhtml b/fr/short-user-manual_fr_noimg.xhtml index cd3d764..7247d7b 100644 --- a/fr/short-user-manual_fr_noimg.xhtml +++ b/fr/short-user-manual_fr_noimg.xhtml @@ -22,12 +22,12 @@ Note: Les Bundles Tor Browser pour Linux et Mac OS X sont assez volumineux, et vous ne serez pas en mesure de recevoir un de ces paquets avec un compte Gmail, Hotmail ou Yahoo. Si vous ne pouvez pas recevoir le paquet que vous voulez, envoyez un email à help(a)rt.torproject.org et nous allons vous donner une liste des miroirs site à utiliser. <h3 id="tor-for-smartphones">Tor pour les smartphone</h3> Vous pouvez obtenir Tor sur votre appareil Android en installant le paquet nommé Orbot. Pour plus d'informations sur le téléchargement et installation d'Orbot, s'il vous plaît, voir le <a href="https://www.torproject.org/docs/android.html.en">site du Projet Tor</a>. - Nous avons aussi des paquets expérimentaux pour <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> et <a href="http://sid77.slackware.it/iphone/">Apple iOS</a>. + Nous avons aussi les paquets expérimentaux pour <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> et <a href="http://sid77.slackware.it/ios/">Apple iOS</a>. <h3 id="how-to-verify-that-you-have-the-right-version">Comment vérifier que vous avez la bonne version?</h3> Avant de lancer le Navigateur Tor, vous devriez vous assurer que vous avez la bonne version. Le logiciel que vous allez recevoir est accompagné d'un fichier qui porte le même nom que le package avec l'extension .asc. Ce fichier .asc est un signature GPG et va vous permettre de vérifier que le fichier que vous avez téléchargé est exactement celui que vous souhaitez obtenir. Avant de pouvoir vérifier la signature, vous devez télécharger et installer GnuPG: - Windows: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a> Mac OS X: <a href="http://macgpg.sourceforge.net/">http://macgpg.sourceforge.net/</a> Linux: la plupart des distributions Linux sont livrés avec GnuPG préinstallé. + Windows: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a> Mac OS X: <a href="http://www.gpgtools.org/">http://www.gpgtools.org/</a> Linux: La plupart des distributions Linux embarque une version pré-installée de GnuPG. Veuillez noter qu'il est peut-être nécessaire de modifier les chemins et les commandes utilisés ci-dessous pour fonctionner sur votre PC. Le package Navigateur Tor est signé avec la clé 0x63FEE659 par Erinn Clark. Pour importer la clé de Erinn, lancer: <pre> @@ -57,7 +57,7 @@ sub 2048R/EB399FD7 2003-10-16 Si tout est bon &quot;Signature correcte&quot; devrait s'afficher. Une mauvaise signature signifie que le fichier peut avoir été altéré ou corrompu. Si vous voyez une signature incorrecte, envoyer les informations concernant le site où vous avez téléchargé le paquet, comment vous avez vous vérifié la signature, et le résultat de GnuPG par email à help(a)rt.torproject.org. Dès lors que vous avez vérifié la signature et vu le message &quot;signature correcte&quot;, poursuivez en décompactant le package. Vous devez obtenir un dossier identique à tor-browser_en-US. A l'intérieur de ce dossier vous trouverez un sous-dossier nommé Docs contenant un fichier nommé changelog. Vous devez vous assurer que le numéro de version apparaissant en haut du fichier changelog correspond au numéro de version du nom du fichier. <h3 id="how-to-use-the-tor-browser-bundle">Comment utiliser le Navigateur Tor?</h3> - Après avoir téléchargé et décompacté le Navigateur Tor, vous devriez obtenir un répertoire avec quelques fichiers. Parmi eux se trouve un fichier exécutable appelé &quot;Start Tor Browser&quot; (ou &quot;start-tor-navigateur&quot;, selon votre système d'exploitation). + Après avoir téléchargé Tor Browser Bundle, décompresser l'archive sur votre bureau ou sur une clé USB. Vous devriez obtenir un répertoire contenant quelques fichiers. Un de ces fichiers est un exécutable appelé "Start Tor Browser" (ou "start-tor-browser", selon votre système d'exploitation). Lorsque que vous démarrerez le package navigateur, vous verrez Vidalia démarrer et se connecter au réseau. Après cela, vous verrez le navigateur vous confirmez que vous utilisez à présent Tor. Cela s'obtient en visualisant <a href="https://check.torproject.org/">https://check.torproject.org/</a>. Vous naviguez dès lors sur Internet à travers Tor. Veuillez noter qu'il est important que vous utilisiez le navigateur fourni avec le paquet, et non pas votre navigateur.

1 0