- tor-commits - lists.torproject.org

[tor/master] Provide consensus params to constrain the threshold for Fast
by nickm＠torproject.org 16 Jan '12

16 Jan '12

commit 125fba2e9988a7a31d5f6d45d897c3e8f1ca7480 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 13 12:05:08 2012 -0500 Provide consensus params to constrain the threshold for Fast resolves ticket 3946 --- changes/fast_bw_param | 8 ++++++++ src/or/dirserv.c | 12 ++++++++++++ 2 files changed, 20 insertions(+), 0 deletions(-) diff --git a/changes/fast_bw_param b/changes/fast_bw_param new file mode 100644 index 0000000..abe630d --- /dev/null +++ b/changes/fast_bw_param @@ -0,0 +1,8 @@ + o Minor features (directory authority): + - Provide two consensus parameters (FastFlagMinThreshold and + FastFlagMaxThreshold) to control the range of allowable bandwidths for + the Fast directory flag. This allows authorities to run better + experiments on appropriate requirements for being a "Fast" node. + The AuthDirFastGuarantee flag still applies. + + diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 94a415f..e599569 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1938,6 +1938,18 @@ dirserv_compute_performance_thresholds(routerlist_t *rl) if (guard_tk > TIME_KNOWN_TO_GUARANTEE_FAMILIAR) guard_tk = TIME_KNOWN_TO_GUARANTEE_FAMILIAR; + { + /* We can vote on a parameter for the minimum and maximum. */ + int32_t min_fast, max_fast; + min_fast = networkstatus_get_param(NULL, "FastFlagMinThreshold", + 0, 0, INT32_MAX); + max_fast = networkstatus_get_param(NULL, "FastFlagMaxThreshold", + INT32_MAX, min_fast, INT32_MAX); + if (fast_bandwidth < (uint32_t)min_fast) + fast_bandwidth = min_fast; + if (fast_bandwidth > (uint32_t)max_fast) + fast_bandwidth = max_fast; + } /* Protect sufficiently fast nodes from being pushed out of the set * of Fast nodes. */ if (options->AuthDirFastGuarantee &&

1 0

[tor/master] Comment fixups on 4207 suggested by arma
by nickm＠torproject.org 16 Jan '12

16 Jan '12

commit 1810db9bb32d2e9a1a1fe751368a98edc4524331 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 16 14:45:12 2012 -0500 Comment fixups on 4207 suggested by arma --- src/or/or.h | 2 +- src/or/policies.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 21cb074..cf42979 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3246,8 +3246,8 @@ typedef struct { */ smartlist_t *AuthDirBadDirCC; smartlist_t *AuthDirBadExitCC; - smartlist_t *AuthDirRejectCC; smartlist_t *AuthDirInvalidCC; + smartlist_t *AuthDirRejectCC; /**@}*/ int AuthDirListBadDirs; /**< True iff we should list bad dirs, diff --git a/src/or/policies.c b/src/or/policies.c index fdec687..34cb64b 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -315,7 +315,7 @@ socks_policy_permits_address(const tor_addr_t *addr) } /** Return true iff the address addr is in a country listed in the - * case-insentive list of country codes cc_list. */ + * case-insensitive list of country codes cc_list. */ static int addr_is_in_cc_list(uint32_t addr, const smartlist_t *cc_list) {

1 0

[tor/master] Allow authorities to baddir/badexit/invalid/reject nodes by cc
by nickm＠torproject.org 16 Jan '12

16 Jan '12

commit 938531773a017e6eb70f11e81a0543e81413f83f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 13 12:28:32 2012 -0500 Allow authorities to baddir/badexit/invalid/reject nodes by cc Implements ticket #4207 --- changes/badexitcc | 3 +++ doc/tor.1.txt | 12 ++++++++++++ src/or/config.c | 8 ++++++++ src/or/or.h | 13 +++++++++++++ src/or/policies.c | 31 +++++++++++++++++++++++++++---- 5 files changed, 63 insertions(+), 4 deletions(-) diff --git a/changes/badexitcc b/changes/badexitcc new file mode 100644 index 0000000..6b10ab1 --- /dev/null +++ b/changes/badexitcc @@ -0,0 +1,3 @@ + o Minor features (directory authority): + - Authority operators can now vote for all routers in a given + country to be BadDir/BadExit/Invali/Rejected. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index fcc566e..adc84e7 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1462,6 +1462,18 @@ DIRECTORY AUTHORITY SERVER OPTIONS authority publishes, or accepted as an OR address in any descriptor submitted for publication by this authority. +**AuthDirBadDirCC** __CC__,... + + +**AuthDirBadExitCC** __CC__,... + + +**AuthDirInvalidCC** __CC__,... + + +**AuthDirRejectCC** __CC__,...:: + Authoritative directories only. These options contain a comma-separated + list of country codes such that any server in one of those country codes + will be marked as a bad directory/bad exit/invalid for use, or rejected + entirely. + **AuthDirListBadDirs** **0**|**1**:: Authoritative directories only. If set to 1, this directory has some opinion about which nodes are unsuitable as directory caches. (Do not set diff --git a/src/or/config.c b/src/or/config.c index b118f30..341bc15 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -89,6 +89,10 @@ typedef struct config_abbrev_t { /** A list of abbreviations and aliases to map command-line options, obsolete * option names, or alternative option names, to their current values. */ static config_abbrev_t _option_abbrevs[] = { + PLURAL(AuthDirBadDirCC), + PLURAL(AuthDirBadExitCC), + PLURAL(AuthDirInvalidCC), + PLURAL(AuthDirRejectCC), PLURAL(ExitNode), PLURAL(EntryNode), PLURAL(ExcludeNode), @@ -182,11 +186,15 @@ static config_var_t _option_vars[] = { V(AlternateHSAuthority, LINELIST, NULL), V(AssumeReachable, BOOL, "0"), V(AuthDirBadDir, LINELIST, NULL), + V(AuthDirBadDirCC, CSV, ""), V(AuthDirBadExit, LINELIST, NULL), + V(AuthDirBadExitCC, CSV, ""), V(AuthDirInvalid, LINELIST, NULL), + V(AuthDirInvalidCC, CSV, ""), V(AuthDirFastGuarantee, MEMUNIT, "100 KB"), V(AuthDirGuardBWGuarantee, MEMUNIT, "250 KB"), V(AuthDirReject, LINELIST, NULL), + V(AuthDirRejectCC, CSV, ""), V(AuthDirRejectUnlisted, BOOL, "0"), V(AuthDirListBadDirs, BOOL, "0"), V(AuthDirListBadExits, BOOL, "0"), diff --git a/src/or/or.h b/src/or/or.h index 0fcb083..21cb074 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3237,6 +3237,19 @@ typedef struct { * reject. */ config_line_t *AuthDirInvalid; /**< Address policy for descriptors to * never mark as valid. */ + /** @name AuthDir...CC + * + * Lists of of country codes to mark as BadDir, BadExit, or Invalid, or to + * reject entirely. + * + * @{ + */ + smartlist_t *AuthDirBadDirCC; + smartlist_t *AuthDirBadExitCC; + smartlist_t *AuthDirRejectCC; + smartlist_t *AuthDirInvalidCC; + /**@}*/ + int AuthDirListBadDirs; /**< True iff we should list bad dirs, * and vote for all other dir mirrors as good. */ int AuthDirListBadExits; /**< True iff we should list bad exits, diff --git a/src/or/policies.c b/src/or/policies.c index 40e5277..fdec687 100644 --- a/src/or/policies.c +++ b/src/or/policies.c @@ -14,6 +14,7 @@ #include "nodelist.h" #include "policies.h" #include "routerparse.h" +#include "geoip.h" #include "ht.h" /** Policy that addresses for incoming SOCKS connections must match. */ @@ -313,13 +314,29 @@ socks_policy_permits_address(const tor_addr_t *addr) return addr_policy_permits_tor_addr(addr, 1, socks_policy); } +/** Return true iff the address addr is in a country listed in the + * case-insentive list of country codes cc_list. */ +static int +addr_is_in_cc_list(uint32_t addr, const smartlist_t *cc_list) +{ + country_t country; + const char *name; + if (!cc_list) + return 0; + country = geoip_get_country_by_ip(addr); + name = geoip_get_country_name(country); + return smartlist_string_isin_case(cc_list, name); +} + /** Return 1 if addr:port is permitted to publish to our * directory, based on authdir_reject_policy. Else return 0. */ int authdir_policy_permits_address(uint32_t addr, uint16_t port) { - return addr_policy_permits_address(addr, port, authdir_reject_policy); + if (! addr_policy_permits_address(addr, port, authdir_reject_policy)) + return 0; + return !addr_is_in_cc_list(addr, get_options()->AuthDirRejectCC); } /** Return 1 if addr:port is considered valid in our @@ -328,7 +345,9 @@ authdir_policy_permits_address(uint32_t addr, uint16_t port) int authdir_policy_valid_address(uint32_t addr, uint16_t port) { - return addr_policy_permits_address(addr, port, authdir_invalid_policy); + if (! addr_policy_permits_address(addr, port, authdir_invalid_policy)) + return 0; + return !addr_is_in_cc_list(addr, get_options()->AuthDirInvalidCC); } /** Return 1 if addr:port should be marked as a bad dir, @@ -337,7 +356,9 @@ authdir_policy_valid_address(uint32_t addr, uint16_t port) int authdir_policy_baddir_address(uint32_t addr, uint16_t port) { - return ! addr_policy_permits_address(addr, port, authdir_baddir_policy); + if (! addr_policy_permits_address(addr, port, authdir_baddir_policy)) + return 1; + return addr_is_in_cc_list(addr, get_options()->AuthDirBadDirCC); } /** Return 1 if addr:port should be marked as a bad exit, @@ -346,7 +367,9 @@ authdir_policy_baddir_address(uint32_t addr, uint16_t port) int authdir_policy_badexit_address(uint32_t addr, uint16_t port) { - return ! addr_policy_permits_address(addr, port, authdir_badexit_policy); + if (! addr_policy_permits_address(addr, port, authdir_badexit_policy)) + return 1; + return addr_is_in_cc_list(addr, get_options()->AuthDirBadExitCC); } #define REJECT(arg) \

1 0

[tor-cloud/master] Update cloud.tpo with new AMI IDs
by runa＠torproject.org 16 Jan '12

16 Jan '12

commit f30b34505eceb157f2e7495b9c57e52b596465f4 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Mon Jan 16 19:14:49 2012 +0000 Update cloud.tpo with new AMI IDs --- html/index.html | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/html/index.html b/html/index.html index 7bd7f69..c7fe28a 100644 --- a/html/index.html +++ b/html/index.html @@ -136,15 +136,15 @@ information about pricing. <ul class="region-nav"> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-8939…" target="_blank">us-east-1 Virginia</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-012e…" target="_blank">us-west-1 N. California</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-94f1…" target="_blank">us-west-2 Oregon</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-5362…" target="_blank">us-east-1 Virginia</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-09a8…" target="_blank">us-west-1 N. California</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-ba4a…" target="_blank">us-west-2 Oregon</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-65b3…" target="_blank">eu-west-1 Ireland</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1 Tokyo</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1 Singapore</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-71a7…" target="_blank">eu-west-1 Ireland</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1 Tokyo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1 Singapore</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-a833…" target="_blank">sa-east-1 Sao Paulo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=sa-east-1#launchAmi=ami-2059…" target="_blank">sa-east-1 Sao Paulo</a></li> </ul> <hgroup>

1 0

[tor-cloud/master] Add arm to the FAQ
by runa＠torproject.org 16 Jan '12

16 Jan '12

commit c513ce5c490d43fb7d3813188256b3e38f7796e1 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Mon Jan 16 19:23:31 2012 +0000 Add arm to the FAQ --- html/index.html | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/html/index.html b/html/index.html index c7fe28a..49a5326 100644 --- a/html/index.html +++ b/html/index.html @@ -317,26 +317,35 @@ it again and choose "Start". The instance will be assigned a new IP address when it starts up again. - 8. What's in the Tor configuration file? + 8. What is arm and how do I use it? + The anonymizing relay monitor (arm) is a terminal status + monitor for Tor. This works much like top does for system + usage, providing real time statistics for bandwidth, cpu, memory + usage, current Tor configuration, connection details etc. To run + arm, connect to your instance with SSH and run sudo -u + debian-tor arm. You can read more about arm <a + href="http://www.atagar.com/arm/">here</a>. + + 9. What's in the Tor configuration file? The Tor configuration file that the images have been configured with can be found <a href="https://cloud.torproject.org/torrc.txt">here</a>. - 9. Will the images automatically download and install package updates? + 10. Will the images automatically download and install package updates? Yes, the images have all been configured with the <a href="https://help.ubuntu.com/community/AutomaticSecurityUpdates">unattended-upgrades</a> package. This means that your system will automatically download and install updates. - 10. Will you let me know when you publish new images? + 11. Will you let me know when you publish new images? New cloud images will be announced on <a href="https://twitter.com/torproject">Twitter</a>, <a href="https://identi.ca/torproject">identi.ca</a>, <a href="https://blog.torproject.org">our blog</a> and on the <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-talk">tor-talk</a> mailing list. - 11. Where do I report a bug I am encountering? + 12. Where do I report a bug I am encountering? If you think the bug you have found is specific to the Tor Cloud images we provide, please <a href="https://trac.torproject.org">file a bug</a> or send an email to help AT rt.torproject.org. - 12. Is there an IRC channel where I can ask about Tor Cloud? + 13. Is there an IRC channel where I can ask about Tor Cloud? Yes, simply join #tor on irc.oftc.net and ask your question. It may take a while before we get back to you, so please be patient. - 13. I have a question that is not answered here, what do I do? + 14. I have a question that is not answered here, what do I do? Please send an email to help AT rt.torproject.org. </div>

1 0

[stem/master] Removing test.runner.get_connection_type()
by atagar＠torproject.org 16 Jan '12

16 Jan '12

commit 6846ce359ede2c697688a2e143a3b3625f8a540b Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 16 10:09:46 2012 -0800 Removing test.runner.get_connection_type() Integration tests used the get_connection_type() method to either query or infer attributes about the connection it was running against. This was stupid - they should query the attributes directly and make test assertions based on that. The get_connection_type() value was our testing target which should simply be a user friendly tag for a set of testing attributes. Next I'll be moving testing targets completely from the runner so they only exist in 'run_tests.py'. --- test/integ/connection/authentication.py | 13 +++---- test/integ/connection/connect.py | 7 +--- test/integ/connection/protocolinfo.py | 54 +++++++++++++----------------- test/integ/util/system.py | 3 +- test/integ/version.py | 3 +- test/runner.py | 14 +------- 6 files changed, 33 insertions(+), 61 deletions(-) diff --git a/test/integ/connection/authentication.py b/test/integ/connection/authentication.py index 612e058..519e40a 100644 --- a/test/integ/connection/authentication.py +++ b/test/integ/connection/authentication.py @@ -30,10 +30,8 @@ class TestAuthenticate(unittest.TestCase): """ def setUp(self): - connection_type = test.runner.get_runner().get_connection_type() - # none of these tests apply if there's no control connection - if connection_type == test.runner.TorConnection.NONE: + if not test.runner.get_runner().is_accessible(): self.skipTest("(no connection)") def test_authenticate_general(self): @@ -51,8 +49,7 @@ class TestAuthenticate(unittest.TestCase): Tests the authenticate function with something like its pydoc example. """ - connection_type = test.runner.get_runner().get_connection_type() - connection_options = test.runner.CONNECTION_OPTS[connection_type] + connection_options = test.runner.get_runner().get_connection_options() try: control_socket = stem.socket.ControlPort(control_port = test.runner.CONTROL_PORT) @@ -91,7 +88,8 @@ class TestAuthenticate(unittest.TestCase): # authenticate with runner = test.runner.get_runner() - is_password_only = test.runner.TorConnection.PASSWORD == runner.get_connection_type() + connection_options = runner.get_connection_options() + is_password_only = test.runner.OPT_PASSWORD in connection_options and not test.runner.OPT_COOKIE in connection_options # tests without a password control_socket = runner.get_tor_socket(False) @@ -248,8 +246,7 @@ class TestAuthenticate(unittest.TestCase): bool tuple of the form (password_auth, cookie_auth) """ - connection_type = test.runner.get_runner().get_connection_type() - connection_options = test.runner.CONNECTION_OPTS[connection_type] + connection_options = test.runner.get_runner().get_connection_options() password_auth = test.runner.OPT_PASSWORD in connection_options cookie_auth = test.runner.OPT_COOKIE in connection_options diff --git a/test/integ/connection/connect.py b/test/integ/connection/connect.py index 6b0c16e..eea07a8 100644 --- a/test/integ/connection/connect.py +++ b/test/integ/connection/connect.py @@ -16,10 +16,8 @@ class TestConnect(unittest.TestCase): """ def setUp(self): - connection_type = test.runner.get_runner().get_connection_type() - # none of these tests apply if there's no control connection - if connection_type == test.runner.TorConnection.NONE: + if not test.runner.get_runner().is_accessible(): self.skipTest("(no connection)") def test_connect_port(self): @@ -46,7 +44,6 @@ class TestConnect(unittest.TestCase): sys.stdout = StringIO.StringIO() try: - connection_type = test.runner.get_runner().get_connection_type() ctl_pw = test.runner.CONTROL_PASSWORD controller = stem.connection.Controller.NONE @@ -59,7 +56,7 @@ class TestConnect(unittest.TestCase): ctl_socket = test.runner.CONTROL_SOCKET_PATH control_socket = stem.connection.connect_socket_file(socket_path = ctl_socket, password = ctl_pw, controller = controller) - if opt_type in test.runner.CONNECTION_OPTS[connection_type]: + if opt_type in test.runner.get_runner().get_connection_options(): test.runner.exercise_socket(self, control_socket) control_socket.close() else: diff --git a/test/integ/connection/protocolinfo.py b/test/integ/connection/protocolinfo.py index 0214534..24edd04 100644 --- a/test/integ/connection/protocolinfo.py +++ b/test/integ/connection/protocolinfo.py @@ -27,9 +27,8 @@ class TestProtocolInfo(unittest.TestCase): """ runner = test.runner.get_runner() - connection_type = runner.get_connection_type() - if connection_type == test.runner.TorConnection.NONE: + if not runner.is_accessible(): self.skipTest("(no connection)") control_socket = runner.get_tor_socket(False) @@ -46,7 +45,7 @@ class TestProtocolInfo(unittest.TestCase): self.assertNotEqual(None, protocolinfo_response.tor_version) self.assertNotEqual(None, protocolinfo_response.auth_methods) - self.assert_protocolinfo_attr(protocolinfo_response, connection_type) + self.assert_protocolinfo_attr(protocolinfo_response) def test_get_protocolinfo_by_port(self): """ @@ -73,12 +72,11 @@ class TestProtocolInfo(unittest.TestCase): return False stem.util.system.CALL_MOCKING = port_lookup_filter - connection_type = test.runner.get_runner().get_connection_type() - if test.runner.OPT_PORT in test.runner.CONNECTION_OPTS[connection_type]: + if test.runner.OPT_PORT in test.runner.get_runner().get_connection_options(): control_socket = stem.socket.ControlPort(control_port = test.runner.CONTROL_PORT) protocolinfo_response = stem.connection.get_protocolinfo(control_socket) - self.assert_protocolinfo_attr(protocolinfo_response, connection_type) + self.assert_protocolinfo_attr(protocolinfo_response) # we should have a usable socket at this point self.assertTrue(control_socket.is_alive()) @@ -105,12 +103,11 @@ class TestProtocolInfo(unittest.TestCase): return False stem.util.system.CALL_MOCKING = socket_lookup_filter - connection_type = test.runner.get_runner().get_connection_type() - if test.runner.OPT_SOCKET in test.runner.CONNECTION_OPTS[connection_type]: + if test.runner.OPT_SOCKET in test.runner.get_runner().get_connection_options(): control_socket = stem.socket.ControlSocketFile(test.runner.CONTROL_SOCKET_PATH) protocolinfo_response = stem.connection.get_protocolinfo(control_socket) - self.assert_protocolinfo_attr(protocolinfo_response, connection_type) + self.assert_protocolinfo_attr(protocolinfo_response) # we should have a usable socket at this point self.assertTrue(control_socket.is_alive()) @@ -127,20 +124,19 @@ class TestProtocolInfo(unittest.TestCase): """ runner = test.runner.get_runner() - connection_type = runner.get_connection_type() - if connection_type == test.runner.TorConnection.NONE: + if not runner.is_accessible(): self.skipTest("(no connection)") control_socket = runner.get_tor_socket(False) for i in range(5): protocolinfo_response = stem.connection.get_protocolinfo(control_socket) - self.assert_protocolinfo_attr(protocolinfo_response, connection_type) + self.assert_protocolinfo_attr(protocolinfo_response) control_socket.close() - def assert_protocolinfo_attr(self, protocolinfo_response, connection_type): + def assert_protocolinfo_attr(self, protocolinfo_response): """ Makes assertions that the protocolinfo response's attributes match those of a given connection type. @@ -149,28 +145,24 @@ class TestProtocolInfo(unittest.TestCase): # This should never have test.runner.TorConnection.NONE. If we somehow got # a protocolinfo_response from that config then we have an issue. :) - if connection_type == test.runner.TorConnection.OPEN: - auth_methods = (stem.connection.AuthMethod.NONE,) - elif connection_type == test.runner.TorConnection.PASSWORD: - auth_methods = (stem.connection.AuthMethod.PASSWORD,) - elif connection_type == test.runner.TorConnection.COOKIE: - auth_methods = (stem.connection.AuthMethod.COOKIE,) - elif connection_type == test.runner.TorConnection.MULTIPLE: - auth_methods = (stem.connection.AuthMethod.COOKIE, stem.connection.AuthMethod.PASSWORD) - elif connection_type == test.runner.TorConnection.SOCKET: - auth_methods = (stem.connection.AuthMethod.NONE,) - elif connection_type == test.runner.TorConnection.SCOOKIE: - auth_methods = (stem.connection.AuthMethod.COOKIE,) - elif connection_type == test.runner.TorConnection.PTRACE: - auth_methods = (stem.connection.AuthMethod.NONE,) - else: - self.fail("Unrecognized connection type: %s" % connection_type) + connection_options = test.runner.get_runner().get_connection_options() + + auth_methods = [] + + if test.runner.OPT_COOKIE in connection_options: + auth_methods.append(stem.connection.AuthMethod.COOKIE) + + if test.runner.OPT_PASSWORD in connection_options: + auth_methods.append(stem.connection.AuthMethod.PASSWORD) + + if not auth_methods: + auth_methods.append(stem.connection.AuthMethod.NONE) self.assertEqual((), protocolinfo_response.unknown_auth_methods) - self.assertEqual(auth_methods, protocolinfo_response.auth_methods) + self.assertEqual(tuple(auth_methods), protocolinfo_response.auth_methods) auth_cookie_path = None - if test.runner.OPT_COOKIE in test.runner.CONNECTION_OPTS[connection_type]: + if test.runner.OPT_COOKIE in connection_options: auth_cookie_path = test.runner.get_runner().get_auth_cookie_path() self.assertEqual(auth_cookie_path, protocolinfo_response.cookie_path) diff --git a/test/integ/util/system.py b/test/integ/util/system.py index e06c05b..2acb488 100644 --- a/test/integ/util/system.py +++ b/test/integ/util/system.py @@ -319,6 +319,5 @@ class TestSystem(unittest.TestCase): True if our test runner has a control port, False otherwise. """ - connection_type = runner = test.runner.get_runner().get_connection_type() - return test.runner.OPT_PORT in test.runner.CONNECTION_OPTS[connection_type] + return test.runner.OPT_PORT in test.runner.get_runner().get_connection_options() diff --git a/test/integ/version.py b/test/integ/version.py index 9bd7ee7..9fa7fd8 100644 --- a/test/integ/version.py +++ b/test/integ/version.py @@ -40,9 +40,8 @@ class TestVersion(unittest.TestCase): """ runner = test.runner.get_runner() - connection_type = runner.get_connection_type() - if connection_type == test.runner.TorConnection.NONE: + if not runner.is_accessible(): self.skipTest("(no connection)") control_socket = runner.get_tor_socket() diff --git a/test/runner.py b/test/runner.py index 4d163bf..50a1031 100644 --- a/test/runner.py +++ b/test/runner.py @@ -15,7 +15,6 @@ Runner - Runtime context for our integration tests. |- 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 |- get_connection_options - connection related options we're running with |- get_pid - process id of our tor process |- get_tor_socket - provides a socket to the tor instance @@ -357,17 +356,6 @@ class Runner: return self._get("_torrc_contents") - def get_connection_type(self): - """ - Provides the method we can use for connecting to the tor instance. - - Returns: - test.runner.TorConnection enumeration for the method we can use for - connecting to the tor test instance - """ - - return self._connection_type - def get_connection_options(self): """ Provides the connection related options we're running with. @@ -376,7 +364,7 @@ class Runner: list of connection contstants (test.runner.OPT_*) we're running with """ - return CONNECTION_OPTS[self.get_connection_type()] + return CONNECTION_OPTS[self._connection_type] def get_pid(self): """

1 0

[metrics-db/master] Sanitize IPv6 bridge addresses.
by karsten＠torproject.org 16 Jan '12

16 Jan '12

commit 70a3d9989d62550d28967aab17ab078a91097991 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 16 18:06:15 2012 +0100 Sanitize IPv6 bridge addresses. --- .../ernie/db/SanitizedBridgesWriter.java | 233 ++++++++++++++++---- 1 files changed, 189 insertions(+), 44 deletions(-) diff --git a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java index a3ead19..7e3055c 100644 --- a/src/org/torproject/ernie/db/SanitizedBridgesWriter.java +++ b/src/org/torproject/ernie/db/SanitizedBridgesWriter.java @@ -229,8 +229,10 @@ public class SanitizedBridgesWriter { this.bridgeIpSecretsFile)); String line; while ((line = br.readLine()) != null) { - if (line.length() != ("yyyy-MM,".length() + 31 * 2) || - line.split(",").length != 2) { + String[] parts = line.split(","); + if ((line.length() != ("yyyy-MM,".length() + 31 * 2) && + line.length() != ("yyyy-MM,".length() + 50 * 2)) || + parts.length != 2) { this.logger.warning("Invalid line in bridge-ip-secrets file " + "starting with '" + line.substring(0, 7) + "'! " + "Not calculating any IP address hashes in this " @@ -238,7 +240,6 @@ public class SanitizedBridgesWriter { this.persistenceProblemWithSecrets = true; break; } - String[] parts = line.split(","); String month = parts[0]; byte[] secret = Hex.decodeHex(parts[1].toCharArray()); this.secretsForHashingIPAddresses.put(month, secret); @@ -315,7 +316,28 @@ public class SanitizedBridgesWriter { } } - private String scrubAddress(String address, byte[] fingerprintBytes, + private String scrubOrAddress(String orAddress, byte[] fingerprintBytes, + String published) throws IOException { + if (!orAddress.contains(":")) { + /* Malformed or-address or a line. */ + return null; + } + String addressPart = orAddress.substring(0, + orAddress.lastIndexOf(":")); + String portPart = orAddress.substring(orAddress.lastIndexOf(":") + 1); + String scrubbedAddressPart = null; + if (addressPart.startsWith("[")) { + scrubbedAddressPart = this.scrubIpv6Address(addressPart, + fingerprintBytes, published); + } else { + scrubbedAddressPart = this.scrubIpv6Address(addressPart, + fingerprintBytes, published); + } + return (scrubbedAddressPart == null ? null : + scrubbedAddressPart + ":" + portPart); + } + + private String scrubIpv4Address(String address, byte[] fingerprintBytes, String published) throws IOException { if (this.replaceIPAddressesWithHashes) { if (this.persistenceProblemWithSecrets) { @@ -330,37 +352,7 @@ public class SanitizedBridgesWriter { } System.arraycopy(fingerprintBytes, 0, hashInput, 4, 20); String month = published.substring(0, "yyyy-MM".length()); - if (!this.secretsForHashingIPAddresses.containsKey(month)) { - byte[] secret = new byte[31]; - this.secureRandom.nextBytes(secret); - if (month.compareTo( - this.bridgeDescriptorMappingsCutOffTimestamp) < 0) { - this.logger.warning("Generated a secret that we won't make " - + "persistent, because it's outside our bridge descriptors " - + "mapping interval."); - } else { - /* Append secret to file on disk immediately before using it, or - * we might end with inconsistently sanitized bridges. */ - try { - if (!this.bridgeIpSecretsFile.exists()) { - this.bridgeIpSecretsFile.getParentFile().mkdirs(); - } - BufferedWriter bw = new BufferedWriter(new FileWriter( - this.bridgeIpSecretsFile, - this.bridgeIpSecretsFile.exists())); - bw.write(month + "," + Hex.encodeHexString(secret) + "\n"); - bw.close(); - } catch (IOException e) { - this.logger.log(Level.WARNING, "Could not store new secret " - + "to disk! Not calculating any IP address hashes in " - + "this execution!", e); - this.persistenceProblemWithSecrets = true; - throw new IOException(e); - } - } - this.secretsForHashingIPAddresses.put(month, secret); - } - byte[] secret = this.secretsForHashingIPAddresses.get(month); + byte[] secret = this.getSecretForMonth(month); System.arraycopy(secret, 0, hashInput, 24, 31); byte[] hashOutput = DigestUtils.sha256(hashInput); String hashedAddress = "10." @@ -373,6 +365,119 @@ public class SanitizedBridgesWriter { } } + private String scrubIpv6Address(String address, byte[] fingerprintBytes, + String published) throws IOException { + StringBuilder sb = new StringBuilder("[fd9f:2e19:3bcf::"); + if (this.replaceIPAddressesWithHashes) { + if (this.persistenceProblemWithSecrets) { + /* There's a persistence problem, so we shouldn't scrub more IP + * addresses in this execution. */ + return null; + } + byte[] hashInput = new byte[16 + 20 + 19]; + StringBuilder hex = new StringBuilder(); + String[] parts = address.substring(1, address.length() - 1). + split(":", -1); + if (parts.length < 1 || parts.length > 8) { + /* Invalid IPv6 address. */ + return null; + } + for (int i = 0; i < parts.length; i++) { + String part = parts[i]; + if (part.contains(".")) { + String[] ipParts = part.split("\\."); + byte[] ipv4Bytes = new byte[4]; + if (ipParts.length != 4) { + /* Invalid IPv4 part in IPv6 address. */ + return null; + } + for (int m = 0; m < 4; m++) { + ipv4Bytes[m] = (byte) Integer.parseInt(ipParts[m]); + } + hex.append(Hex.encodeHexString(ipv4Bytes)); + } else if (part.length() > 4) { + /* Invalid IPv6 address. */ + return null; + } else if (part.length() < 1) { + int j = parts.length - 1; + if (address.contains(".")) { + j++; + } + for (; j < 8; j++) { + hex.append("0000"); + } + } else { + for (int k = part.length(); k < 4; k++) { + hex.append("0"); + } + hex.append(part); + } + } + byte[] ipBytes = null; + try { + ipBytes = Hex.decodeHex(hex.toString().toCharArray()); + } catch (DecoderException e) { + /* TODO Invalid IPv6 address. */ + return null; + } + if (ipBytes.length != 16) { + /* TODO Invalid IPv6 address. */ + return null; + } + System.arraycopy(ipBytes, 0, hashInput, 0, 16); + System.arraycopy(fingerprintBytes, 0, hashInput, 16, 20); + String month = published.substring(0, "yyyy-MM".length()); + byte[] secret = this.getSecretForMonth(month); + System.arraycopy(secret, 31, hashInput, 36, 19); + String hashOutput = DigestUtils.sha256Hex(hashInput); + sb.append(hashOutput.substring(hashOutput.length() - 6, + hashOutput.length() - 4)); + sb.append(":"); + sb.append(hashOutput.substring(hashOutput.length() - 4)); + } + sb.append("]"); + return sb.toString(); + } + + private byte[] getSecretForMonth(String month) throws IOException { + if (!this.secretsForHashingIPAddresses.containsKey(month) || + this.secretsForHashingIPAddresses.get(month).length == 31) { + byte[] secret = new byte[50]; + this.secureRandom.nextBytes(secret); + if (this.secretsForHashingIPAddresses.containsKey(month)) { + System.arraycopy(this.secretsForHashingIPAddresses.get(month), 0, + secret, 0, 31); + } + if (month.compareTo( + this.bridgeDescriptorMappingsCutOffTimestamp) < 0) { + this.logger.warning("Generated a secret that we won't make " + + "persistent, because it's outside our bridge descriptors " + + "mapping interval."); + } else { + /* Append secret to file on disk immediately before using it, or + * we might end with inconsistently sanitized bridges. */ + try { + if (!this.bridgeIpSecretsFile.exists()) { + this.bridgeIpSecretsFile.getParentFile().mkdirs(); + } + BufferedWriter bw = new BufferedWriter(new FileWriter( + this.bridgeIpSecretsFile, + this.bridgeIpSecretsFile.exists())); + bw.write(month + "," + Hex.encodeHexString(secret) + "\n"); + bw.close(); + } catch (IOException e) { + this.logger.log(Level.WARNING, "Could not store new secret " + + "to disk! Not calculating any IP address hashes in " + + "this execution!", e); + this.persistenceProblemWithSecrets = true; + throw new IOException(e); + } + } + this.secretsForHashingIPAddresses.put(month, secret); + } + return this.secretsForHashingIPAddresses.get(month); + } + /** * Sanitizes a network status and writes it to disk. Processes every r * line separately and looks up whether the descriptor mapping contains @@ -404,6 +509,8 @@ public class SanitizedBridgesWriter { data, "US-ASCII"))); String line = null; String mostRecentDescPublished = null; + byte[] fingerprintBytes = null; + String descPublicationTime = null; while ((line = br.readLine()) != null) { /* r lines contain sensitive information that needs to be removed @@ -412,8 +519,8 @@ public class SanitizedBridgesWriter { /* Parse the relevant parts of this r line. */ String[] parts = line.split(" "); - String bridgeIdentity = parts[2]; - String descPublicationTime = parts[4] + " " + parts[5]; + fingerprintBytes = Base64.decodeBase64(parts[2] + "=="); + descPublicationTime = parts[4] + " " + parts[5]; String address = parts[6]; String orPort = parts[7]; String dirPort = parts[8]; @@ -421,8 +528,7 @@ public class SanitizedBridgesWriter { /* Look up the descriptor in the descriptor mapping, or add a * new mapping entry if there is none. */ String hashedBridgeIdentityHex = Hex.encodeHexString( - DigestUtils.sha(Base64.decodeBase64(bridgeIdentity - + "=="))).toLowerCase(); + DigestUtils.sha(fingerprintBytes)).toLowerCase(); String mappingKey = hashedBridgeIdentityHex + "," + descPublicationTime; DescriptorMapping mapping = null; @@ -443,15 +549,13 @@ public class SanitizedBridgesWriter { /* Write scrubbed r line to buffer. */ String hashedBridgeIdentityBase64 = Base64.encodeBase64String( - DigestUtils.sha(Base64.decodeBase64(bridgeIdentity - + "=="))).substring(0, 27); + DigestUtils.sha(fingerprintBytes)).substring(0, 27); String sdi = Base64.encodeBase64String(Hex.decodeHex( mapping.serverDescriptorIdentifier.toCharArray())). substring(0, 27); String scrubbedAddress = null; try { - scrubbedAddress = scrubAddress(address, - Base64.decodeBase64(bridgeIdentity + "=="), + scrubbedAddress = scrubIpv4Address(address, fingerprintBytes, descPublicationTime); } catch (IOException e) { return; @@ -466,6 +570,19 @@ public class SanitizedBridgesWriter { + descPublicationTime + " " + scrubbedAddress + " " + orPort + " " + dirPort + "\n"); + /* Sanitize any addresses in a lines using the fingerprint and + * descriptor publication time from the previous r line. */ + } else if (line.startsWith("a ")) { + String scrubbedOrAddress = scrubOrAddress( + line.substring("a ".length()), fingerprintBytes, + descPublicationTime); + if (scrubbedOrAddress != null) { + scrubbed.append("a " + scrubbedOrAddress + "\n"); + } else { + this.logger.warning("Invalid address in line '" + line + + "' in bridge network status. Skipping line!"); + } + /* Nothing special about s, w, and p lines; just copy them. */ } else if (line.startsWith("s ") || line.equals("s") || line.startsWith("w ") || line.equals("w") || @@ -574,6 +691,7 @@ public class SanitizedBridgesWriter { StringBuilder scrubbed = new StringBuilder(); String line = null, hashedBridgeIdentity = null, address = null, published = null, routerLine = null, scrubbedAddress = null; + List<String> orAddresses = null, scrubbedOrAddresses = null; boolean skipCrypto = false; while ((line = br.readLine()) != null) { @@ -604,6 +722,14 @@ public class SanitizedBridgesWriter { address = line.split(" ")[2]; routerLine = line; + /* Store or-address parts in a list and sanitize them when we have + * read the fingerprint. */ + } else if (line.startsWith("or-address ")) { + if (orAddresses == null) { + orAddresses = new ArrayList<String>(); + } + orAddresses.add(line.substring("or-address ".length())); + /* Parse the publication time and add it to the list of descriptor * publication times to re-write network statuses at the end of * the sanitizing procedure. */ @@ -632,8 +758,21 @@ public class SanitizedBridgesWriter { hashedBridgeIdentity = DigestUtils.shaHex(fingerprintBytes). toLowerCase(); try { - scrubbedAddress = scrubAddress(address, fingerprintBytes, + scrubbedAddress = scrubIpv4Address(address, fingerprintBytes, published); + if (orAddresses != null) { + scrubbedOrAddresses = new ArrayList<String>(); + for (String orAddress : orAddresses) { + String scrubbedOrAddress = scrubOrAddress(orAddress, + fingerprintBytes, published); + if (scrubbedOrAddress != null) { + scrubbedOrAddresses.add(scrubbedOrAddress); + } else { + this.logger.warning("Invalid address in line '" + line + + "' in bridge server descriptor. Skipping line!"); + } + } + } } catch (IOException e) { /* There's a persistence problem, so we shouldn't scrub more * IP addresses in this execution. */ @@ -656,6 +795,12 @@ public class SanitizedBridgesWriter { scrubbedDesc = "router Unnamed " + scrubbedAddress + " " + routerLineParts[3] + " " + routerLineParts[4] + " " + routerLineParts[5] + "\n"; + if (scrubbedOrAddresses != null) { + for (String scrubbedOrAddress : scrubbedOrAddresses) { + scrubbedDesc = scrubbedDesc += "or-address " + + scrubbedOrAddress + "\n"; + } + } scrubbedDesc += scrubbed.toString(); break;

1 0

[tor-cloud/master] arm wants ExitPolicy and not Exitpolicy, make arm happy
by runa＠torproject.org 16 Jan '12

16 Jan '12

commit ee0bb90ab3a7c83e0e04e2c5f6985a10c4f86fb1 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Mon Jan 16 16:34:25 2012 +0000 arm wants ExitPolicy and not Exitpolicy, make arm happy --- ec2-prep.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ec2-prep.sh b/ec2-prep.sh index 555347b..8c5f25a 100644 --- a/ec2-prep.sh +++ b/ec2-prep.sh @@ -257,7 +257,7 @@ AccountingMax 10 GB # Running a bridge relay just passes data to and from the Tor network -- # so it shouldn't expose the operator to abuse complaints. -Exitpolicy reject *:* +ExitPolicy reject *:* EOF fi

1 0

[tor-cloud/master] Spelling ftw
by runa＠torproject.org 16 Jan '12

16 Jan '12

commit 63f5903ad42d32ca3e8f19ebaf7a9accea5336b6 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Mon Jan 16 16:14:15 2012 +0000 Spelling ftw --- ec2-prep.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ec2-prep.sh b/ec2-prep.sh index 84d19d3..555347b 100644 --- a/ec2-prep.sh +++ b/ec2-prep.sh @@ -112,7 +112,7 @@ EOF echo "Installing Tor's gpg key..."; #gpg --keyserver keys.gnupg.net --recv 886DDD89 #gpg --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add - -cat << EOF > $TORKEY +cat << EOF > $GPGKEY -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.4.11 (GNU/Linux)

1 0

[tor-cloud/master] New cloud images will include arm
by runa＠torproject.org 16 Jan '12

16 Jan '12

commit e945ed23d2d8dde60944e5efe352315f96b292dd Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Mon Jan 16 15:02:32 2012 +0000 New cloud images will include arm --- ec2-prep.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ec2-prep.sh b/ec2-prep.sh index 0e9f712..84d19d3 100644 --- a/ec2-prep.sh +++ b/ec2-prep.sh @@ -218,10 +218,10 @@ yIJpnL6TsA5uFqUosz2rOPKeeDOtruSo490PTA== EOF apt-key add $GPGKEY -# Install Tor +# Install Tor and arm echo "Installing Tor..."; aptitude update -aptitude -y install tor tor-geoipdb +aptitude -y install tor tor-geoipdb tor-arm # Configure Tor echo "Configuring Tor...";

1 0