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

[torbrowser/master] Update obfsproxy version to 0.1.4
by erinn＠torproject.org 11 May '12

11 May '12

commit ef95067e02b4f9ded7748fa42e7b9ec4be06e3f7 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu May 10 09:20:26 2012 +0200 Update obfsproxy version to 0.1.4 --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 6ddffad..9d865b2 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -17,7 +17,7 @@ TORBUTTON_VER=1.4.5.1 NOSCRIPT_VER=2.3.9 … [View More]

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 11 May '12

11 May '12

commit 0caa05d8ae7a4d1943d2bba37d4bc489851c0ecd Merge: daad02b 8ce8d71 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 11 16:11:31 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 11 May '12

11 May '12

commit fe9c51463e759d8f7b9e05a2dc527db9d3da7984 Merge: 0caa05d 9c82539 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri May 11 16:12:17 2012 -0300 Merge branch 'maint-2.2' into maint-2.3 build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0

[tor/master] Fix a couple of wide lines
by nickm＠torproject.org 11 May '12

11 May '12

commit 4bac2233116f0d94fd6ad1e77acb0baceeaf2336 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 11 13:01:07 2012 -0400 Fix a couple of wide lines --- src/or/transports.c | 3 ++- src/test/test_util.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index 0082b6a..5f650d1 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -999,7 +999,8 @@ create_managed_proxy_environment(const … [View More]

1 0

[stem/master] Expanding launch_tor to support commandline options
by atagar＠torproject.org 11 May '12

11 May '12

commit f3c5f334ce84621547139ae70eedb2c3fbfa2076 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 11 09:05:18 2012 -0700 Expanding launch_tor to support commandline options When writing small scripts we often want to start a tor instance for a special purpose, for instance to test a new feature. When doing this we want a bare-bones tor instance with just a few specific options. Adding better support for this by making the launch_tor function accept … [View More]command-line options and the ability to use a blank torrc. --- stem/process.py | 33 +++++++++++++++++++++++++++++---- test/runner.py | 2 +- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/stem/process.py b/stem/process.py index 2b00117..8d65072 100644 --- a/stem/process.py +++ b/stem/process.py @@ -8,12 +8,18 @@ launch_tor - starts up a tor process import re import os import signal +import tempfile import subprocess # number of seconds before we time out our attempt to start a tor instance DEFAULT_INIT_TIMEOUT = 90 -def launch_tor(tor_cmd = "tor", torrc_path = None, completion_percent = 100, init_msg_handler = None, timeout = DEFAULT_INIT_TIMEOUT): +# special parameter that can be set for the torrc_path to run with a blank +# configuration + +NO_TORRC = "<no torrc>" + +def launch_tor(tor_cmd = "tor", options = None, torrc_path = None, completion_percent = 100, init_msg_handler = None, timeout = DEFAULT_INIT_TIMEOUT): """ Initializes a tor process. This blocks until initialization completes or we error out. @@ -25,6 +31,7 @@ def launch_tor(tor_cmd = "tor", torrc_path = None, completion_percent = 100, ini Arguments: tor_cmd (str) - command for starting tor + options (dict) - configuration options, such as ("ControlPort": "9051") torrc_path (str) - location of the torrc for us to use completion_percent (int) - percent of bootstrap completion at which this'll return @@ -42,18 +49,32 @@ def launch_tor(tor_cmd = "tor", torrc_path = None, completion_percent = 100, ini """ # double check that we have a torrc to work with - if not os.path.exists(torrc_path): + if not torrc_path in (None, NO_TORRC) and not os.path.exists(torrc_path): raise OSError("torrc doesn't exist (%s)" % torrc_path) # starts a tor subprocess, raising an OSError if it fails - runtime_args = [tor_cmd] - if torrc_path: runtime_args += ["-f", torrc_path] + runtime_args, temp_file = [tor_cmd], None + if torrc_path: + if torrc_path == NO_TORRC: + temp_file = tempfile.mkstemp("-empty-torrc", text = True)[1] + runtime_args += ["-f", temp_file] + else: + runtime_args += ["-f", torrc_path] + + if options: + for key, value in options.items(): + value = value.replace('"', '\\"') + runtime_args += ["--%s" % key.lower(), value] tor_process = subprocess.Popen(runtime_args, stdout = subprocess.PIPE, stderr = subprocess.PIPE) if timeout: def timeout_handler(signum, frame): # terminates the uninitialized tor process and raise on timeout + if temp_file: + try: os.remove(temp_file) + except: pass + tor_process.kill() raise OSError("reached a %i second timeout without success" % timeout) @@ -77,5 +98,9 @@ def launch_tor(tor_cmd = "tor", torrc_path = None, completion_percent = 100, ini bootstrap_match = bootstrap_line.search(init_line) if bootstrap_match and int(bootstrap_match.groups()[0]) >= completion_percent: + if temp_file: + try: os.remove(temp_file) + except: pass + return tor_process diff --git a/test/runner.py b/test/runner.py index 66636f2..6acc68e 100644 --- a/test/runner.py +++ b/test/runner.py @@ -637,7 +637,7 @@ class Runner: print_init_line = lambda line: test.output.print_line(" %s" % line, *SUBSTATUS_ATTR) torrc_dst = os.path.join(self._test_dir, "torrc") - self._tor_process = stem.process.launch_tor(tor_cmd, torrc_dst, complete_percent, print_init_line) + self._tor_process = stem.process.launch_tor(tor_cmd, None, torrc_dst, complete_percent, print_init_line) runtime = time.time() - start_time test.output.print_line(" done (%i seconds)\n" % runtime, *STATUS_ATTR) [View Less]

1 0

[stem/master] Integ tests for launch_tor
by atagar＠torproject.org 11 May '12

11 May '12

commit bfb3973049c72a9bd6de951566417eca7e132e70 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 11 09:28:51 2012 -0700 Integ tests for launch_tor I've been leaving launch_tor untested because it was exercised in order to run the integ tests and any tests involving it would take a long time, on the order of a dozen seconds! Hey, it's a long time when you run this as often as I do... It's an important function and has more options than what's … [View More]exercised for running integ tests so adding some tests for it. --- run_tests.py | 2 + test/integ/__init__.py | 2 +- test/integ/process.py | 65 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 1 deletions(-) diff --git a/run_tests.py b/run_tests.py index 9ee6042..818bfb8 100755 --- a/run_tests.py +++ b/run_tests.py @@ -37,6 +37,7 @@ import test.integ.descriptor.reader import test.integ.descriptor.server_descriptor import test.integ.util.conf import test.integ.util.system +import test.integ.process import test.integ.version import stem.util.conf @@ -106,6 +107,7 @@ INTEG_TESTS = ( test.integ.descriptor.reader.TestDescriptorReader, test.integ.descriptor.server_descriptor.TestServerDescriptor, test.integ.version.TestVersion, + test.integ.process.TestProcess, test.integ.socket.control_socket.TestControlSocket, test.integ.socket.control_message.TestControlMessage, test.integ.connection.protocolinfo.TestProtocolInfo, diff --git a/test/integ/__init__.py b/test/integ/__init__.py index a50d3f3..a9bb9ef 100644 --- a/test/integ/__init__.py +++ b/test/integ/__init__.py @@ -2,5 +2,5 @@ Integration tests for the stem library. """ -__all__ = ["connection", "control", "descriptor", "socket", "util", "version"] +__all__ = ["connection", "control", "descriptor", "process", "socket", "util", "version"] diff --git a/test/integ/process.py b/test/integ/process.py new file mode 100644 index 0000000..b03fb27 --- /dev/null +++ b/test/integ/process.py @@ -0,0 +1,65 @@ +""" +Tests the stem.process functions with various use cases. +""" + +import time +import unittest + +import stem.socket +import stem.process +import test.runner + +# Tests are target independent. Only run once even if there's multiple targets. + +RAN_TESTS = [] + +class TestProcess(unittest.TestCase): + def test_launch_tor_options(self): + """ + Runs launch_tor with options specified via the commandline rather than the + torrc. + """ + + test_name = 'test_launch_tor_options' + if test_name in RAN_TESTS: self.skipTest("(already ran)") + + # Launch tor without a torrc, but with a control port. Confirms that this + # works by checking that we're still able to access the new instance. + + tor_process = stem.process.launch_tor( + options = {'SocksPort': '2777', 'ControlPort': '2778'}, + torrc_path = stem.process.NO_TORRC, + completion_percent = 5 + ) + + control_socket = None + try: + control_socket = stem.socket.ControlPort(control_port = 2778) + runner = test.runner.get_runner() + stem.connection.authenticate(control_socket, chroot_path = runner.get_chroot()) + + # exercises the socket + control_socket.send("GETINFO version") + version_response = control_socket.recv() + self.assertEquals("version=%s\nOK" % runner.get_tor_version(), str(version_response)) + finally: + if control_socket: control_socket.close() + tor_process.kill() + + RAN_TESTS.append(test_name) + + def test_launch_tor_with_timeout(self): + """ + Runs launch_tor where it times out before completing. + """ + + test_name = 'test_launch_tor_with_timeout' + if test_name in RAN_TESTS: self.skipTest("(already ran)") + + start_time = time.time() + self.assertRaises(OSError, stem.process.launch_tor, "tor", {'SocksPort': '2777'}, stem.process.NO_TORRC, 100, None, 2) + runtime = time.time() - start_time + self.assertTrue(runtime > 2 and runtime < 3) + + RAN_TESTS.append(test_name) + [View Less]

1 0

[tor/master] Generalize fmt_addr() to support IPv6 decorations.
by nickm＠torproject.org 11 May '12

11 May '12

commit da6e0993dc4a0037933a522e2f578c145f6538cc Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Mar 31 13:48:20 2012 +0200 Generalize fmt_addr() to support IPv6 decorations. --- src/common/address.c | 4 ++-- src/common/address.h | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index 676c485..62cf16c 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -991,11 +991,11 @@ tor_dup_addr(… [View More]

1 0

[tor/master] Introduce and use router_get_active_listener_port_by_type().
by nickm＠torproject.org 11 May '12

11 May '12

commit fedf76a2e6452124c38ecc51cea6567b9d5cc23d Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Mar 31 13:54:09 2012 +0200 Introduce and use router_get_active_listener_port_by_type(). router_get_active_listener_port_by_type() iterates all connections, trying to find a listener of a specific type, and returns its TCP port. --- src/or/router.c | 35 +++++++++++++++++++++++------------ src/or/router.h | 1 + 2 files changed, 24 insertions(+), 12 … [View More]deletions(-) diff --git a/src/or/router.c b/src/or/router.c index bf15689..67d26e1 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1216,6 +1216,20 @@ consider_publishable_server(int force) } } +/** Return the port of the first active listener of type + * listener_type. */ +uint16_t +router_get_active_listener_port_by_type(int listener_type) +{ + /* Iterate all connections, find one of the right kind and return + the port. Not very sophisticated or fast, but effective. */ + const connection_t *c = connection_get_by_type(listener_type); + if (c) + return c->port; + + return 0; +} + /** Return the port that we should advertise as our ORPort; this is either * the one configured in the ORPort option, or the one we actually bound to * if ORPort is "auto". @@ -1226,12 +1240,11 @@ router_get_advertised_or_port(const or_options_t *options) int port = get_primary_or_port(); (void)options; - if (port == CFG_AUTO_PORT) { - connection_t *c = connection_get_by_type(CONN_TYPE_OR_LISTENER); - if (c) - return c->port; - return 0; - } + /* If the port is in 'auto' mode, we have to use + router_get_listener_port_by_type(). */ + if (port == CFG_AUTO_PORT) + return router_get_active_listener_port_by_type(CONN_TYPE_OR_LISTENER); + return port; } @@ -1248,12 +1261,10 @@ router_get_advertised_dir_port(const or_options_t *options, uint16_t dirport) if (!dirport_configured) return dirport; - if (dirport_configured == CFG_AUTO_PORT) { - connection_t *c = connection_get_by_type(CONN_TYPE_DIR_LISTENER); - if (c) - return c->port; - return 0; - } + + if (dirport_configured == CFG_AUTO_PORT) + return router_get_active_listener_port_by_type(CONN_TYPE_DIR_LISTENER); + return dirport_configured; } diff --git a/src/or/router.h b/src/or/router.h index fb91434..294736e 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -53,6 +53,7 @@ int authdir_mode_publishes_statuses(const or_options_t *options); int authdir_mode_tests_reachability(const or_options_t *options); int authdir_mode_bridge(const or_options_t *options); +uint16_t router_get_active_listener_port_by_type(int listener_type); uint16_t router_get_advertised_or_port(const or_options_t *options); uint16_t router_get_advertised_dir_port(const or_options_t *options, uint16_t dirport); [View Less]

1 0

[tor/master] Pass OR address to PT proxy, even with IPv6 or ORListenAddress.
by nickm＠torproject.org 11 May '12

11 May '12

commit 10232dc0423792a8fb61b9ec136d7ffd5484216b Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Mar 31 14:04:58 2012 +0200 Pass OR address to PT proxy, even with IPv6 or ORListenAddress. Introduce get_first_listener_addrport_for_pt() which returns a string containing the addrport of the first listener we could find. Use it to form the TOR_PT_ORPORT managed proxy protocol line. --- src/or/config.c | 53 +++++++++++++++++++++++++++++++++++++++++++++… [View More]++++++ src/or/config.h | 2 + src/or/transports.c | 9 ++++--- 3 files changed, 60 insertions(+), 4 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 2a8c540..5ea1f5e 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6026,6 +6026,59 @@ get_configured_ports(void) return configured_ports; } +/** Return an <address>:<port> string representation of the address + * where the first listener_type listener waits for + * connections. Return NULL if we couldn't find a listener. The + * string is allocated on the heap and it's the responsibility of the + * caller to free it after use. + * + * This function is meant to be used by the pluggable transport proxy + * spawning code. */ +char * +get_first_listener_addrport_for_pt(int listener_type) +{ + static const char *ipv4_localhost = "127.0.0.1"; + static const char *ipv6_localhost = "[::1]"; + const char *address; + uint16_t port; + char *string = NULL; + + if (!configured_ports) + return NULL; + + SMARTLIST_FOREACH_BEGIN(configured_ports, const port_cfg_t *, cfg) { + + if (cfg->type == listener_type && + tor_addr_family(&cfg->addr) != AF_UNSPEC) { + + /* We found the first listener of the type we are interested in! */ + + /* If a listener is listening on INADDR_ANY, assume that it's + also listening on 127.0.0.1, and point the transport proxy + there: */ + if (tor_addr_is_null(&cfg->addr)) + address = tor_addr_is_v4(&cfg->addr) ? ipv4_localhost : ipv6_localhost; + else + address = fmt_and_decorate_addr(&cfg->addr); + + /* If a listener is configured with port 'auto', we are forced + to iterate all listener connections and find out in which + port it ended up listening: */ + if (cfg->port == CFG_AUTO_PORT) + port = router_get_active_listener_port_by_type(listener_type); + else + port = cfg->port; + + tor_asprintf(&string, "%s:%u", address, port); + + return string; + } + + } SMARTLIST_FOREACH_END(cfg); + + return NULL; +} + /** Return the first advertised port of type listener_type in address_family. */ int diff --git a/src/or/config.h b/src/or/config.h index 0f7c618..fd84d9b 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -72,6 +72,8 @@ int get_first_advertised_port_by_type_af(int listener_type, #define get_primary_dir_port() \ (get_first_advertised_port_by_type_af(CONN_TYPE_DIR_LISTENER, AF_INET)) +char *get_first_listener_addrport_for_pt(int listener_type); + int options_need_geoip_info(const or_options_t *options, const char **reason_out); diff --git a/src/or/transports.c b/src/or/transports.c index 564603e..1f21493 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -957,8 +957,6 @@ get_bindaddr_for_server_proxy(const managed_proxy_t *mp) static process_environment_t * create_managed_proxy_environment(const managed_proxy_t *mp) { - const or_options_t *options = get_options(); - /* Environment variables to be added to or set in mp's environment. */ smartlist_t *envs = smartlist_new(); /* XXXX The next time someone touches this code, shorten the name of @@ -993,8 +991,11 @@ create_managed_proxy_environment(const managed_proxy_t *mp) } if (mp->is_server) { - smartlist_add_asprintf(envs, "TOR_PT_ORPORT=127.0.0.1:%s", - options->ORPort->value); + { + char *orport_tmp = get_first_listener_addrport_for_pt(CONN_TYPE_OR_LISTENER); + smartlist_add_asprintf(envs, "TOR_PT_ORPORT=%s", orport_tmp); + tor_free(orport_tmp); + } { char *bindaddr_tmp = get_bindaddr_for_server_proxy(mp); [View Less]

1 0

[tor/master] Add changes file for #4865.
by nickm＠torproject.org 11 May '12

11 May '12

commit b03f90b5383744593dc1e83fc5834c965573a4dc Author: George Kadianakis <desnacked(a)riseup.net> Date: Sat Mar 31 14:05:12 2012 +0200 Add changes file for #4865. --- changes/bug4865 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug4865 b/changes/bug4865 new file mode 100644 index 0000000..e165c41 --- /dev/null +++ b/changes/bug4865 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Pass correct OR address to managed proxies, even when + … [View More]

1 0