- tor-commits - lists.torproject.org

[stem/master] Testing and fix for invalid auth cookies
by atagar＠torproject.org 09 Dec '11

09 Dec '11

commit bd51ff4d69decfc866366a5381bd1ba0dc7ee866 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Dec 9 09:47:17 2011 -0800 Testing and fix for invalid auth cookies Adding a test and fix for when the authentication cookie is the right size but has the wrong contents. --- stem/connection.py | 5 ++- test/integ/connection/authentication.py | 47 +++++++++++++++++++++++++++--- test/runner.py | 14 +++++++++ 3 files changed, 59 insertions(+), 7 deletions(-) diff --git a/stem/connection.py b/stem/connection.py index 850a1f3..938ab2f 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -278,10 +278,11 @@ def authenticate_cookie(control_socket, cookie_path, suppress_ctl_errors = True) control_socket.close() # all we have to go on is the error message from tor... - # ... Wrong length on authentication cookie. + # ... Authentication cookie did not match expected value. # ... *or* authentication cookie. - if "authentication cookie." in str(auth_response): + if "*or* authentication cookie." in str(auth_response) or \ + "Authentication cookie did not match expected value." in str(auth_response): raise IncorrectCookieValue(str(auth_response), auth_response) else: raise CookieAuthRejected(str(auth_response), auth_response) diff --git a/test/integ/connection/authentication.py b/test/integ/connection/authentication.py index d7d0817..ee36946 100644 --- a/test/integ/connection/authentication.py +++ b/test/integ/connection/authentication.py @@ -17,7 +17,9 @@ 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." -# this only arises in password-only auth when we authenticate by password +# this only arises in cookie-only or password-only auth when we authenticate +# with the wrong value +INCORRECT_COOKIE_FAIL = "Authentication failed: Authentication cookie did not match expected value." INCORRECT_PASSWORD_FAIL = "Authentication failed: Password did not match HashedControlPassword value from configuration" class TestAuthenticate(unittest.TestCase): @@ -88,6 +90,34 @@ class TestAuthenticate(unittest.TestCase): self.assertRaises(stem.connection.CookieAuthRejected, self._check_auth, auth_type, auth_value) self._assert_auth_rejected_msg(auth_type, auth_value) + def test_authenticate_cookie_invalid(self): + """ + Tests the authenticate_cookie function with a properly sized but incorrect + value. + """ + + auth_type = stem.connection.AuthMethod.COOKIE + auth_value = os.path.join(test.runner.get_runner().get_test_dir(), "fake_cookie") + + # we need to create a 32 byte cookie file to load from + fake_cookie = open(auth_value, "w") + fake_cookie.write("0" * 32) + fake_cookie.close() + + if self._can_authenticate(test.runner.TorConnection.NONE): + # authentication will work anyway + self._check_auth(auth_type, auth_value) + else: + if self._can_authenticate(auth_type): + exc_type = stem.connection.IncorrectCookieValue + else: + exc_type = stem.connection.CookieAuthRejected + + self.assertRaises(exc_type, self._check_auth, auth_type, auth_value) + self._assert_auth_rejected_msg(auth_type, auth_value) + + os.remove(auth_value) + def test_authenticate_cookie_missing(self): """ Tests the authenticate_cookie function with a path that really, really @@ -198,11 +228,18 @@ class TestAuthenticate(unittest.TestCase): if cookie_auth and password_auth: failure_msg = MULTIPLE_AUTH_FAIL elif cookie_auth: - failure_msg = COOKIE_AUTH_FAIL - elif auth_type == stem.connection.AuthMethod.PASSWORD: - failure_msg = INCORRECT_PASSWORD_FAIL + if auth_type == stem.connection.AuthMethod.COOKIE: + failure_msg = INCORRECT_COOKIE_FAIL + else: + failure_msg = COOKIE_AUTH_FAIL + elif password_auth: + if auth_type == stem.connection.AuthMethod.PASSWORD: + failure_msg = INCORRECT_PASSWORD_FAIL + else: + failure_msg = PASSWORD_AUTH_FAIL else: - failure_msg = PASSWORD_AUTH_FAIL + # shouldn't happen, if so then the test has a bug + raise ValueError("No methods of authentication. If this is an open socket then auth shoulnd't fail.") try: auth_function() diff --git a/test/runner.py b/test/runner.py index ed0f798..6284464 100644 --- a/test/runner.py +++ b/test/runner.py @@ -10,6 +10,7 @@ Runner - Runtime context for our integration tests. |- start - prepares and starts a tor instance for our tests to run against |- stop - stops our tor instance and cleans up any temporary files |- is_running - checks if our tor test instance is running + |- get_test_dir - testing directory path |- get_torrc_path - path to our tor instance's torrc |- get_torrc_contents - contents of our tor instance's torrc |- get_connection_type - method by which controllers can connect to tor @@ -235,6 +236,19 @@ class Runner: return is_running + def get_test_dir(self): + """ + Provides the absolute path for our testing directory. + + Returns: + str with our test direcectory path + + Raises: + RunnerStopped if we aren't running + """ + + return self._get("_test_dir") + def get_torrc_path(self): """ Provides the absolute path for where our testing torrc resides.

