- tor-commits - lists.torproject.org

[stem/master] Specialized subclasses for ControlSocket
by atagar＠torproject.org 28 Nov '11

28 Nov '11

commit 7bae33db31f26440810596b0b702d7f85bbfb1cd Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Nov 28 06:18:03 2011 -0800 Specialized subclasses for ControlSocket Adding a ControlSocket subclass for control ports and control sockets. This allows for a connect() method which we'll need when trying multiple connection types since the socket becomes detached after a failed authentication attempt. This is also gonna be a bit nicer for callers since it bundles the connection information (the port/path we're using) with the socket. --- stem/connection.py | 66 +++++++++----------- stem/control.py | 5 ++ stem/socket.py | 176 ++++++++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 184 insertions(+), 63 deletions(-) diff --git a/stem/connection.py b/stem/connection.py index cb8425a..fe17d6b 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -14,11 +14,7 @@ ProtocolInfoResponse - Reply from a PROTOCOLINFO query. +- convert - parses a ControlMessage, turning it into a ProtocolInfoResponse """ -from __future__ import absolute_import -import Queue -import socket import logging -import threading import stem.socket import stem.version @@ -62,14 +58,24 @@ def get_protocolinfo_by_port(control_addr = "127.0.0.1", control_port = 9051, ke socket """ - control_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - connection_args = (control_addr, control_port) - protocolinfo_response = _get_protocolinfo_impl(control_socket, connection_args, keep_alive) - - # attempt to expand relative cookie paths using our port to infer the pid - protocolinfo_response.cookie_path = _expand_cookie_path(protocolinfo_response.cookie_path, stem.util.system.get_pid_by_port, control_port) - - return protocolinfo_response + try: + control_socket = stem.socket.ControlPort(control_addr, control_port) + control_socket.connect() + control_socket.send("PROTOCOLINFO 1") + protocolinfo_response = control_socket.recv() + ProtocolInfoResponse.convert(protocolinfo_response) + + if keep_alive: protocolinfo_response.socket = control_socket + else: control_socket.close() + + # attempt to expand relative cookie paths using our port to infer the pid + if control_addr == "127.0.0.1": + _expand_cookie_path(protocolinfo_response, stem.util.system.get_pid_by_port, control_port) + + return protocolinfo_response + except stem.socket.ControllerError, exc: + control_socket.close() + raise exc def get_protocolinfo_by_socket(socket_path = "/var/run/tor/control", keep_alive = False): """ @@ -87,27 +93,9 @@ def get_protocolinfo_by_socket(socket_path = "/var/run/tor/control", keep_alive socket """ - control_socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - protocolinfo_response = _get_protocolinfo_impl(control_socket, socket_path, keep_alive) - - # attempt to expand relative cookie paths using our socket to infer the pid - protocolinfo_response.cookie_path = _expand_cookie_path(protocolinfo_response.cookie_path, stem.util.system.get_pid_by_open_file, socket_path) - - return protocolinfo_response - -def _get_protocolinfo_impl(control_socket, connection_args, keep_alive): - """ - Common implementation behind the get_protocolinfo_by_* functions. This - connects the given socket and issues a PROTOCOLINFO query with it. - """ - - try: - control_socket.connect(connection_args) - control_socket = stem.socket.ControlSocket(control_socket) - except socket.error, exc: - raise stem.socket.SocketError(exc) - try: + control_socket = stem.socket.ControlSocketFile(socket_path) + control_socket.connect() control_socket.send("PROTOCOLINFO 1") protocolinfo_response = control_socket.recv() ProtocolInfoResponse.convert(protocolinfo_response) @@ -115,18 +103,22 @@ def _get_protocolinfo_impl(control_socket, connection_args, keep_alive): if keep_alive: protocolinfo_response.socket = control_socket else: control_socket.close() + # attempt to expand relative cookie paths using our port to infer the pid + _expand_cookie_path(protocolinfo_response, stem.util.system.get_pid_by_open_file, socket_path) + return protocolinfo_response except stem.socket.ControllerError, exc: control_socket.close() raise exc -def _expand_cookie_path(cookie_path, pid_resolver, pid_resolution_arg): +def _expand_cookie_path(protocolinfo_response, pid_resolver, pid_resolution_arg): """ Attempts to expand a relative cookie path with the given pid resolver. This - returns the input path if it's already absolute, None, or the system calls - fail. + leaves the cookie_path alone if it's already absolute, None, or the system + calls fail. """ + cookie_path = protocolinfo_response.cookie_path if cookie_path and stem.util.system.is_relative_path(cookie_path): try: tor_pid = pid_resolver(pid_resolution_arg) @@ -146,7 +138,7 @@ def _expand_cookie_path(cookie_path, pid_resolver, pid_resolution_arg): pid_resolver_label = resolver_labels.get(pid_resolver, "") LOGGER.debug("unable to expand relative tor cookie path%s: %s" % (pid_resolver_label, exc)) - return cookie_path + protocolinfo_response.cookie_path = cookie_path class ProtocolInfoResponse(stem.socket.ControlMessage): """ @@ -276,7 +268,7 @@ class ProtocolInfoResponse(stem.socket.ControlMessage): self.cookie_path = line.pop_mapping(True, True)[1] # attempt to expand relative cookie paths - self.cookie_path = _expand_cookie_path(self.cookie_path, stem.util.system.get_pid_by_name, "tor") + _expand_cookie_path(self, stem.util.system.get_pid_by_name, "tor") elif line_type == "VERSION": # Line format: # VersionLine = "250-VERSION" SP "Tor=" TorVersion OptArguments CRLF diff --git a/stem/control.py b/stem/control.py index f372b57..3d55b62 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1,6 +1,11 @@ # The following is very much a work in progress and mostly scratch (I just # wanted to make sure other work would nicely do the async event handling). +import Queue +import threading + +import stem.socket + class ControlConnection: """ Connection to a Tor control port. This is a very lightweight wrapper around diff --git a/stem/socket.py b/stem/socket.py index 8add15f..0d2a84e 100644 --- a/stem/socket.py +++ b/stem/socket.py @@ -9,9 +9,17 @@ ControllerError - Base exception raised when using the controller. +- SocketClosed - Socket has been shut down. ControlSocket - Socket wrapper that speaks the tor control protocol. + |- ControlPort - Control connection via a port. + | |- get_address - provides the ip address of our socket + | +- get_port - provides the port of our socket + | + |- ControlSocketFile - Control connection via a local file socket. + | +- get_socket_path - provides the path of the socket we connect to + | |- send - sends a message to the socket |- recv - receives a ControlMessage from the socket |- is_alive - reports if the socket is known to be closed + |- connect - connects a new socket +- close - shuts down the socket ControlMessage - Message that's read from the control socket. @@ -74,20 +82,14 @@ class ControlSocket: Wrapper for a socket connection that speaks the Tor control protocol. To the better part this transparently handles the formatting for sending and receiving complete messages. All methods are thread safe. + + Callers should not instantiate this class directly, but rather use subclasses + which are expected to implement the _make_socket method. """ - def __init__(self, control_socket): - """ - Constructs as a wrapper around an established socket connection. Further - interaction with the raw socket is discouraged. - - Arguments: - control_socket (socket.socket) - established tor control socket - """ - - self._socket = control_socket - self._socket_file = control_socket.makefile() - self._is_alive = True + def __init__(self): + self._socket, self._socket_file = None, None + self._is_alive = False # Tracks sending and receiving separately. This should be safe, and doing # so prevents deadlock where we block writes because we're waiting to read @@ -162,35 +164,157 @@ class ControlSocket: return self._is_alive - def close(self): + def connect(self): """ - Shuts down the socket. If it's already closed then this is a no-op. + Connects to a new socket, closing our previous one if we're already + attached. + + Raises: + stem.socket.SocketError if unable to make a socket """ # we need both locks for this self._send_cond.acquire() self._recv_cond.acquire() - # if we haven't yet established a connection then this raises an error - # socket.error: [Errno 107] Transport endpoint is not connected - try: self._socket.shutdown(socket.SHUT_RDWR) - except socket.error: pass + # close the socket if we're currently attached to one + if self.is_alive(): self.close() - # Suppressing unexpected exceptions from close. For instance, if the - # socket's file has already been closed then with python 2.7 that raises - # with... - # error: [Errno 32] Broken pipe + try: + control_socket = self._make_socket() + self._socket = control_socket + self._socket_file = control_socket.makefile() + self._is_alive = True + finally: + self._send_cond.release() + self._recv_cond.release() + + def close(self): + """ + Shuts down the socket. If it's already closed then this is a no-op. + """ - try: self._socket.close() - except: pass + # we need both locks for this + self._send_cond.acquire() + self._recv_cond.acquire() + + if self._socket: + # if we haven't yet established a connection then this raises an error + # socket.error: [Errno 107] Transport endpoint is not connected + try: self._socket.shutdown(socket.SHUT_RDWR) + except socket.error: pass + + # Suppressing unexpected exceptions from close. For instance, if the + # socket's file has already been closed then with python 2.7 that raises + # with... + # error: [Errno 32] Broken pipe + + try: self._socket.close() + except: pass - try: self._socket_file.close() - except: pass + if self._socket_file: + try: self._socket_file.close() + except: pass self._is_alive = False self._send_cond.release() self._recv_cond.release() + + def _make_socket(self): + """ + Constructs and connects new socket. This is implemented by subclasses. + + Returns: + socket.socket for our configuration + + Raises: + stem.socket.SocketError if unable to make a socket + """ + + raise SocketError("Unsupported Operation: this should be implemented by the ControlSocket subclass") + +class ControlPort(ControlSocket): + """ + Control connection to tor. For more information see tor's ControlPort torrc + option. + """ + + def __init__(self, control_addr = "127.0.0.1", control_port = 9051): + """ + ControlPort constructor. + + Arguments: + control_addr (str) - ip address of the controller + control_port (int) - port number of the controller + """ + + ControlSocket.__init__(self) + self._control_addr = control_addr + self._control_port = control_port + + def get_address(self): + """ + Provides the ip address our socket connects to. + + Returns: + str with the ip address of our socket + """ + + return self._control_addr + + def get_port(self): + """ + Provides the port our socket connects to. + + Returns: + int with the port of our socket + """ + + return self._control_port + + def _make_socket(self): + try: + control_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + control_socket.connect((self._control_addr, self._control_port)) + return control_socket + except socket.error, exc: + raise SocketError(exc) + +class ControlSocketFile(ControlSocket): + """ + Control connection to tor. For more information see tor's ControlSocket torrc + option. + """ + + def __init__(self, socket_path = "/var/run/tor/control"): + """ + ControlSocketFile constructor. + + Arguments: + socket_path (str) - path where the control socket is located + """ + + ControlSocket.__init__(self) + self._socket_path = socket_path + + def get_socket_path(self): + """ + Provides the path our socket connects to. + + Returns: + str with the path for our control socket + """ + + return self._socket_path + + def _make_socket(self): + try: + control_socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) + control_socket.connect(self._socket_path) + return control_socket + except socket.error, exc: + raise SocketError(exc) class ControlMessage: """

