December 2011 - tor-commits - lists.torproject.org

[tor/master] Adjust n_intro_points_wanted when a service's intro points are closed
by nickm＠torproject.org 20 Dec '11

20 Dec '11

commit dae000735e75b178cdf27000d316f6504bf61373 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Dec 13 05:00:09 2011 -0800 Adjust n_intro_points_wanted when a service's intro points are closed --- changes/bug3825b | 7 +++ src/or/or.h | 5 ++ src/or/rendservice.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 124 insertions(+), 0 deletions(-) diff --git a/changes/bug3825b b/changes/bug3825b new file mode 100644 index 0000000..08c0c2d --- /dev/null +++ b/changes/bug3825b @@ -0,0 +1,7 @@ + o Major features: + + - Adjust the number of introduction points that a hidden service + will try to maintain based on how long its introduction points + remain in use and how many introductions they handle. Fixes + part of bug 3825. + diff --git a/src/or/or.h b/src/or/or.h index 6ff02ee..63ff5c4 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4114,6 +4114,11 @@ typedef struct rend_intro_point_t { * included in the last HS descriptor we generated. */ unsigned int listed_in_last_desc : 1; + /** (Service side only) Flag indicating that + * rend_service_note_removing_intro_point has been called for this + * intro point. */ + unsigned int rend_service_note_removing_intro_point_called : 1; + /** (Service side only) A digestmap recording the INTRODUCE2 cells * this intro point's circuit has received. Each key is the digest * of the RSA-encrypted part of a received INTRODUCE2 cell; each diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 0f22cdf..646d423 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -116,6 +116,17 @@ num_rend_services(void) return smartlist_len(rend_service_list); } +/** Return a string identifying service, suitable for use in a + * log message. The result does not need to be freed, but may be + * overwritten by the next call to this function. */ +static const char * +rend_service_describe_for_log(rend_service_t *service) +{ + /* XXX024 Use this function throughout rendservice.c. */ + /* XXX024 Return a more useful description? */ + return safe_str_client(service->service_id); +} + /** Helper: free storage held by a single service authorized client entry. */ static void rend_authorized_client_free(rend_authorized_client_t *client) @@ -915,6 +926,104 @@ clean_accepted_intro_dh_parts(rend_service_t *service, time_t now) } DIGESTMAP_FOREACH_END; } +/** Called when intro will soon be removed from + * service's list of intro points. */ +static void +rend_service_note_removing_intro_point(rend_service_t *service, + rend_intro_point_t *intro) +{ + time_t now = time(NULL); + + /* Don't process an intro point twice here. */ + if (intro->rend_service_note_removing_intro_point_called) { + return; + } else { + intro->rend_service_note_removing_intro_point_called = 1; + } + + /* Update service->n_intro_points_wanted based on how long intro + * lasted and how many introductions it handled. */ + if (intro->time_published == -1) { + /* This intro point was never used. Don't change + * n_intro_points_wanted. */ + } else { + /* We want to increase the number of introduction points service + * operates if intro was heavily used, or decrease the number of + * intro points if intro was lightly used. + * + * We consider an intro point's target 'usage' to be + * INTRO_POINT_LIFETIME_INTRODUCTIONS introductions in + * INTRO_POINT_LIFETIME_MIN_SECONDS seconds. To calculate intro's + * fraction of target usage, we divide the fraction of + * _LIFETIME_INTRODUCTIONS introductions that it has handled by + * the fraction of _LIFETIME_MIN_SECONDS for which it existed. + * + * Then we take the reciprocal of that fraction of desired usage, + * then multiply by a fudge factor of 1.5, to decide how many new + * introduction points should ideally replace intro (which is now + * closed or soon to be closed). In theory, assuming that + * introduction load is distributed equally across all intro + * points and ignoring the fact that different intro points are + * established and closed at different times, that number of intro + * points should bring all of our intro points exactly to our + * target usage. + * + * Then we clamp that number to a number of intro points we might + * be willing to replace this intro point with and turn it into an + * integer. then we clamp it again to the number of new intro + * points we could establish now, then we adjust + * service->n_intro_points_wanted and let rend_services_introduce + * create the new intro points we want (if any). + */ + double fractional_n_intro_points_wanted_to_replace_this_one = + ((((double)now - intro->time_published) / + INTRO_POINT_LIFETIME_MIN_SECONDS) * + ((intro_point_accepted_intro_count(intro)) / + INTRO_POINT_LIFETIME_INTRODUCTIONS)) * 1.5; + unsigned int n_intro_points_wanted_to_replace_this_one; + unsigned int n_intro_points_wanted_now; + unsigned int n_intro_points_really_wanted_now; + int n_intro_points_really_replacing_this_one; + + if (fractional_n_intro_points_wanted_to_replace_this_one > + NUM_INTRO_POINTS_MAX) { + n_intro_points_wanted_to_replace_this_one = NUM_INTRO_POINTS_MAX; + } else if (fractional_n_intro_points_wanted_to_replace_this_one < 0) { + n_intro_points_wanted_to_replace_this_one = 0; + } else { + n_intro_points_wanted_to_replace_this_one = + fractional_n_intro_points_wanted_to_replace_this_one; + } + + n_intro_points_wanted_now = + service->n_intro_points_wanted + + n_intro_points_wanted_to_replace_this_one - 1; + + if (n_intro_points_wanted_now < NUM_INTRO_POINTS_DEFAULT) { + /* XXXX This should be NUM_INTRO_POINTS_MIN instead. Perhaps + * another use of NUM_INTRO_POINTS_DEFAULT should be, too. */ + n_intro_points_really_wanted_now = NUM_INTRO_POINTS_DEFAULT; + } else if (n_intro_points_wanted_now > NUM_INTRO_POINTS_MAX) { + n_intro_points_really_wanted_now = NUM_INTRO_POINTS_MAX; + } else { + n_intro_points_really_wanted_now = n_intro_points_wanted_now; + } + + n_intro_points_really_replacing_this_one = + n_intro_points_really_wanted_now - service->n_intro_points_wanted + 1; + + log_info(LD_REND, "Replacing closing intro point for service %s " + "with %d new intro points (wanted %g replacements); " + "service will now try to have %u intro points", + rend_service_describe_for_log(service), + n_intro_points_really_replacing_this_one, + fractional_n_intro_points_wanted_to_replace_this_one, + n_intro_points_really_wanted_now); + + service->n_intro_points_wanted = n_intro_points_really_wanted_now; + } +} + /****** * Handle cells ******/ @@ -2073,6 +2182,7 @@ rend_services_introduce(void) " (circuit disappeared).", safe_str_client(extend_info_describe(intro->extend_info)), safe_str_client(service->service_id)); + rend_service_note_removing_intro_point(service, intro); if (intro->time_expiring != -1) { log_info(LD_REND, "We were already expiring the intro point; " "no need to mark the HS descriptor as dirty over this."); @@ -2095,6 +2205,8 @@ rend_services_introduce(void) safe_str_client(extend_info_describe(intro->extend_info)), safe_str_client(service->service_id)); + rend_service_note_removing_intro_point(service, intro); + /* The polite (and generally Right) way to expire an intro * point is to establish a new one to replace it, publish a * new descriptor that doesn't list any expiring intro points,

1 0

[tor/master] Add explicit cast to make gcc happy
by nickm＠torproject.org 20 Dec '11

20 Dec '11

commit ba1766bc3f2ed18662f3ef3a527ca75a54ee9595 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 20 11:19:57 2011 -0500 Add explicit cast to make gcc happy --- src/or/rendservice.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 646d423..76caeff 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -991,7 +991,7 @@ rend_service_note_removing_intro_point(rend_service_t *service, } else if (fractional_n_intro_points_wanted_to_replace_this_one < 0) { n_intro_points_wanted_to_replace_this_one = 0; } else { - n_intro_points_wanted_to_replace_this_one = + n_intro_points_wanted_to_replace_this_one = (unsigned) fractional_n_intro_points_wanted_to_replace_this_one; }

1 0

[tor/master] Merge branch 'bug3825b-v8-squashed'
by nickm＠torproject.org 20 Dec '11

20 Dec '11

commit 4080ac9eee76bf7ef92e71a5a9af27a2aa354ca9 Merge: ec18c8a dae0007 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 20 11:15:49 2011 -0500 Merge branch 'bug3825b-v8-squashed' changes/bug3825b | 7 +++ src/or/or.h | 5 ++ src/or/rendservice.c | 128 +++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 138 insertions(+), 2 deletions(-)

1 0

[stem/master] Strip whitespaces from is_running ps results
by atagar＠torproject.org 19 Dec '11

19 Dec '11

commit f1a41ecc8534327772f9eca3430e373a2b8a54b8 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Dec 19 09:52:03 2011 -0800 Strip whitespaces from is_running ps results Fix and unit testing for whitespace in the ps results. Also fixing the unit test so we make sure that we get False rather than None when we confirmed that the command wasn't running. --- stem/util/system.py | 1 + test/unit/util/system.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stem/util/system.py b/stem/util/system.py index 659d3ca..8d4708e 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -136,6 +136,7 @@ def is_running(command): command_listing = call(secondary_resolver) if command_listing: + command_listing = map(str.strip, command_listing) return command in command_listing return None diff --git a/test/unit/util/system.py b/test/unit/util/system.py index 1941c46..e3d1225 100644 --- a/test/unit/util/system.py +++ b/test/unit/util/system.py @@ -84,7 +84,7 @@ class TestSystem(unittest.TestCase): """ # mock response with a linux and bsd resolver - running_commands = ["irssi", "moc", "tor", "ps"] + running_commands = ["irssi", "moc", "tor", "ps", " firefox "] for ps_cmd in (system.IS_RUNNING_PS_LINUX, system.IS_RUNNING_PS_BSD): system.CALL_MOCKING = functools.partial(mock_call, ps_cmd, running_commands) @@ -93,7 +93,8 @@ class TestSystem(unittest.TestCase): self.assertTrue(system.is_running("moc")) self.assertTrue(system.is_running("tor")) self.assertTrue(system.is_running("ps")) - self.assertFalse(system.is_running("something_else")) + self.assertTrue(system.is_running("firefox")) + self.assertEqual(False, system.is_running("something_else")) # mock both calls failing system.CALL_MOCKING = lambda cmd: None

1 0

[stem/master] Fixing the reg exp to accept git SHA1 in Version
by atagar＠torproject.org 19 Dec '11

19 Dec '11

commit 292a90b6aac0574453f0187f3705e84aee59f808 Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com> Date: Mon Dec 19 22:20:01 2011 +0530 Fixing the reg exp to accept git SHA1 in Version Originally the reg exp checked didn't take into account the git commit [0.2.2.23-alpha (git-7dcd105be34a4f44)], which produced an Error. Now, the status tag consumes the git SHA1 as well. Appropriate test cases have been added for integ testing. --- stem/version.py | 4 ++-- test/unit/version.py | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/stem/version.py b/stem/version.py index 26080cc..b984125 100644 --- a/stem/version.py +++ b/stem/version.py @@ -88,14 +88,14 @@ class Version: def __init__(self, version_str): """ Parses a valid tor version string, for instance "0.1.4" or - "0.2.2.23-alpha". + "0.2.2.23-alpha (git-7dcd105be34a4f44)". Raises: ValueError if input isn't a valid tor version """ self.version_str = version_str - m = re.match(r'^([0-9]+).([0-9]+).([0-9]+)(.[0-9]+)?(-\S*)?$', version_str) + m = re.match(r'^([0-9]+).([0-9]+).([0-9]+)(.[0-9]+)?(-.*)?$', version_str) if m: major, minor, micro, patch, status = m.groups() diff --git a/test/unit/version.py b/test/unit/version.py index 7cff127..787d9c8 100644 --- a/test/unit/version.py +++ b/test/unit/version.py @@ -16,6 +16,10 @@ class TestVersion(unittest.TestCase): """ # valid versions with various number of compontents to the version + + version = stem.version.Version("0.1.2.3-tag (git-7dcd105be34a4f44)") + self.assert_versions_match(version, 0, 1, 2, 3, "tag (git-7dcd105be34a4f44)") + version = stem.version.Version("0.1.2.3-tag") self.assert_versions_match(version, 0, 1, 2, 3, "tag") @@ -50,6 +54,7 @@ class TestVersion(unittest.TestCase): # check for basic incrementing in each portion self.assert_version_is_greater("1.1.2.3-tag", "0.1.2.3-tag") + self.assert_version_is_greater("1.1.2.3-tag (git-7dcd105be34a4f44)", "0.1.2.3-tag (git-7dcd105be34a4f44)") 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") @@ -86,7 +91,7 @@ class TestVersion(unittest.TestCase): """ # checks conversion with various numbers of arguments - + self.assert_string_matches("0.1.2.3-tag (git-7dcd105be34a4f44)") self.assert_string_matches("0.1.2.3-tag") self.assert_string_matches("0.1.2.3") self.assert_string_matches("0.1.2")

1 0

[obfsproxy/master] Improve obfs2 doc/protocol-spec.txt.
by nickm＠torproject.org 19 Dec '11

19 Dec '11

commit f439d980caef07a834771fde90a726dcf156e31d Author: George Kadianakis <desnacked(a)gmail.com> Date: Mon Dec 19 13:42:03 2011 +0100 Improve obfs2 doc/protocol-spec.txt. * Change E_K(s) notation to E(K,s) to improve readability. * Mention that the connection should be closed immediately in the case of wrong plength/magic (#3291). * Mention that the shared secret is hashed before using it in MAC(). --- doc/protocol-spec.txt | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-) diff --git a/doc/protocol-spec.txt b/doc/protocol-spec.txt index c11f653..4035b23 100644 --- a/doc/protocol-spec.txt +++ b/doc/protocol-spec.txt @@ -1,4 +1,4 @@ -The Twobfuscator + obfs2 (The Twobfuscator) 0. Protocol overview @@ -17,9 +17,9 @@ The Twobfuscator 1. Primitives, notation, and constants. H(x) is SHA256 of x. - H^n(x) is H(x) called iteratively n times. + H^n(x) is H(x) called iteratively n times. - E_K(s) is the AES-CTR-128 encryption of s using K as key. + E(K,s) is the AES-CTR-128 encryption of s using K as key. x | y is the concatenation of x and y. UINT32(n) is the 4 byte value of n in big-endian (network) order. @@ -34,8 +34,8 @@ The Twobfuscator MAX_PADDING is 8192 HASH_ITERATIONS is 100000 - KEYLEN is the length of the key used by E_K(s) -- that is, 16. - IVLEN is the length of the IV used by E_K(s) -- that is, 16 + KEYLEN is the length of the key used by E(K,s) -- that is, 16. + IVLEN is the length of the IV used by E(K,s) -- that is, 16. HASHLEN is the length of the output of H() -- that is, 32. @@ -64,18 +64,17 @@ The Twobfuscator The initiator then sends: - SEED | INIT_PAD_KEY( UINT32(MAGIC_VALUE) | UINT32(PADLEN) | WR(PADLEN) ) + INIT_SEED | E(INIT_PAD_KEY, UINT32(MAGIC_VALUE) | UINT32(PADLEN) | WR(PADLEN)) and the responder replies with: - SEED | RESP_PAD_KEY( UINT32(MAGIC_VALUE) | UINT32(PADLEN) | WR(PADLEN) ) + RESP_SEED | E(RESP_PAD_KEY, UINT32(MAGIC_VALUE) | UINT32(PADLEN) | WR(PADLEN)) Upon receiving the SEED from the other party, each party derives the other party's padding key value as above, and decrypts the next 8 bytes of the key establishment message. If the MAGIC_VALUE does not match, or the PADLEN value is greater than MAX_PADDING, the - party receiving it should wait for a random amount of time (with - maximum wait time being 4 seconds) then close the connection. + party receiving it should close the connection immediately. Otherwise, it should read the remaining PADLEN bytes of padding data and discard them. @@ -99,6 +98,6 @@ The Twobfuscator Optionally, if the client and server share a secret value SECRET, they can replace the MAC function with: - MAC(s,x) = H^n(s | x | SECRET | s) + MAC(s,x) = H^n(s | x | H(SECRET) | s) where n = HASH_ITERATIONS.

1 0

[obfsproxy/master] Merge remote-tracking branch 'asn/bug4559'
by nickm＠torproject.org 19 Dec '11

19 Dec '11

commit bf9c087ec53e60bc203fa02374a2b7707e61a14f Merge: 1467e33 f439d98 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 19 12:18:40 2011 -0500 Merge remote-tracking branch 'asn/bug4559' doc/protocol-spec.txt | 19 +++++++++---------- 1 files changed, 9 insertions(+), 10 deletions(-)

1 0

[obfsproxy/master] Merge remote-tracking branch 'asn/bug4741'
by nickm＠torproject.org 19 Dec '11

19 Dec '11

commit 1467e33489eca8d12230cdbdf6626ee5037cd86d Merge: da0fb3e eb5e255 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 19 12:15:03 2011 -0500 Merge remote-tracking branch 'asn/bug4741' src/network.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-)

1 0

[obfsproxy/master] Don't log transmission on a closed connection.
by nickm＠torproject.org 19 Dec '11

19 Dec '11

commit eb5e25534667b2b18c5ee8c7c2f0b06bbb0f6c69 Author: George Kadianakis <desnacked(a)gmail.com> Date: Fri Dec 16 16:55:48 2011 +0100 Don't log transmission on a closed connection. --- src/network.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/network.c b/src/network.c index a1fbe41..c36de25 100644 --- a/src/network.c +++ b/src/network.c @@ -614,10 +614,11 @@ upstream_read_cb(struct bufferevent *bev, void *arg) bufferevent_get_output(down->buffer))) { log_debug("%s: error during transmit.", up->peername); conn_free(up); + } else { + log_debug("%s: transmitted %lu bytes", down->peername, + (unsigned long) + evbuffer_get_length(bufferevent_get_output(down->buffer))); } - log_debug("%s: transmitted %lu bytes", down->peername, - (unsigned long) - evbuffer_get_length(bufferevent_get_output(down->buffer))); } /** @@ -663,10 +664,11 @@ downstream_read_cb(struct bufferevent *bev, void *arg) bufferevent_get_output(down->buffer)) < 0) { log_debug("%s: error during reply.", down->peername); conn_free(down); + } else { + log_debug("%s: transmitted %lu bytes", down->peername, + (unsigned long) + evbuffer_get_length(bufferevent_get_output(down->buffer))); } - log_debug("%s: transmitted %lu bytes", down->peername, - (unsigned long) - evbuffer_get_length(bufferevent_get_output(down->buffer))); } } }

1 0

[obfsproxy/master] Merge remote-tracking branch 'asn/bug4742'
by nickm＠torproject.org 19 Dec '11

19 Dec '11

commit da0fb3efd3be668f0b732ecb7b006b9140b012df Merge: d589ba6 710d2c7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 19 11:37:31 2011 -0500 Merge remote-tracking branch 'asn/bug4742' src/main.c | 6 +++--- src/protocols/obfs2.c | 24 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-)

1 0