1 0

[stem/master] Removing tag from version comparisons
by atagar＠torproject.org 09 Dec '11

09 Dec '11

commit 98ad681bc05d91b596ceebb8f46e04f1f8598b84 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Dec 9 10:01:27 2011 -0800 Removing tag from version comparisons As Sebastian pointed out, the version-spec says "The status tag is purely informational". Removing it from comparison operations so versions like "1.2.3.4-foo" and "1.2.3.4-bar" will evaluate to being equal. --- run_tests.py | 2 +- stem/version.py | 6 ++++-- test/unit/version.py | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/run_tests.py b/run_tests.py index eee52ff..206de76 100755 --- a/run_tests.py +++ b/run_tests.py @@ -35,7 +35,7 @@ DIVIDER = "=" * 70 # (name, class) tuples for all of our unit and integration tests UNIT_TESTS = (("stem.socket.ControlMessage", test.unit.socket.control_message.TestControlMessage), ("stem.socket.ControlLine", test.unit.socket.control_line.TestControlLine), - ("stem.types.Version", test.unit.version.TestVerion), + ("stem.types.Version", test.unit.version.TestVersion), ("stem.connection.ProtocolInfoResponse", test.unit.connection.protocolinfo.TestProtocolInfoResponse), ("stem.util.enum", test.unit.util.enum.TestEnum), ("stem.util.system", test.unit.util.system.TestSystem), diff --git a/stem/version.py b/stem/version.py index d417934..214e06a 100644 --- a/stem/version.py +++ b/stem/version.py @@ -131,7 +131,7 @@ class Version: def __cmp__(self, other): """ Simple comparison of versions. An undefined patch level is treated as zero - and status tags are compared lexically (as per the version spec). + and status tags are not included in comparisions (as per the version spec). """ if not isinstance(other, Version): @@ -147,7 +147,9 @@ class Version: my_status = self.status if self.status else "" other_status = other.status if other.status else "" - return cmp(my_status, other_status) + # not including tags in comparisons because the spec declares them to be + # 'purely informational' + return 0 Requirement = stem.util.enum.Enum( ("GETINFO_CONFIG_TEXT", Version("0.2.2.7-alpha")), diff --git a/test/unit/version.py b/test/unit/version.py index 2845ad3..7cff127 100644 --- a/test/unit/version.py +++ b/test/unit/version.py @@ -5,7 +5,7 @@ Unit tests for the stem.version.Version parsing and class. import unittest import stem.version -class TestVerion(unittest.TestCase): +class TestVersion(unittest.TestCase): """ Tests methods and functions related to 'stem.version.Version'. """ @@ -53,7 +53,7 @@ class TestVerion(unittest.TestCase): self.assert_version_is_greater("0.2.2.3-tag", "0.1.2.3-tag") self.assert_version_is_greater("0.1.3.3-tag", "0.1.2.3-tag") self.assert_version_is_greater("0.1.2.4-tag", "0.1.2.3-tag") - self.assert_version_is_greater("0.1.2.3-ugg", "0.1.2.3-tag") + self.assert_version_is_equal("0.1.2.3-ugg", "0.1.2.3-tag") self.assert_version_is_equal("0.1.2.3-tag", "0.1.2.3-tag") # checks that a missing patch level equals zero @@ -61,7 +61,7 @@ class TestVerion(unittest.TestCase): self.assert_version_is_equal("0.1.2-tag", "0.1.2.0-tag") # checks for missing patch or status - self.assert_version_is_greater("0.1.2.3-tag", "0.1.2.3") + self.assert_version_is_equal("0.1.2.3-tag", "0.1.2.3") self.assert_version_is_greater("0.1.2.3-tag", "0.1.2-tag") self.assert_version_is_greater("0.1.2.3-tag", "0.1.2")

1 0

r25249: {website} update the people page per karsten. (website/trunk/about/en)
by Andrew Lewman 09 Dec '11