1 0

[stem/master] Exercising the get_socket arg with integ testing
by atagar＠torproject.org 28 Nov '11

28 Nov '11

commit 206e4de3ffab8764aefbc02d969092cc47dfc37a Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Nov 28 07:00:45 2011 -0800 Exercising the get_socket arg with integ testing The get_socket (previously keep_alive) argument wasn't being exercised so adding that to the test for fetching a protocolinfo response via the control socket. --- test/integ/connection/protocolinfo.py | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/test/integ/connection/protocolinfo.py b/test/integ/connection/protocolinfo.py index e1436f8..b22d0c9 100644 --- a/test/integ/connection/protocolinfo.py +++ b/test/integ/connection/protocolinfo.py @@ -101,8 +101,13 @@ class TestProtocolInfo(unittest.TestCase): connection_type = test.runner.get_runner().get_connection_type() if test.runner.OPT_SOCKET in test.runner.CONNECTION_OPTS[connection_type]: - protocolinfo_response = stem.connection.get_protocolinfo_by_socket(socket_path = test.runner.CONTROL_SOCKET_PATH) + protocolinfo_response, control_socket = stem.connection.get_protocolinfo_by_socket(socket_path = test.runner.CONTROL_SOCKET_PATH, get_socket = True) self.assert_protocolinfo_attr(protocolinfo_response, connection_type) + + # also exercising the get_socket argument - we should have a usable + # socket at this point + self.assertTrue(control_socket.is_alive()) + control_socket.close() else: # we don't have a control socket self.assertRaises(stem.socket.SocketError, stem.connection.get_protocolinfo_by_socket, test.runner.CONTROL_SOCKET_PATH)

1 0

[stem/master] Splitting socket attribute from protocolinfo
by atagar＠torproject.org 28 Nov '11

28 Nov '11