09 Dec '11

Author: phobos Date: 2011-12-09 16:45:23 +0000 (Fri, 09 Dec 2011) New Revision: 25249 Modified: website/trunk/about/en/contributors.wml website/trunk/about/en/corepeople.wml Log: update the people page per karsten. Modified: website/trunk/about/en/contributors.wml =================================================================== --- website/trunk/about/en/contributors.wml 2011-12-09 16:20:56 UTC (rev 25248) +++ website/trunk/about/en/contributors.wml 2011-12-09 16:45:23 UTC (rev 25249) @@ -33,6 +33,9 @@ <dd>Worked during Google Summer of Code 2009 on porting Polipo to Windows. He currently helps with the libevent bufferevent code.</dd> +<dt>Matt Edman</dt> +<dd>Original developer for <a href="<page projects/vidalia>">Vidalia</a>, +a cross-platform Tor Graphical User Interface included in the bundles.</dd> <dt>Geoff Goodell</dt><dd>Started the <a href="https://svn.torproject.org/svn/blossom/trunk/">Blossom project</a> which uses Tor as its overlay network; also helped motivate Tor's control Modified: website/trunk/about/en/corepeople.wml =================================================================== --- website/trunk/about/en/corepeople.wml 2011-12-09 16:20:56 UTC (rev 25248) +++ website/trunk/about/en/corepeople.wml 2011-12-09 16:45:23 UTC (rev 25249) @@ -26,7 +26,7 @@ <h1>Core Tor People</h1> <dl> - <dt>Jacob Appelbaum, Developer, Advocate, and Security Researcher</dt> + <dt>Jacob Appelbaum, Advocate, Security Researcher, and Developer</dt> <dd>Our main advocate. Speaks at conferences and gives trainings all over the world to get people excited about Tor, explain how Tor is used in real world situations, and generally @@ -37,6 +37,10 @@ weather</a> site. He is also a Staff Research Scientist at the University of Washington Computer Security and Privacy Research Lab.</dd> + <dt>Thomas S. Benjamin, Researcher</dt> + <dd>Anonymous communications and bridge distribution + researcher. His other work can be found on his <a + href="http://cryptocracy.net/">personal website</a></dd> <dt>Erinn Clark, Packaging and Build Automation</dt> <dd>Erinn is tackling the growing needs for easy to install and configure packages on a variety of operating systems. @@ -44,16 +48,12 @@ nightly builds for all operating systems we support. Erinn is also doing some advocacy by talking to audiences at FSCONS, CodeBits.eu, and various European universites.</dd> - <dt>Roger Dingledine, Project Leader; Director, Researcher</dt> + <dt>Roger Dingledine, Project Leader, Director, Researcher</dt> <dd>Original developer of Tor along with Nick Mathewson and Paul Syverson. Leading researcher in the anonymous communications field. Frequent speaker at conferences to advocate Tor and explain what Tor is and can do. Helps coordinate academic researchers.</dd> - <dt>Matt Edman, Vidalia Developer; Researcher</dt> - <dd>Developer for <a href="<page - projects/vidalia>">Vidalia</a>, a cross-platform Tor Graphical - User Interface included in the bundles.</dd> <dt>Nathan Freitas, Mobile phone hacker</dt> <dd>The driving force behind <a href="https://guardianproject.info">The Guardian @@ -80,34 +80,33 @@ a row, he became one of the mentors the following year. He also speaks at various conferences about Tor and trains activists to safely use Tor.</dd> - <dt>Thomas S. Benjamin, Researcher</dt> - <dd>Anonymous communications and bridge distribution - researcher. His other work can be found on his <a - href="http://cryptocracy.net/">personal website</a></dd> - <dt>Robert Hogan, Developer</dt> - <dd>Developer for the <a - href="http://tork.sf.net/">TorK</a> Tor controller, a <a - href="http://code.google.com/p/torora/">privacy-oriented - Arora fork</a>, the <a - href="http://code.google.com/p/torsocks/">torsocks - scripts</a>, and other useful peripheral tools.</dd> + <dt>Robert Hogan, Developer</dt> + <dd>Developer for the <a + href="http://tork.sf.net/">TorK</a> Tor controller, a <a + href="http://code.google.com/p/torora/">privacy-oriented + Arora fork</a>, the <a + href="http://code.google.com/p/torsocks/">torsocks + scripts</a>, and other useful peripheral tools.</dd> <dt>Damian Johnson, Arm Developer</dt> <dd>Builds <a href="http://atagar.com/arm">Arm</a>, a command-line application for monitoring Tor relays and providing real-time status information such as the current configuration, bandwidth usage, message log, etc.</dd> - <dt>Andrew Lewman, Executive Director; Director; <a href="<page press/press>">press contact</a></dt> + <dt>George Kadianakis, Developer</dt> + <dd>Developer of pluggable transports and bridge-scanning + resistance.</dd> + <dt>Andrew Lewman, Executive Director, Director, + <a href="<page press/press>">press contact</a></dt> <dd>Manages the business operations of The Tor Project, Inc. Plays roles of finance, advocacy, project management, strategy, press, and general support.</dd> - <dt>Dr. Karsten Loesing, Researcher and Developer</dt> - <dd>Worked during the 2007 Google Summer of Code on <a - href="<specblob>proposals/114-distributed-storage.txt">distributing - and securing the publishing and fetching of hidden - service descriptors</a>. Currently the primary - researcher for our National Science Foundation grant - into <a href="http://metrics.torproject.org/">anonymous - metrics</a>.</dd> + <dt>Dr. Karsten Loesing, Metrics Researcher and Developer, + Project Manager</dt> + <dd>Primary researcher and developer into + <a href="https://metrics.torproject.org/">anonymous metrics</a> + which started as a National Science Foundation grant. Also helps + coordinate work for our various + <a href="<wiki>org/sponsors">sponsor projects</a>.</dd> <dt>Nick Mathewson, Chief Architect, Researcher, Director</dt> <dd>One of the three original designers of Tor; does a lot of the ongoing design work. One of the two main developers, @@ -120,12 +119,15 @@ You can find out more about his work on his <a href="http://www.cl.cam.ac.uk/~sjm217/">professional website</a></dd> - <dt>Linus Nordberg, Advocate</dt> - <dd>Swedish advocate for Tor, anonymous - communications research, and employee at <a - href="http://nordu.net">NORDUnet</a>.</dd> + <dt>Linus Nordberg, Advocate, Developer</dt> + <dd>Swedish advocate for Tor, anonymous + communications research, and employee at <a + href="http://nordu.net">NORDUnet</a>. Works on implementing + IPv6 in Tor.</dd> <dt>Peter Palfrader, Sysadmin and Developer</dt> - <dd>Manages the Debian packages, runs one of the directory authorities, runs the website and the wiki, and generally helps out a lot.</dd> + <dd>Manages the Debian packages, runs one of the directory + authorities, runs the website and the wiki, and generally helps + out a lot.</dd> <dt>Mike Perry, Torbutton and Tor Performance Developer</dt> <dd>Author of <a href="https://svn.torproject.org/svn/torflow/trunk/README">TorFlow</a>, @@ -133,8 +135,8 @@ Tor network and measures various properties and behaviors. Developer and maintainer of <a href="<page torbutton/index>">Torbutton</a>.</dd> - <dt>Robert Ransom</dt> - <dd>Bug catcher and immensely helpful on irc and the + <dt>Robert Ransom, Developer</dt> + <dd>Bug catcher and immensely helpful on IRC and the email lists. Looking into hidden service performance and robustness.</dd> <dt>Karen Reilly, Development Director</dt>