commit 04975ff9d149d8a881edd8ce26925d785150eda1 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Nov 28 06:56:38 2011 -0800 Splitting socket attribute from protocolinfo Bundling the requesting socket with the protocolinfo response was kinda clunky. I thought that it owuld make the api a little nicer, but in retrospect it's just weird so going to a more conventional tuple response instead. --- stem/connection.py | 41 +++++++++++++++++++------------- test/integ/connection/protocolinfo.py | 3 -- test/unit/connection/protocolinfo.py | 2 - 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/stem/connection.py b/stem/connection.py index fe17d6b..b740d0d 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -38,7 +38,7 @@ LOGGER = logging.getLogger("stem") AuthMethod = stem.util.enum.Enum("NONE", "PASSWORD", "COOKIE", "UNKNOWN") -def get_protocolinfo_by_port(control_addr = "127.0.0.1", control_port = 9051, keep_alive = False): +def get_protocolinfo_by_port(control_addr = "127.0.0.1", control_port = 9051, get_socket = False): """ Issues a PROTOCOLINFO query to a control port, getting information about the tor process running on it. @@ -46,11 +46,13 @@ def get_protocolinfo_by_port(control_addr = "127.0.0.1", control_port = 9051, ke Arguments: control_addr (str) - ip address of the controller control_port (int) - port number of the controller - keep_alive (bool) - keeps the socket used to issue the PROTOCOLINFO query - open if True, closes otherwise + get_socket (bool) - provides the socket with the response if True, + otherwise the socket is closed when we're done Returns: - ProtocolInfoResponse with the response given by the tor process + stem.connection.ProtocolInfoResponse provided by tor, if get_socket is True + then this provides a tuple instead with both the response and connected + socket (stem.socket.ControlPort) Raises: stem.socket.ProtocolError if the PROTOCOLINFO response is malformed @@ -65,27 +67,33 @@ def get_protocolinfo_by_port(control_addr = "127.0.0.1", control_port = 9051, ke protocolinfo_response = control_socket.recv() ProtocolInfoResponse.convert(protocolinfo_response) - if keep_alive: protocolinfo_response.socket = control_socket - else: control_socket.close() - # attempt to expand relative cookie paths using our port to infer the pid if control_addr == "127.0.0.1": _expand_cookie_path(protocolinfo_response, stem.util.system.get_pid_by_port, control_port) - return protocolinfo_response + if get_socket: + return (protocolinfo_response, control_socket) + else: + control_socket.close() + return protocolinfo_response except stem.socket.ControllerError, exc: control_socket.close() raise exc -def get_protocolinfo_by_socket(socket_path = "/var/run/tor/control", keep_alive = False): +def get_protocolinfo_by_socket(socket_path = "/var/run/tor/control", get_socket = False): """ Issues a PROTOCOLINFO query to a control socket, getting information about the tor process running on it. Arguments: socket_path (str) - path where the control socket is located - keep_alive (bool) - keeps the socket used to issue the PROTOCOLINFO query - open if True, closes otherwise + get_socket (bool) - provides the socket with the response if True, + otherwise the socket is closed when we're done + + Returns: + stem.connection.ProtocolInfoResponse provided by tor, if get_socket is True + then this provides a tuple instead with both the response and connected + socket (stem.socket.ControlSocketFile) Raises: stem.socket.ProtocolError if the PROTOCOLINFO response is malformed @@ -100,13 +108,14 @@ def get_protocolinfo_by_socket(socket_path = "/var/run/tor/control", keep_alive protocolinfo_response = control_socket.recv() ProtocolInfoResponse.convert(protocolinfo_response) - if keep_alive: protocolinfo_response.socket = control_socket - else: control_socket.close() - # attempt to expand relative cookie paths using our port to infer the pid _expand_cookie_path(protocolinfo_response, stem.util.system.get_pid_by_open_file, socket_path) - return protocolinfo_response + if get_socket: + return (protocolinfo_response, control_socket) + else: + control_socket.close() + return protocolinfo_response except stem.socket.ControllerError, exc: control_socket.close() raise exc @@ -160,7 +169,6 @@ class ProtocolInfoResponse(stem.socket.ControlMessage): auth_methods (tuple) - AuthMethod types that tor will accept unknown_auth_methods (tuple) - strings of unrecognized auth methods cookie_path (str) - path of tor's authentication cookie - socket (stem.socket.ControlSocket) - socket used to make the query """ def convert(control_message): @@ -196,7 +204,6 @@ class ProtocolInfoResponse(stem.socket.ControlMessage): self.protocol_version = None self.tor_version = None self.cookie_path = None - self.socket = None auth_methods, unknown_auth_methods = [], [] diff --git a/test/integ/connection/protocolinfo.py b/test/integ/connection/protocolinfo.py index 8c23329..e1436f8 100644 --- a/test/integ/connection/protocolinfo.py +++ b/test/integ/connection/protocolinfo.py @@ -46,7 +46,6 @@ class TestProtocolInfo(unittest.TestCase): self.assertNotEqual(None, protocolinfo_response.tor_version) self.assertNotEqual(None, protocolinfo_response.auth_methods) - self.assertEqual(None, protocolinfo_response.socket) self.assert_protocolinfo_attr(protocolinfo_response, connection_type) def test_get_protocolinfo_by_port(self): @@ -77,7 +76,6 @@ class TestProtocolInfo(unittest.TestCase): if test.runner.OPT_PORT in test.runner.CONNECTION_OPTS[connection_type]: protocolinfo_response = stem.connection.get_protocolinfo_by_port(control_port = test.runner.CONTROL_PORT) - self.assertEqual(None, protocolinfo_response.socket) self.assert_protocolinfo_attr(protocolinfo_response, connection_type) else: # we don't have a control port @@ -104,7 +102,6 @@ class TestProtocolInfo(unittest.TestCase): if test.runner.OPT_SOCKET in test.runner.CONNECTION_OPTS[connection_type]: protocolinfo_response = stem.connection.get_protocolinfo_by_socket(socket_path = test.runner.CONTROL_SOCKET_PATH) - self.assertEqual(None, protocolinfo_response.socket) self.assert_protocolinfo_attr(protocolinfo_response, connection_type) else: # we don't have a control socket diff --git a/test/unit/connection/protocolinfo.py b/test/unit/connection/protocolinfo.py index ecca8b6..bc0fef3 100644 --- a/test/unit/connection/protocolinfo.py +++ b/test/unit/connection/protocolinfo.py @@ -92,7 +92,6 @@ class TestProtocolInfoResponse(unittest.TestCase): self.assertEquals((stem.connection.AuthMethod.NONE, ), control_message.auth_methods) self.assertEquals((), control_message.unknown_auth_methods) self.assertEquals(None, control_message.cookie_path) - self.assertEquals(None, control_message.socket) def test_password_auth(self): """ @@ -148,7 +147,6 @@ class TestProtocolInfoResponse(unittest.TestCase): self.assertEquals((), control_message.auth_methods) self.assertEquals((), control_message.unknown_auth_methods) self.assertEquals(None, control_message.cookie_path) - self.assertEquals(None, control_message.socket) def test_relative_cookie(self): """

1 0

[stem/master] Function and testing for null authentication
by atagar＠torproject.org 28 Nov '11

28 Nov '11

commit 312423c9d0b68cea486c3269ddcaf95fcb3314cc Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Nov 28 10:08:20 2011 -0800 Function and testing for null authentication Function for authenticating to open connections and integration testing for it. The tests both check the happy case and responses we get in a variety of 'authentication needed' scenarios. --- run_tests.py | 2 + stem/connection.py | 24 ++++++++++++ test/integ/connection/__init__.py | 2 +- test/integ/connection/authentication.py | 62 +++++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+), 1 deletions(-) diff --git a/run_tests.py b/run_tests.py index 8dd141e..eee52ff 100755 --- a/run_tests.py +++ b/run_tests.py @@ -22,6 +22,7 @@ import test.unit.util.system import test.integ.socket.control_message import test.integ.util.conf import test.integ.util.system +import test.integ.connection.authentication import test.integ.connection.protocolinfo import stem.util.enum @@ -41,6 +42,7 @@ UNIT_TESTS = (("stem.socket.ControlMessage", test.unit.socket.control_message.Te ) INTEG_TESTS = (("stem.socket.ControlMessage", test.integ.socket.control_message.TestControlMessage), + ("stem.connection.authenticate_*", test.integ.connection.authentication.TestAuthenticate), ("stem.connection.ProtocolInfoResponse", test.integ.connection.protocolinfo.TestProtocolInfo), ("stem.util.conf", test.integ.util.conf.TestConf), ("stem.util.system", test.integ.util.system.TestSystem), diff --git a/stem/connection.py b/stem/connection.py index b740d0d..bef8d50 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -38,6 +38,30 @@ LOGGER = logging.getLogger("stem") AuthMethod = stem.util.enum.Enum("NONE", "PASSWORD", "COOKIE", "UNKNOWN") +def authenticate_none(control_socket): + """ + Authenticates to an open control socket. All control connections need to + authenticate before they can be used, even if tor hasn't been configured to + use any authentication. + + If authentication fails then tor will close the control socket. + + Arguments: + control_socket (stem.socket.ControlSocket) - socket to be authenticated + + Raises: + ValueError if the empty authentication credentials aren't accepted + stem.socket.ProtocolError the content from the socket is malformed + stem.socket.SocketError if problems arise in using the socket + """ + + control_socket.send("AUTHENTICATE") + auth_response = control_socket.recv() + + # if we got anything but an OK response then error + if str(auth_response) != "OK": + raise ValueError(str(auth_response)) + def get_protocolinfo_by_port(control_addr = "127.0.0.1", control_port = 9051, get_socket = False): """ Issues a PROTOCOLINFO query to a control port, getting information about the diff --git a/test/integ/connection/__init__.py b/test/integ/connection/__init__.py index dd0925e..d570669 100644 --- a/test/integ/connection/__init__.py +++ b/test/integ/connection/__init__.py @@ -2,5 +2,5 @@ Integration tests for stem.connection. """ -__all__ = ["protocolinfo"] +__all__ = ["authenticate", "protocolinfo"] diff --git a/test/integ/connection/authentication.py b/test/integ/connection/authentication.py new file mode 100644 index 0000000..4ba0bfa --- /dev/null +++ b/test/integ/connection/authentication.py @@ -0,0 +1,62 @@ +""" +Integration tests for authenticating to the control socket via +stem.connection.authenticate_* functions. +""" + +import unittest + +import test.runner +import stem.connection + +# Responses given by tor for various authentication failures. These may change +# in the future and if they do then this test should be updated. + +COOKIE_AUTH_FAIL = "Authentication failed: Wrong length on authentication cookie." +PASSWORD_AUTH_FAIL = "Authentication failed: Password did not match HashedControlPassword value from configuration. Maybe you tried a plain text password? If so, the standard requires that you put it in double quotes." +MULTIPLE_AUTH_FAIL = "Authentication failed: Password did not match HashedControlPassword *or* authentication cookie." + +class TestAuthenticate(unittest.TestCase): + """ + Tests the authentication methods. This should be run with the 'CONN_ALL' + integ target to exercise the widest range of use cases. + """ + + def test_authenticate_none(self): + """ + Tests the authenticate_none function. + """ + + runner = test.runner.get_runner() + connection_type = runner.get_connection_type() + + if connection_type == test.runner.TorConnection.NONE: + self.skipTest("(no connection)") + + # If the connection has authentication then this will fail with a message + # based on the authentication type. If not then this will succeed. + + control_socket = test.runner.get_runner().get_tor_socket(False) + + connection_options = test.runner.CONNECTION_OPTS[connection_type] + cookie_auth = test.runner.OPT_COOKIE in connection_options + password_auth = test.runner.OPT_PASSWORD in connection_options + + if cookie_auth or password_auth: + if cookie_auth and password_auth: failure_msg = MULTIPLE_AUTH_FAIL + elif cookie_auth: failure_msg = COOKIE_AUTH_FAIL + else: failure_msg = PASSWORD_AUTH_FAIL + + try: + stem.connection.authenticate_none(control_socket) + self.fail() + except ValueError, exc: + self.assertEqual(failure_msg, str(exc)) + else: + stem.connection.authenticate_none(control_socket) + + # issues a 'GETINFO config-file' query to confirm that we can use the socket + + control_socket.send("GETINFO config-file") + config_file_response = control_socket.recv() + self.assertEquals("config-file=%s\nOK" % runner.get_torrc_path(), str(config_file_response)) +

1 0

[stem/master] Using ControlSocket for integ tests
by atagar＠torproject.org 28 Nov '11

28 Nov '11

commit c033f19b081149f49a65cb6ab79e836af5352a2e Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Nov 28 09:39:14 2011 -0800 Using ControlSocket for integ tests Replacing the send_message and recv_message calls via raw sockets with the ControlSocket class. Neither of these integ tests are for testing those methods and the higher level objects make the tests much more readable. --- test/integ/connection/protocolinfo.py | 7 ++-- test/integ/socket/control_message.py | 65 +++++++++++---------------------- test/runner.py | 27 ++++++-------- 3 files changed, 36 insertions(+), 63 deletions(-) diff --git a/test/integ/connection/protocolinfo.py b/test/integ/connection/protocolinfo.py index b22d0c9..02d097d 100644 --- a/test/integ/connection/protocolinfo.py +++ b/test/integ/connection/protocolinfo.py @@ -1,5 +1,5 @@ """ -Integration tests for the stem.connections.ProtocolInfoResponse class and +Integration tests for the stem.connection.ProtocolInfoResponse class and related functions. """ @@ -33,10 +33,9 @@ class TestProtocolInfo(unittest.TestCase): self.skipTest("(no connection)") control_socket = runner.get_tor_socket(False) - control_socket_file = control_socket.makefile() - stem.socket.send_message(control_socket_file, "PROTOCOLINFO 1") - protocolinfo_response = stem.socket.recv_message(control_socket_file) + control_socket.send("PROTOCOLINFO 1") + protocolinfo_response = control_socket.recv() stem.connection.ProtocolInfoResponse.convert(protocolinfo_response) # according to the control spec the following _could_ differ or be diff --git a/test/integ/socket/control_message.py b/test/integ/socket/control_message.py index 2cdb96c..7b14872 100644 --- a/test/integ/socket/control_message.py +++ b/test/integ/socket/control_message.py @@ -22,15 +22,14 @@ class TestControlMessage(unittest.TestCase): control_socket = test.runner.get_runner().get_tor_socket(False) if not control_socket: self.skipTest("(no control socket)") - control_socket_file = control_socket.makefile() # If an unauthenticated connection gets a message besides AUTHENTICATE or # PROTOCOLINFO then tor will give an 'Authentication required.' message and # hang up. - stem.socket.send_message(control_socket_file, "GETINFO version") + control_socket.send("GETINFO version") - auth_required_response = stem.socket.recv_message(control_socket_file) + auth_required_response = control_socket.recv() self.assertEquals("Authentication required.", str(auth_required_response)) self.assertEquals(["Authentication required."], list(auth_required_response)) self.assertEquals("514 Authentication required.\r\n", auth_required_response.raw_content()) @@ -42,37 +41,25 @@ class TestControlMessage(unittest.TestCase): # the write will cause a SocketError. try: - stem.socket.send_message(control_socket_file, "GETINFO version") + control_socket.send("GETINFO version") except: pass - self.assertRaises(stem.socket.SocketClosed, stem.socket.recv_message, control_socket_file) + self.assertRaises(stem.socket.SocketClosed, control_socket.recv) # Additional socket usage should fail, and pulling more responses will fail # with more closed exceptions. - self.assertRaises(stem.socket.SocketError, stem.socket.send_message, control_socket_file, "GETINFO version") - self.assertRaises(stem.socket.SocketClosed, stem.socket.recv_message, control_socket_file) - self.assertRaises(stem.socket.SocketClosed, stem.socket.recv_message, control_socket_file) - self.assertRaises(stem.socket.SocketClosed, stem.socket.recv_message, control_socket_file) + self.assertRaises(stem.socket.SocketError, control_socket.send, "GETINFO version") + self.assertRaises(stem.socket.SocketClosed, control_socket.recv) + self.assertRaises(stem.socket.SocketClosed, control_socket.recv) + self.assertRaises(stem.socket.SocketClosed, control_socket.recv) # The socket connection is already broken so calling close shouldn't have # an impact. control_socket.close() - self.assertRaises(stem.socket.SocketError, stem.socket.send_message, control_socket_file, "GETINFO version") - self.assertRaises(stem.socket.SocketClosed, stem.socket.recv_message, control_socket_file) - - # Tries again with the file explicitely closed. In python 2.7 the close - # call will raise... - # error: [Errno 32] Broken pipe - - try: control_socket_file.close() - except: pass - - self.assertRaises(stem.socket.SocketError, stem.socket.send_message, control_socket_file, "GETINFO version") - - # receives: stem.socket.SocketClosed: socket file has been closed - self.assertRaises(stem.socket.SocketClosed, stem.socket.recv_message, control_socket_file) + self.assertRaises(stem.socket.SocketClosed, control_socket.send, "GETINFO version") + self.assertRaises(stem.socket.SocketClosed, control_socket.recv) def test_invalid_command(self): """ @@ -81,17 +68,15 @@ class TestControlMessage(unittest.TestCase): control_socket = test.runner.get_runner().get_tor_socket() if not control_socket: self.skipTest("(no control socket)") - control_socket_file = control_socket.makefile() - stem.socket.send_message(control_socket_file, "blarg") - unrecognized_command_response = stem.socket.recv_message(control_socket_file) + control_socket.send("blarg") + unrecognized_command_response = control_socket.recv() self.assertEquals('Unrecognized command "blarg"', str(unrecognized_command_response)) self.assertEquals(['Unrecognized command "blarg"'], list(unrecognized_command_response)) self.assertEquals('510 Unrecognized command "blarg"\r\n', unrecognized_command_response.raw_content()) self.assertEquals([('510', ' ', 'Unrecognized command "blarg"')], unrecognized_command_response.content()) control_socket.close() - control_socket_file.close() def test_invalid_getinfo(self): """ @@ -100,17 +85,15 @@ class TestControlMessage(unittest.TestCase): control_socket = test.runner.get_runner().get_tor_socket() if not control_socket: self.skipTest("(no control socket)") - control_socket_file = control_socket.makefile() - stem.socket.send_message(control_socket_file, "GETINFO blarg") - unrecognized_key_response = stem.socket.recv_message(control_socket_file) + control_socket.send("GETINFO blarg") + unrecognized_key_response = control_socket.recv() self.assertEquals('Unrecognized key "blarg"', str(unrecognized_key_response)) self.assertEquals(['Unrecognized key "blarg"'], list(unrecognized_key_response)) self.assertEquals('552 Unrecognized key "blarg"\r\n', unrecognized_key_response.raw_content()) self.assertEquals([('552', ' ', 'Unrecognized key "blarg"')], unrecognized_key_response.content()) control_socket.close() - control_socket_file.close() def test_getinfo_config_file(self): """ @@ -122,17 +105,15 @@ class TestControlMessage(unittest.TestCase): control_socket = runner.get_tor_socket() if not control_socket: self.skipTest("(no control socket)") - control_socket_file = control_socket.makefile() - stem.socket.send_message(control_socket_file, "GETINFO config-file") - config_file_response = stem.socket.recv_message(control_socket_file) + control_socket.send("GETINFO config-file") + config_file_response = control_socket.recv() self.assertEquals("config-file=%s\nOK" % torrc_dst, str(config_file_response)) self.assertEquals(["config-file=%s" % torrc_dst, "OK"], list(config_file_response)) self.assertEquals("250-config-file=%s\r\n250 OK\r\n" % torrc_dst, config_file_response.raw_content()) self.assertEquals([("250", "-", "config-file=%s" % torrc_dst), ("250", " ", "OK")], config_file_response.content()) control_socket.close() - control_socket_file.close() def test_getinfo_config_text(self): """ @@ -160,10 +141,9 @@ class TestControlMessage(unittest.TestCase): control_socket = runner.get_tor_socket() if not control_socket: self.skipTest("(no control socket)") - control_socket_file = control_socket.makefile() - stem.socket.send_message(control_socket_file, "GETINFO config-text") - config_text_response = stem.socket.recv_message(control_socket_file) + control_socket.send("GETINFO config-text") + config_text_response = control_socket.recv() # the response should contain two entries, the first being a data response self.assertEqual(2, len(list(config_text_response))) @@ -181,7 +161,6 @@ class TestControlMessage(unittest.TestCase): self.assertTrue("%s" % torrc_entry in config_text_response.content()[0][2]) control_socket.close() - control_socket_file.close() def test_bw_event(self): """ @@ -190,10 +169,9 @@ class TestControlMessage(unittest.TestCase): control_socket = test.runner.get_runner().get_tor_socket() if not control_socket: self.skipTest("(no control socket)") - control_socket_file = control_socket.makefile() - stem.socket.send_message(control_socket_file, "SETEVENTS BW") - setevents_response = stem.socket.recv_message(control_socket_file) + control_socket.send("SETEVENTS BW") + setevents_response = control_socket.recv() self.assertEquals("OK", str(setevents_response)) self.assertEquals(["OK"], list(setevents_response)) self.assertEquals("250 OK\r\n", setevents_response.raw_content()) @@ -202,11 +180,10 @@ class TestControlMessage(unittest.TestCase): # Tor will emit a BW event once per second. Parsing two of them. for _ in range(2): - bw_event = stem.socket.recv_message(control_socket_file) + bw_event = control_socket.recv() self.assertTrue(re.match("BW [0-9]+ [0-9]+", str(bw_event))) self.assertTrue(re.match("650 BW [0-9]+ [0-9]+\r\n", bw_event.raw_content())) self.assertEquals(("650", " "), bw_event.content()[0][:2]) control_socket.close() - control_socket_file.close() diff --git a/test/runner.py b/test/runner.py index 52e9d25..ed0f798 100644 --- a/test/runner.py +++ b/test/runner.py @@ -27,6 +27,7 @@ import tempfile import binascii import threading +import stem.socket import stem.process import stem.util.conf import stem.util.enum @@ -315,41 +316,37 @@ class Runner: authenticate (bool) - if True then the socket is authenticated Returns: - socket.socket connected with our testing instance, returning None if we - either don't have a test instance or it can't be connected to + stem.socket.ControlSocket connected with our testing instance, returning + None if we either don't have a test instance or it can't be connected to """ - # TODO: replace with higher level connection functions when we have them - connection_type, cookie_path = self.get_connection_type(), self.get_auth_cookie_path() if connection_type == None: return None conn_opts = CONNECTION_OPTS[connection_type] if OPT_PORT in conn_opts: - control_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - control_socket.connect(("127.0.0.1", CONTROL_PORT)) + control_socket = stem.socket.ControlPort(control_port = CONTROL_PORT) elif OPT_SOCKET in conn_opts: - control_socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM) - control_socket.connect(CONTROL_SOCKET_PATH) + control_socket = stem.socket.ControlSocketFile(CONTROL_SOCKET_PATH) else: return None + control_socket.connect() + + # TODO: replace with higher level authentication functions when we have them if authenticate: - control_socket_file = control_socket.makefile() - if OPT_COOKIE in conn_opts: auth_cookie = open(cookie_path, "r") auth_cookie_contents = auth_cookie.read() auth_cookie.close() - stem.socket.send_message(control_socket_file, "AUTHENTICATE %s" % binascii.b2a_hex(auth_cookie_contents)) + control_socket.send("AUTHENTICATE %s" % binascii.b2a_hex(auth_cookie_contents)) elif OPT_PASSWORD in conn_opts: - stem.socket.send_message(control_socket_file, "AUTHENTICATE \"%s\"" % CONTROL_PASSWORD) + control_socket.send("AUTHENTICATE \"%s\"" % CONTROL_PASSWORD) else: - stem.socket.send_message(control_socket_file, "AUTHENTICATE") + control_socket.send("AUTHENTICATE") - authenticate_response = stem.socket.recv_message(control_socket_file) - control_socket_file.close() + authenticate_response = control_socket.recv() if str(authenticate_response) != "OK": # authentication was rejected

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 28 Nov '11

28 Nov '11

commit 92b62469503d609410010d11aef3c0a144526717 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 28 03:15:28 2011 +0000 Update translations for vidalia_help --- uk/index.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/uk/index.po b/uk/index.po index dbb47e2..455623e 100644 --- a/uk/index.po +++ b/uk/index.po @@ -1,12 +1,13 @@ # # Translators: +# <jonny_nut(a)hotmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 16:59+0200\n" -"PO-Revision-Date: 2010-11-30 05:02+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-28 02:51+0000\n" +"Last-Translator: jonny_nut <jonny_nut(a)hotmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,7 +18,7 @@ msgstr "" #. type: Content of: <html><body><h1> #: en/index.html:16 msgid "Vidalia Help" -msgstr "" +msgstr "Довідка Vidalia" #. type: Content of: <html><body><p> #: en/index.html:20

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 28 Nov '11

28 Nov '11

commit 2d49867c8bf0adbf61bc8ebf8420820a21e727d6 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 28 03:15:05 2011 +0000 Update translations for tsum --- uk/tsum.po | 615 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 615 insertions(+), 0 deletions(-) diff --git a/uk/tsum.po b/uk/tsum.po new file mode 100644 index 0000000..fa3d0b4 --- /dev/null +++ b/uk/tsum.po @@ -0,0 +1,615 @@ +# SOME DESCRIPTIVE TITLE +# Copyright (C) YEAR The Tor Project, Inc +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# <jonny_nut(a)hotmail.com>, 2011. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2011-11-05 17:16+0000\n" +"PO-Revision-Date: 2011-11-28 03:05+0000\n" +"Last-Translator: jonny_nut <jonny_nut(a)hotmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: uk\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" + +#. type: Plain text +#: en/tsum.text:2 +msgid "# The Short User Manual\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:7 +msgid "" +"This user manual contains information about how to download Tor, how to use " +"it, and what to do if Tor is unable to connect to the network. If you can't " +"find the answer to your question in this document, email " +"help(a)rt.torproject.org." +msgstr "" + +#. type: Plain text +#: en/tsum.text:11 +msgid "" +"Please note that we are providing support on a voluntary basis, and we get a" +" lot of emails every single day. There is no need to worry if we don't get " +"back to you straight away." +msgstr "" + +#. type: Plain text +#: en/tsum.text:13 +#, no-wrap +msgid "" +"How Tor works\n" +"-------------\n" +msgstr "" +"Як Tor працює\n" +"-------------\n" + +#. type: Plain text +#: en/tsum.text:19 +msgid "" +"Tor is a network of virtual tunnels that allows you to improve your privacy " +"and security on the Internet. Tor works by sending your traffic through " +"three random servers (also known as *relays*) in the Tor network, before the" +" traffic is sent out onto the public Internet." +msgstr "" + +#. type: Plain text +#: en/tsum.text:21 +msgid "![How Tor Works](images/how-tor-works.png)" +msgstr "[Як Tor Працює](images/how-tor-works.png)" + +#. type: Plain text +#: en/tsum.text:26 +msgid "" +"The image above illustrates a user browsing to different websites over Tor. " +"The green monitors represent relays in the Tor network, while the three keys" +" represent the layers of encryption between the user and each relay." +msgstr "" + +#. type: Plain text +#: en/tsum.text:31 +msgid "" +"Tor will anonymize the origin of your traffic, and it will encrypt " +"everything between you and the Tor network. Tor will also encrypt your " +"traffic inside the Tor network, but it cannot encrypt your traffic between " +"the Tor network and its final destination." +msgstr "" + +#. type: Plain text +#: en/tsum.text:36 +msgid "" +"If you are communicating sensitive information, for example when logging on " +"to a website with a username and password, make sure that you are using " +"HTTPS (e.g. **https**://torproject.org/, not **http**://torproject.org/)." +msgstr "" + +#. type: Plain text +#: en/tsum.text:38 +#, no-wrap +msgid "" +"How to download Tor\n" +"-------------------\n" +msgstr "" +"Як скачати Tor\n" +"-------------------\n" + +#. type: Plain text +#: en/tsum.text:44 +msgid "" +"The bundle we recommend to most users is the [Tor Browser " +"Bundle](https://www.torproject.org/projects/torbrowser.html). This bundle " +"contains a browser preconfigured to safely browse the Internet through Tor, " +"and requires no installation. You download the bundle, extract the archive, " +"and start Tor." +msgstr "" + +#. type: Plain text +#: en/tsum.text:48 +msgid "" +"There are two different ways to get hold of the Tor software. You can either" +" browse to the [Tor Project website](https://www.torproject.org/) and " +"download it there, or you can use GetTor, the email autoresponder." +msgstr "" + +#. type: Plain text +#: en/tsum.text:53 +msgid "" +"### How to get Tor via email\n" +"To receive the English Tor Browser Bundle for Windows, send an email to gettor(a)torproject.org with **windows** in the body of the message. You can leave the subject blank." +msgstr "" + +#. type: Plain text +#: en/tsum.text:57 +msgid "" +"You can also request the Tor Browser Bundle for Mac OS X (write " +"**macos-i386**), and Linux (write **linux-i386** for 32-bit systems or " +"**linux-x86_64** for 64-bit systems)." +msgstr "" + +#. type: Plain text +#: en/tsum.text:61 +msgid "" +"If you want a translated version of Tor, write **help** instead. You will " +"then receive an email with instructions and a list of available languages." +msgstr "" + +#. type: Plain text +#: en/tsum.text:67 +#, no-wrap +msgid "" +"**Note**: The Tor Browser Bundles for Linux and Mac OS X are rather\n" +"large, and you will not be able to receive any of these bundles with a\n" +"Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you\n" +"want, send an email to help(a)rt.torproject.org and we\n" +"will give you a list of website mirrors to use.\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:73 +msgid "" +"#### How to get Tor as several small sized packages\n" +"It is possible to request the Tor Browser Bundle for Windows as several small sized packages, instead of one big package. This can be useful if you don't have a lot of bandwidth available, or if your email provider does not allow you to receive large attachments." +msgstr "" + +#. type: Plain text +#: en/tsum.text:76 +msgid "" +"Send an email to gettor(a)torproject.org with the following words in the body " +"of the email:" +msgstr "" + +#. type: Plain text +#: en/tsum.text:79 +#, no-wrap +msgid "" +"windows \n" +"split\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:83 +msgid "" +"It is important that you include the keyword *split* on its own line. See " +"*What to do with split packages* for information on how to unpack and re-" +"assemble the small sized packages." +msgstr "" + +#. type: Plain text +#: en/tsum.text:89 +msgid "" +"### Tor for smartphones\n" +"You can get Tor on your Android device by installing the package named *Orbot*. For information about how to download and install Orbot, please see the [Tor Project website](https://www.torproject.org/docs/android.html.en)." +msgstr "" + +#. type: Plain text +#: en/tsum.text:93 +msgid "" +"We also have experimental packages for [Nokia " +"Maemo/N900](https://www.torproject.org/docs/N900.html.en) and [Apple " +"iOS](http://sid77.slackware.it/iphone/)." +msgstr "" + +#. type: Plain text +#: en/tsum.text:97 +msgid "" +"### How to verify that you have the right version\n" +"Before running the Tor Browser Bundle, you should make sure that you have the right version." +msgstr "" + +#. type: Plain text +#: en/tsum.text:102 +msgid "" +"The software you receive is accompanied by a file with the same name as the " +"bundle and the extension **.asc**. This .asc file is a GPG signature, and " +"will allow you to verify the file you've downloaded is exactly the one that " +"we intended you to get." +msgstr "" + +#. type: Plain text +#: en/tsum.text:105 +#, no-wrap +msgid "" +"Before you can verify the signature, you will have to download and\n" +"install GnuPG: \n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:109 +#, no-wrap +msgid "" +"**Windows**: [http://gpg4win.org/download.html](http://gpg4win.org/download.html) \n" +"**Mac OS X**: [http://macgpg.sourceforge.net/](http://macgpg.sourceforge.net/) \n" +"**Linux**: Most Linux distributions come with GnuPG preinstalled.\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:112 +msgid "" +"Please note that you may need to edit the paths and the commands used below " +"to get it to work on your system." +msgstr "" + +#. type: Plain text +#: en/tsum.text:115 +msgid "" +"Erinn Clark signs the Tor Browser Bundles with key 0x63FEE659. To import " +"Erinn's key, run:" +msgstr "" + +#. type: Plain text +#: en/tsum.text:117 +#, no-wrap +msgid "\tgpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:119 +msgid "After importing the key, verify that the fingerprint is correct:" +msgstr "" + +#. type: Plain text +#: en/tsum.text:121 +#, no-wrap +msgid "\tgpg --fingerprint 0x63FEE659\n" +msgstr "" +"<span class=\"whitespace other\" title=\"Tab\">»</span>gpg --fingerprint " +"0x63FEE659\n" + +#. type: Plain text +#: en/tsum.text:123 +msgid "You should see:" +msgstr "Ви повинні побачити:" + +#. type: Plain text +#: en/tsum.text:130 +#, no-wrap +msgid "" +"\tpub 2048R/63FEE659 2003-10-16\n" +"\t Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659\n" +"\tuid Erinn Clark <erinn(a)torproject.org>\n" +"\tuid Erinn Clark <erinn(a)debian.org>\n" +"\tuid Erinn Clark <erinn(a)double-helix.org>\n" +"\tsub 2048R/EB399FD7 2003-10-16\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:132 +msgid "" +"To verify the signature of the package you downloaded, run the following " +"command:" +msgstr "" + +#. type: Plain text +#: en/tsum.text:134 +#, no-wrap +msgid "" +"\tgpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-" +"US.exe\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:140 +msgid "" +"The output should say *\"Good signature\"*. A bad signature means that the " +"file may have been tampered with. If you see a bad signature, send details " +"about where you downloaded the package from, how you verified the signature," +" and the output from GnuPG in an email to help(a)rt.torproject.org." +msgstr "" + +#. type: Plain text +#: en/tsum.text:147 +msgid "" +"Once you have verified the signature and seen the *\"Good signature\"* " +"output, go ahead and extract the package archive. You should then see a " +"directory similar to **tor-browser_en-US**. Inside that directory is another" +" directory called **Docs**, which contains a file called **changelog**. You " +"want to make sure that the version number on the top line of the changelog " +"file matches the version number in the filename." +msgstr "" + +#. type: Plain text +#: en/tsum.text:153 +msgid "" +"### How to use the Tor Browser Bundle\n" +"After downloading the Tor Browser Bundle and extracting the package, you should have a directory with a few files in it. One of the files is an executable called \"Start Tor Browser\" (or \"start-tor-browser\", depending on your operating system)." +msgstr "" + +#. type: Plain text +#: en/tsum.text:160 +msgid "" +"When you start the Tor Browser Bundle, you will first see Vidalia start up " +"and connect you to the Tor network. After that, you will see a browser " +"confirming that you are now using Tor. This is done by displaying " +"[https://check.torproject.org/](https://check.torproject.org/). You can now " +"browse the Internet through Tor." +msgstr "" + +#. type: Plain text +#: en/tsum.text:163 +#, no-wrap +msgid "" +"*Please note that it is important that you use the browser that comes\n" +"with the bundle, and not your own browser.*\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:169 +msgid "" +"### What to do when Tor does not connect\n" +"Some users will notice that Vidalia gets stuck when trying to connect to the Tor network. If this happens, make sure that you are connected to the Internet. If you need to connect to a proxy server, see *How to use an open proxy* below." +msgstr "" + +#. type: Plain text +#: en/tsum.text:174 +msgid "" +"If your normal Internet connection is working, but Tor still can't connect " +"to the network, try the following; open the Vidalia control panel, click on " +"*Message Log* and select the *Advanced* tab. It may be that Tor won't " +"connect because:" +msgstr "" + +#. type: Plain text +#: en/tsum.text:178 +#, no-wrap +msgid "" +"**Your system clock is off**: Make sure that the date and time on your\n" +"system is correct, and restart Tor. You may need to synchronize your\n" +"system clock with an Internet time server. \n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:183 +#, no-wrap +msgid "" +"**You are behind a restrictive firewall**: To tell Tor to only try port\n" +"80 and port 443, open the Vidalia control panel, click on *Settings* and\n" +"*Network*, and tick the box that says *My firewall only lets me connect\n" +"to certain ports*. \n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:187 +#, no-wrap +msgid "" +"**Your anti-virus program is blocking Tor**: Make sure that your\n" +"anti-virus program is not preventing Tor from making network\n" +"connections.\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:191 +msgid "" +"If Tor still doesn't work, it's likely that your Internet Service Provider " +"(ISP) is blocking Tor. Very often this can be worked around with **Tor " +"bridges**, hidden relays that aren't as easy to block." +msgstr "" + +#. type: Plain text +#: en/tsum.text:195 +msgid "" +"If you need help with figuring out why Tor can't connect, send an email to " +"help(a)rt.torproject.org and include the relevant parts from the log file." +msgstr "" + +#. type: Plain text +#: en/tsum.text:203 +msgid "" +"### How to find a bridge\n" +"To use a bridge, you will first have to locate one; you can either browse to [bridges.torproject.org](https://bridges.torproject.org/), or you can send an email to bridges(a)torproject.org. If you do send an email, please make sure that you write **get bridges** in the body of the email. Without this, you will not get a reply. Note that you need to send this email from either a gmail.com or a yahoo.com address." +msgstr "" + +#. type: Plain text +#: en/tsum.text:208 +msgid "" +"Configuring more than one bridge address will make your Tor connection more " +"stable, in case some of the bridges become unreachable. There is no " +"guarantee that the bridge you are using now will work tomorrow, so you " +"should make a habit of updating your list of bridges every so often." +msgstr "" + +#. type: Plain text +#: en/tsum.text:214 +msgid "" +"### How to use a bridge\n" +"Once you have a set of bridges to use, open the Vidalia control panel, click on *Settings*, *Network* and tick the box that says *My ISP blocks connections to the Tor network*. Enter the bridges in the box below, hit *OK* and start Tor again." +msgstr "" + +#. type: Plain text +#: en/tsum.text:220 +msgid "" +"### How to use an open proxy\n" +"If using a bridge does not work, try configuring Tor to use any HTTPS or SOCKS proxy to get access to the Tor network. This means even if Tor is blocked by your local network, open proxies can be safely used to connect to the Tor Network and on to the uncensored Internet." +msgstr "" + +#. type: Plain text +#: en/tsum.text:223 +msgid "" +"The steps below assume you have a functional Tor/Vidalia configuration, and " +"you have found a list of HTTPS, SOCKS4, or SOCKS5 proxies." +msgstr "" + +#. type: Bullet: '1. ' +#: en/tsum.text:235 +msgid "Open the Vidalia control panel, click on *Settings*." +msgstr "Відкрийте панель управління у Vidalia, натисніть на *Установки*." + +#. type: Bullet: '2. ' +#: en/tsum.text:235 +msgid "Click *Network*. Select *I use a proxy to access the Internet*." +msgstr "" +"Натисніть *Мережа*. Вибнріть *Я використовую проксі для доступу в Інтернет*." + +#. type: Plain text +#: en/tsum.text:235 +#, no-wrap +msgid "" +"3. On the *Address* line, enter the open proxy address. This can be a\n" +"hostname or an IP Address.\n" +"4. Enter the port for the proxy.\n" +"5. Generally, you do not need a username and password. If you do,\n" +"enter the information in the proper fields.\n" +"6. Choose the *Type* of proxy you are using, whether HTTP/HTTPS, SOCKS4,\n" +"or SOCKS5.\n" +"7. Push the *OK* button. Vidalia and Tor are now configured to use a\n" +"proxy to access the rest of the Tor network.\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:240 +msgid "" +"## Frequently Asked Questions\n" +"This section will answer some of the most common questions. If your question is not mentioned here, please send an email to help(a)rt.torproject.org." +msgstr "" + +#. type: Plain text +#: en/tsum.text:244 +msgid "" +"### Unable to extract the archive\n" +"If you are using Windows and find that you cannot extract the archive, download and install [7-Zip](http://www.7-zip.org/)." +msgstr "" + +#. type: Plain text +#: en/tsum.text:248 +msgid "" +"If you are unable to download 7-Zip, try to rename the file from .z to .zip " +"and use winzip to extract the archive. Before renaming the file, tell " +"Windows to show file extensions:" +msgstr "" + +#. type: Plain text +#: en/tsum.text:254 +msgid "" +"#### Windows XP\n" +"1. Open *My Computer*\n" +"2. Click on *Tools* and choose *Folder Options...* in the menu\n" +"3. Click on the *View* tab\n" +"4. Uncheck *Hide extensions for known file types* and click *OK*" +msgstr "" + +#. type: Plain text +#: en/tsum.text:260 +msgid "" +"#### Windows Vista\n" +"1. Open *Computer*\n" +"2. Click on *Organize* and choose *Folder and search options* in the menu\n" +"3. Click on the *View* tab\n" +"4. Uncheck *Hide extensions for known file types* and click *OK*" +msgstr "" + +#. type: Plain text +#: en/tsum.text:266 +msgid "" +"#### Windows 7\n" +"1. Open *Computer*\n" +"2. Click on *Organize* and choose *Folder and search options* in the menu\n" +"3. Click on the *View* tab\n" +" 4. Uncheck *Hide extensions for known file types* and click *OK*" +msgstr "" + +#. type: Plain text +#: en/tsum.text:273 +msgid "" +"### What to do with split packages\n" +"When you request a split package, the parts may arrive out of order. You need to make sure you have received all the parts before you attempt to unpack them. Save all the parts into one directory on your computer, unzip them, and double-click the file that ends in \"..split.part01.exe\" to start the unpacking process." +msgstr "" + +#. type: Plain text +#: en/tsum.text:277 +msgid "" +"Once the unpacking process has completed, you should see a newly created " +"\".exe\" file in the same directory. Run this file and wait for the Tor " +"Browser Bundle to start." +msgstr "" + +#. type: Plain text +#: en/tsum.text:281 +msgid "" +"### Vidalia asks for a password\n" +"You should not have to enter a password when starting Vidalia. If you are prompted for one, you are likely affected by one of these problems:" +msgstr "" + +#. type: Plain text +#: en/tsum.text:287 +#, no-wrap +msgid "" +"**You are already running Vidalia and Tor**:\n" +"For example, this situation can happen if you installed the Vidalia\n" +"bundle and now you're trying to run the Tor Browser Bundle. In that\n" +"case, you will need to close the old Vidalia and Tor before you can run\n" +"this one.\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:294 +#, no-wrap +msgid "" +"**Vidalia crashed, but left Tor running**:\n" +"If the dialog that prompts you for a control password has a Reset\n" +"button, you can click the button and Vidalia will restart Tor with a new\n" +"random control password. If you do not see a Reset button, or if Vidalia\n" +"is unable to restart Tor for you; go into your process or task manager,\n" +"and terminate the Tor process. Then use Vidalia to restart Tor.\n" +msgstr "" + +#. type: Plain text +#: en/tsum.text:298 +msgid "" +"For more information, see the " +"[FAQ](https://torproject.org/docs/faq.html#VidaliaPassword) on the Tor " +"Project website." +msgstr "" +"Щоб отримання додаткову інформацію, переглянте [ЧАП] " +"(https://torproject.org/docs/faq.html#VidaliaPassword) на веб-сайті Проєкту " +"Tor." + +#. type: Plain text +#: en/tsum.text:303 +msgid "" +"### Flash does not work\n" +"For security reasons, Flash, Java, and other plugins are currently disabled for Tor. Plugins operate independently from Firefox and can perform activity on your computer that ruins your anonymity." +msgstr "" + +#. type: Plain text +#: en/tsum.text:308 +msgid "" +"Most YouTube videos work with HTML5, and it is possible to view these videos" +" over Tor. You need to join the [HTML5 trial](https://www.youtube.com/html5)" +" on the YouTube website before you can use the HTML5 player." +msgstr "" + +#. type: Plain text +#: en/tsum.text:312 +msgid "" +"Note that the browser will not remember that you joined the trial once you " +"close it, so you will need to re-join the trial the next time you run the " +"Tor Browser Bundle." +msgstr "" + +#. type: Plain text +#: en/tsum.text:315 +msgid "" +"Please see the [Torbutton FAQ](https://www.torproject.org/torbutton" +"/torbutton-faq.html#noflash) for more information." +msgstr "" + +#. type: Plain text +#: en/tsum.text:321 +msgid "" +"### I want to use another browser\n" +"For security reasons, we recommend that you only browse the web through Tor using the Tor Browser Bundle. It is technically possible to use Tor with other browsers, but by doing so you open yourself up to potential attacks." +msgstr "" + +#. type: Plain text +#: en/tsum.text:325 +msgid "" +"### Why Tor is slow\n" +"Tor can sometimes be a bit slower than your normal Internet connection. After all, your traffic is sent through many different countries, sometimes across oceans around the world!" +msgstr "" + +

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 28 Nov '11

28 Nov '11

commit d85dee265cf53b67f43a080d3aeac15f10544802 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 28 00:45:05 2011 +0000 Update translations for tsum --- hu/tsum.po | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/hu/tsum.po b/hu/tsum.po index 6c6bbc5..635be13 100644 --- a/hu/tsum.po +++ b/hu/tsum.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: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-28 00:03+0000\n" +"PO-Revision-Date: 2011-11-28 00:40+0000\n" "Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -217,6 +217,8 @@ msgid "" "### Tor for smartphones\n" "You can get Tor on your Android device by installing the package named *Orbot*. For information about how to download and install Orbot, please see the [Tor Project website](https://www.torproject.org/docs/android.html.en)." msgstr "" +"### A Tor okostelefonokra\n" +"Tor-t beszerezhet Android készülékekre az *Orbot* csomag telepítésével. További infromációkér az Orbot letöltéséhez és telepítéséhez kérjük látogassa meg a [Tor Project](https://www.torproject.org/docs/android.html.en) weboldal-át." #. type: Plain text #: en/tsum.text:93

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 28 Nov '11

28 Nov '11

commit b7505a6c55efa72296941becd358bff374857191 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 28 00:15:05 2011 +0000 Update translations for tsum --- hu/tsum.po | 15 ++++++++++++++- 1 files changed, 14 insertions(+), 1 deletions(-) diff --git a/hu/tsum.po b/hu/tsum.po index 0f51dbf..6c6bbc5 100644 --- a/hu/tsum.po +++ b/hu/tsum.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: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-27 23:09+0000\n" +"PO-Revision-Date: 2011-11-28 00:03+0000\n" "Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -31,6 +31,10 @@ msgid "" "find the answer to your question in this document, email " "help(a)rt.torproject.org." msgstr "" +"Ez a felhasználói kézikönyv azt mutatja be hogyan töltheti le és " +"használhatja a Tor-t és mit tehet akkor, ha a Tor nem tud csatlakozni a " +"hálózathoz. Ha nem találja a választ benne a kérdésére, akkor írjon egy " +"levelet a help(a)rt.torproject.org címre." #. type: Plain text #: en/tsum.text:11 @@ -39,6 +43,9 @@ msgid "" " lot of emails every single day. There is no need to worry if we don't get " "back to you straight away." msgstr "" +"Kérjük vegye figyelembe, hogy támogatást csak önkéntes segítőkön keresztül " +"tudunk adni, mert rengeteg emailt kapunk minden egyes nap. Szóval ne " +"idegeskedjen, ha nem kap választ azonnal." #. type: Plain text #: en/tsum.text:13 @@ -95,6 +102,9 @@ msgid "" "to a website with a username and password, make sure that you are using " "HTTPS (e.g. **https**://torproject.org/, not **http**://torproject.org/)." msgstr "" +"Ha érzékeny információt ad meg, például belép egy weboldalra, " +"felhasználónévvel és jelszóval, ellenőrizze, hogy HTTPS protokollt használ. " +"(azaz **https**://torproject.org/ és nem **http**://torproject.org/ )." #. type: Plain text #: en/tsum.text:38 @@ -215,6 +225,9 @@ msgid "" "Maemo/N900](https://www.torproject.org/docs/N900.html.en) and [Apple " "iOS](http://sid77.slackware.it/iphone/)." msgstr "" +"Továbbá vannak kísérleti csomagjaink [Nokia " +"Maemo/N900](https://www.torproject.org/docs/N900.html.en) és [Apple " +"iOS](http://sid77.slackware.it/iphone/) telefonokra." #. type: Plain text #: en/tsum.text:97

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 28 Nov '11

28 Nov '11

commit ca5af880474ff7887032badef8e39c15581ebfcd Author: Translation commit bot <translation(a)torproject.org> Date: Sun Nov 27 23:15:05 2011 +0000 Update translations for tsum --- hu/tsum.po | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hu/tsum.po b/hu/tsum.po index 32ff290..0f51dbf 100644 --- a/hu/tsum.po +++ b/hu/tsum.po @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-05 17:16+0000\n" -"PO-Revision-Date: 2011-11-05 21:28+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2011-11-27 23:09+0000\n" +"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +21,7 @@ msgstr "" #. type: Plain text #: en/tsum.text:2 msgid "# The Short User Manual\n" -msgstr "" +msgstr "# Rövid Felhasználói kézikönyv\n" #. type: Plain text #: en/tsum.text:7

1 0