1 0

[tor/master] Refactor stream attachment in circuit_has_opened
by nickm＠torproject.org 09 Dec '11

09 Dec '11

commit 7b6b2d5fb8c760a506a052aa0fba7ba6a8fe4e77 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Dec 6 03:46:02 2011 -0800 Refactor stream attachment in circuit_has_opened Put the 'try attaching streams, clear isolation state if possible, retry attaching streams' loop in its own separate function, where it belongs. --- src/or/circuituse.c | 53 +++++++++++++++++++++++++++++++++----------------- src/or/circuituse.h | 1 + 2 files changed, 36 insertions(+), 18 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index bdff75c..ef4ac6f 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1004,7 +1004,6 @@ circuit_testing_failed(origin_circuit_t *circ, int at_last_hop) void circuit_has_opened(origin_circuit_t *circ) { - int can_try_clearing_isolation = 0, tried_clearing_isolation = 0; control_event_circuit_status(circ, CIRC_EVENT_BUILT, 0); /* Remember that this circuit has finished building. Now if we start @@ -1012,20 +1011,18 @@ circuit_has_opened(origin_circuit_t *circ) * to consider its build time. */ circ->has_opened = 1; - again: - switch (TO_CIRCUIT(circ)->purpose) { case CIRCUIT_PURPOSE_C_ESTABLISH_REND: rend_client_rendcirc_has_opened(circ); - /* XXXX We'd like to set something like "can_try_clearing_isolation" - * here, so that we can change the isolation of this circuit (and maybe - * its purpose too) if it turns out that we no longer have any streams - * that want to use it. But connection_ap_attach_pending() doesn't - * actually attach streams to a C_ESTABLISH_REND circuit-- streams - * don't get attached until the circuit is in C_REND_JOINED... so - * we can't clear isolation now. - */ + /* Start building an intro circ if we don't have one yet. */ connection_ap_attach_pending(); + /* This isn't a call to circuit_try_attaching_streams because a + * circuit in _C_ESTABLISH_REND state isn't connected to its + * hidden service yet, thus we can't attach streams to it yet, + * thus circuit_try_attaching_streams would always clear the + * circuit's isolation state. circuit_try_attaching_streams is + * called later, when the rend circ enters _C_REND_JOINED + * state. */ break; case CIRCUIT_PURPOSE_C_INTRODUCING: rend_client_introcirc_has_opened(circ); @@ -1033,8 +1030,7 @@ circuit_has_opened(origin_circuit_t *circ) case CIRCUIT_PURPOSE_C_GENERAL: /* Tell any AP connections that have been waiting for a new * circuit that one is ready. */ - can_try_clearing_isolation = 1; - connection_ap_attach_pending(); + circuit_try_attaching_streams(circ); break; case CIRCUIT_PURPOSE_S_ESTABLISH_INTRO: /* at Bob, waiting for introductions */ @@ -1051,12 +1047,15 @@ circuit_has_opened(origin_circuit_t *circ) * This won't happen in normal operation, but might happen if the * controller did it. Just let it slide. */ } +} +/** If the stream-isolation state of <b>circ</b> can be cleared, clear + * it. Return non-zero iff <b>circ</b>'s isolation state was cleared. */ +static int +circuit_try_clearing_isolation_state(origin_circuit_t *circ) +{ if (/* The circuit may have become non-open if it was cannibalized.*/ circ->_base.state == CIRCUIT_STATE_OPEN && - /* Only if the purpose is clearable, and only if we haven't tried - * to clear isolation yet, do we try. */ - can_try_clearing_isolation && !tried_clearing_isolation && /* If !isolation_values_set, there is nothing to clear. */ circ->isolation_values_set && /* It's not legal to clear a circuit's isolation info if it's ever had @@ -1066,8 +1065,26 @@ circuit_has_opened(origin_circuit_t *circ) * we didn't manage to attach any streams to it, then we can * and should clear it and try again. */ circuit_clear_isolation(circ); - tried_clearing_isolation = 1; - goto again; + return 1; + } else { + return 0; + } +} + +/** Called when a circuit becomes ready for streams to be attached to + * it. */ +void +circuit_try_attaching_streams(origin_circuit_t *circ) +{ + /* Attach streams to this circuit if we can. */ + connection_ap_attach_pending(); + + /* The call to circuit_try_clearing_isolation_state here will do + * nothing and return 0 if we didn't attach any streams to circ + * above. */ + if (circuit_try_clearing_isolation_state(circ)) { + /* Maybe *now* we can attach some streams to this circuit. */ + connection_ap_attach_pending(); } } diff --git a/src/or/circuituse.h b/src/or/circuituse.h index 9867fd8..bc11fe5 100644 --- a/src/or/circuituse.h +++ b/src/or/circuituse.h @@ -29,6 +29,7 @@ void reset_bandwidth_test(void); int circuit_enough_testing_circs(void); void circuit_has_opened(origin_circuit_t *circ); +void circuit_try_attaching_streams(origin_circuit_t *circ); void circuit_build_failed(origin_circuit_t *circ); /** Flag to set when a circuit should have only a single hop. */

1 0

[tor/master] Clear stream-isolation state on rend circs if needed to attach streams
by nickm＠torproject.org 09 Dec '11

09 Dec '11

commit 832bfc3c462f0b8dc1668b5b580f656a2b457a96 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Dec 6 05:02:58 2011 -0800 Clear stream-isolation state on rend circs if needed to attach streams Fixes bug 4655; bugfix on 0.2.3.3-alpha. --- changes/bug4655 | 10 ++++++++++ src/or/rendclient.c | 4 +++- 2 files changed, 13 insertions(+), 1 deletions(-) diff --git a/changes/bug4655 b/changes/bug4655 new file mode 100644 index 0000000..b91d871 --- /dev/null +++ b/changes/bug4655 @@ -0,0 +1,10 @@ + o Minor bugfixes: + + - If we can't attach streams to a rendezvous circuit when we + finish connecting to a hidden service, clear the rendezvous + circuit's stream-isolation state and try to attach streams + again. Previously, we cleared rendezvous circuits' isolation + state either too early (if they were freshly built) or not at + all (if they had been built earlier and were cannibalized). + Bugfix on 0.2.3.3-alpha; fixes bug 4655. + diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 5429b6c..c4744731 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -892,10 +892,12 @@ rend_client_receive_rendezvous(origin_circuit_t *circ, const uint8_t *request, onion_append_to_cpath(&circ->cpath, hop); circ->build_state->pending_final_cpath = NULL; /* prevent double-free */ + /* XXXX023 This is a pretty brute-force approach. It'd be better to * attach only the connections that are waiting on this circuit, rather * than trying to attach them all. See comments bug 743. */ - connection_ap_attach_pending(); + circuit_try_attaching_streams(circ); + memset(keys, 0, sizeof(keys)); return 0; err:

1 0

[tor/master] Remove comment complaining that we try to attach all streams to circs
by nickm＠torproject.org 09 Dec '11

09 Dec '11

commit 59b5379424295567dc68a50535cf544873ac28d9 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Dec 6 19:24:55 2011 -0800 Remove comment complaining that we try to attach all streams to circs It's inefficient, but the more efficient solution (only try to attach streams aiming for this HS) would require far more complexity for a gain that should be tiny. --- src/or/rendclient.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/src/or/rendclient.c b/src/or/rendclient.c index c4744731..8aae8c5 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -893,9 +893,6 @@ rend_client_receive_rendezvous(origin_circuit_t *circ, const uint8_t *request, onion_append_to_cpath(&circ->cpath, hop); circ->build_state->pending_final_cpath = NULL; /* prevent double-free */ - /* XXXX023 This is a pretty brute-force approach. It'd be better to - * attach only the connections that are waiting on this circuit, rather - * than trying to attach them all. See comments bug 743. */ circuit_try_attaching_streams(circ); memset(keys, 0, sizeof(keys));

1 0

[tor/master] Merge branch 'bug4655-squashed'
by nickm＠torproject.org 09 Dec '11

09 Dec '11

commit b7519dce98031c2adca3f0c8f28741a219845b6e Merge: 7a76994 59b5379 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 9 11:29:03 2011 -0500 Merge branch 'bug4655-squashed' changes/bug4655 | 10 +++++++++ src/or/circuituse.c | 53 +++++++++++++++++++++++++++++++++----------------- src/or/circuituse.h | 1 + src/or/rendclient.c | 7 ++--- 4 files changed, 49 insertions(+), 22 deletions(-)

1 0

r25248: {website} bump package versions to 0.2.3.9-alpha (website/trunk/include)
by Erinn Clark 09 Dec '11

09 Dec '11

Author: erinn Date: 2011-12-09 16:20:56 +0000 (Fri, 09 Dec 2011) New Revision: 25248 Modified: website/trunk/include/versions.wmi Log: bump package versions to 0.2.3.9-alpha Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-12-08 21:15:23 UTC (rev 25247) +++ website/trunk/include/versions.wmi 2011-12-09 16:20:56 UTC (rev 25248) @@ -2,30 +2,30 @@ <define-tag version-alpha whitespace=delete>0.2.3.9-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.2.34</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.3.8-alpha</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.3.9-alpha</define-tag> <define-tag version-win32-bundle-stable whitespace=delete>0.2.2.34</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.3.8-alpha</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.3.9-alpha</define-tag> <define-tag version-win32-bridge-bundle-stable whitespace=delete>0.2.2.34-<version-vidalia-stable></define-tag> <define-tag version-win32-relay-bundle-stable whitespace=delete>0.2.2.34-<version-vidalia-stable></define-tag> <define-tag version-win32-exit-bundle-stable whitespace=delete>0.2.2.34-<version-vidalia-stable>-2</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.3.8-alpha-<version-vidalia-stable></define-tag> -<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.3.8-alpha-<version-vidalia-stable></define-tag> -<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.3.8-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.3.9-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-relay-bundle-alpha whitespace=delete>0.2.3.9-alpha-<version-vidalia-stable></define-tag> +<define-tag version-win32-exit-bundle-alpha whitespace=delete>0.2.3.9-alpha-<version-vidalia-stable></define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.2.34</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.3.8-alpha</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.3.9-alpha</define-tag> <define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.2.34</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.3.6-alpha</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.3.9-alpha</define-tag> <define-tag version-osx-x86-stable whitespace=delete>0.2.2.34</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.3.8-alpha</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.3.9-alpha</define-tag> <define-tag version-osx-ppc-stable whitespace=delete>0.2.2.34</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.6-alpha</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.3.9-alpha</define-tag> <define-tag version-torbrowserbundle whitespace=delete>2.2.34-3</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.2.34</define-tag>

1 0

[doctor/master] Check votes and signatures in downloaded consensuses.
by karsten＠torproject.org 09 Dec '11

09 Dec '11

commit 4581684aa786d9966df190388b18e2b24a734ce1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Dec 9 15:22:08 2011 +0100 Check votes and signatures in downloaded consensuses. Implements the rest of #4250. --- src/org/torproject/doctor/Checker.java | 49 +++++++++++++++++++++++ src/org/torproject/doctor/Parser.java | 18 ++++++-- src/org/torproject/doctor/Status.java | 20 +++++++++ src/org/torproject/doctor/StatusFileReport.java | 12 ++++++ src/org/torproject/doctor/Warning.java | 11 +++++- 5 files changed, 104 insertions(+), 6 deletions(-) diff --git a/src/org/torproject/doctor/Checker.java b/src/org/torproject/doctor/Checker.java index a0f55c2..4d6493f 100755 --- a/src/org/torproject/doctor/Checker.java +++ b/src/org/torproject/doctor/Checker.java @@ -35,6 +35,8 @@ public class Checker { this.findMostRecentConsensus(); this.checkMissingConsensuses(); this.checkAllConsensusesFresh(); + this.checkContainedVotes(); + this.checkConsensusSignatures(); if (this.downloadedConsensus != null) { if (this.isConsensusFresh(this.downloadedConsensus)) { this.checkConsensusMethods(); @@ -102,6 +104,53 @@ public class Checker { } } + /* Check if all downloaded consensuses contain the same set of votes. */ + private void checkContainedVotes() { + Set<String> allVotes = new HashSet<String>(); + for (Status consensus : downloadedConsensuses.values()) { + allVotes.addAll(consensus.getContainedVotes()); + } + SortedSet<String> missingVotes = new TreeSet<String>(); + for (Map.Entry<String, Status> e : downloadedConsensuses.entrySet()) { + String nickname = e.getKey(); + Status downloadedConsensus = e.getValue(); + if (!downloadedConsensus.getContainedVotes().containsAll( + allVotes)) { + missingVotes.add(nickname); + } + } + if (!missingVotes.isEmpty()) { + StringBuilder sb = new StringBuilder(); + for (String nickname : missingVotes) { + sb.append(", " + nickname); + } + this.warnings.put(Warning.ConsensusMissingVotes, + sb.toString().substring(2)); + } + } + + /* Check if all downloaded consensuses contain signatures from all other + * authorities. */ + private void checkConsensusSignatures() { + SortedSet<String> missingSignatures = new TreeSet<String>(); + for (Map.Entry<String, Status> e : downloadedConsensuses.entrySet()) { + String nickname = e.getKey(); + Status downloadedConsensus = e.getValue(); + if (!downloadedConsensus.getContainedSignatures().containsAll( + downloadedConsensus.getContainedVotes())) { + missingSignatures.add(nickname); + } + } + if (!missingSignatures.isEmpty()) { + StringBuilder sb = new StringBuilder(); + for (String nickname : missingSignatures) { + sb.append(", " + nickname); + } + this.warnings.put(Warning.ConsensusMissingSignatures, + sb.toString().substring(2)); + } + } + /* Check if the most recent consensus is older than 1 hour. */ private boolean isConsensusFresh(Status consensus) { return (consensus.getValidAfterMillis() >= diff --git a/src/org/torproject/doctor/Parser.java b/src/org/torproject/doctor/Parser.java index 9a91033..d318f29 100755 --- a/src/org/torproject/doctor/Parser.java +++ b/src/org/torproject/doctor/Parser.java @@ -108,9 +108,15 @@ public class Parser { status.addConsensusParam(paramName, paramValue); } } - } else if (line.startsWith("dir-source ") && !isConsensus) { - status.setNickname(line.split(" ")[1]); - status.setFingerprint(line.split(" ")[2]); + } else if (line.startsWith("dir-source ")) { + String nickname = line.split(" ")[1]; + String fingerprint = line.split(" ")[2]; + if (isConsensus) { + status.addContainedVote(fingerprint); + } else { + status.setNickname(line.split(" ")[1]); + status.setFingerprint(line.split(" ")[2]); + } } else if (line.startsWith("dir-key-expires ")) { try { status.setDirKeyExpiresMillis(dateTimeFormat.parse( @@ -140,8 +146,6 @@ public class Parser { } if (line.startsWith("r ")) { rLine = line; - } else { - break; } } else if (line.startsWith("s ") || line.equals("s")) { sLine = line; @@ -156,6 +160,10 @@ public class Parser { } else if (line.startsWith("w ") && !isConsensus && line.contains(" Measured")) { bandwidthWeights++; + } else if (line.startsWith("directory-signature ") && + isConsensus) { + String fingerprint = line.split(" ")[1]; + status.addContainedSignature(fingerprint); } } br.close(); diff --git a/src/org/torproject/doctor/Status.java b/src/org/torproject/doctor/Status.java index 0573ae2..df41e47 100755 --- a/src/org/torproject/doctor/Status.java +++ b/src/org/torproject/doctor/Status.java @@ -136,6 +136,26 @@ public class Status implements Comparable<Status> { return this.knownFlags; } + /* Fingerprints of directory authorities of contained votes (only + * relevant for consensuses). */ + private SortedSet<String> containedVotes = new TreeSet<String>(); + public void addContainedVote(String fingerprint) { + this.containedVotes.add(fingerprint); + } + public SortedSet<String> getContainedVotes() { + return this.containedVotes; + } + + /* Fingerprints of directory authorities of contained signatures (only + * relevant for consensuses). */ + private SortedSet<String> containedSignatures = new TreeSet<String>(); + public void addContainedSignature(String fingerprint) { + this.containedSignatures.add(fingerprint); + } + public SortedSet<String> getContainedSignatures() { + return this.containedSignatures; + } + /* Number of status entries with the Running flag. */ private int runningRelays; public void setRunningRelays(int runningRelays) { diff --git a/src/org/torproject/doctor/StatusFileReport.java b/src/org/torproject/doctor/StatusFileReport.java index 1fe3b87..a43a27e 100755 --- a/src/org/torproject/doctor/StatusFileReport.java +++ b/src/org/torproject/doctor/StatusFileReport.java @@ -138,6 +138,18 @@ public class StatusFileReport implements Report { + "not reporting bandwidth scanner results: " + details, 150L * 60L * 1000L); break; + case ConsensusMissingVotes: + warningStrings.put("The consensuses downloaded from the " + + "following authorities are missing votes that are " + + "contained in consensuses downloaded from other " + + "authorities: " + details, 150L * 60L * 1000L); + break; + case ConsensusMissingSignatures: + warningStrings.put("The consensuses downloaded from the " + + "following authorities are missing signatures from " + + "other, previously voting authorities: " + details, + 150L * 60L * 1000L); + break; } } long now = System.currentTimeMillis(); diff --git a/src/org/torproject/doctor/Warning.java b/src/org/torproject/doctor/Warning.java index d592926..0cb8cd8 100755 --- a/src/org/torproject/doctor/Warning.java +++ b/src/org/torproject/doctor/Warning.java @@ -41,6 +41,15 @@ public enum Warning { /* One or more directory authorities are not reporting bandwidth scanner * results. */ - BandwidthScannerResultsMissing + BandwidthScannerResultsMissing, + + /* The consensuses downloaded from one or more authorities are missing + * votes that are contained in consensuses downloaded from other + * authorities. */ + ConsensusMissingVotes, + + /* The consensuses downloaded from one or more authorities are missing + * signatures from other, previously voting authorities. */ + ConsensusMissingSignatures }

1 0

[torbutton/master] Bug 4667: Close keep-alive connections on "New Identity"
by mikeperry＠torproject.org 09 Dec '11

09 Dec '11

commit 5a155065e97eb455e5c5145fa334ec8af40a2f8d Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Thu Dec 8 15:23:36 2011 -0800 Bug 4667: Close keep-alive connections on "New Identity" TBB-only fix. --- src/chrome/content/torbutton.js | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 4730048..01adeb5 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1491,6 +1491,11 @@ function torbutton_new_identity() { torbutton_clear_cookies(); } + // Clear keep-alive + var obsSvc = Components.classes["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService); + obsSvc.notifyObservers(this, "net:prune-all-connections", null); + + // XXX: This may not clear zoom site-specific var cps = Cc["@mozilla.org/content-pref/service;1"]. createInstance(Ci.nsIContentPrefService); cps.removeGroupedPrefs();

1 0