February 2014 - tor-commits - lists.torproject.org

[torbutton/master] Bug #10419: Don't allow connections to localhost.
by mikeperry＠torproject.org 03 Feb '14

03 Feb '14

commit 3d84b2ada3389899d324223007f7a29ef6b90a17 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Feb 3 10:35:19 2014 -0800 Bug #10419: Don't allow connections to localhost. Also sync up the banned ports list with TBB. These settings shouldn't get applied in TBB normally. This is just defensive, in case someone somehow manages to toggle Tor state still. --- src/defaults/preferences/preferences.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index c5e896f..bc63bb1 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -27,7 +27,7 @@ pref("extensions.torbutton.locked_mode",true); pref("extensions.torbutton.test_url","https://check.torproject.org/?TorButton=true"); pref("extensions.torbutton.test_url_interactive", "https://check.torproject.org/?lang=__LANG__"); pref("extensions.torbutton.test_failed",false); -pref("extensions.torbutton.no_proxies_on","127.0.0.1"); +pref("extensions.torbutton.no_proxies_on",""); pref("extensions.torbutton.versioncheck_url","https://check.torproject.org/RecommendedTBBVersions"); pref("extensions.torbutton.versioncheck_enabled",true); @@ -59,7 +59,7 @@ pref("extensions.torbutton.saved.socks_host",""); pref("extensions.torbutton.saved.socks_version",0); pref("extensions.torbutton.saved.socks_port",0); pref("extensions.torbutton.saved.socks_remote_dns",false); -pref("extensions.torbutton.saved.no_proxies_on","localhost, 127.0.0.1"); +pref("extensions.torbutton.saved.no_proxies_on",""); pref("extensions.torbutton.saved.tor_protocol",false); @@ -150,7 +150,7 @@ pref("extensions.torbutton.close_newnym",true); pref("extensions.torbutton.block_js_history",true); pref("extensions.torbutton.resize_on_toggle",true); pref("extensions.torbutton.resize_new_windows",true); -pref("extensions.torbutton.banned_ports","8118,8123,9050,9051"); +pref("extensions.torbutton.banned_ports","9050,9051,9150,9151"); pref("extensions.torbutton.block_tor_file_net",true); pref("extensions.torbutton.block_nontor_file_net",false); pref("extensions.torbutton.jar_certs",false);

1 0

[tor/master] More fixes to rip out all of the v2 directory code.
by nickm＠torproject.org 03 Feb '14

03 Feb '14

commit 00ec6e6af0775cd693e12e56eb6df3cbefe57daa Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jan 30 12:48:49 2014 +0100 More fixes to rip out all of the v2 directory code. (This was a squash commit, but I forgot to squash it. Sorry! --Nick) --- src/or/config.c | 23 +++++++++++++---------- src/or/dirserv.c | 7 +------ src/or/or.h | 2 -- src/or/routerlist.c | 8 +++----- src/or/routerparse.c | 5 ++--- src/test/test_dir.c | 6 ++++-- 6 files changed, 23 insertions(+), 28 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 8a2c903..b76243b 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -841,30 +841,30 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) { int i; const char *authorities[] = { - "moria1 orport=9101 no-v2 " + "moria1 orport=9101 " "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 " "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31", "tor26 v1 orport=443 v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 " "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D", "dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", - "Tonga orport=443 bridge no-v2 82.94.251.203:80 " + "Tonga orport=443 bridge 82.94.251.203:80 " "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", - "turtles orport=9090 no-v2 " + "turtles orport=9090 " "v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 " "76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B", - "gabelmoo orport=443 no-v2 " + "gabelmoo orport=443 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "212.112.245.170:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", - "dannenberg orport=443 no-v2 " + "dannenberg orport=443 " "v3ident=585769C78764D58426B8B52B6651A5A71137189A " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 no-v2 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " + "urras orport=80 v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417", - "maatuska orport=80 no-v2 " + "maatuska orport=80 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", - "Faravahar orport=443 no-v2 " + "Faravahar orport=443 " "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " "154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", NULL @@ -2345,7 +2345,7 @@ ensure_bandwidth_cap(uint64_t *value, const char *desc, char **msg) /** Parse an authority type from options-\>PublishServerDescriptor * and write it to options-\>PublishServerDescriptor_. Treat "1" - * as "v2,v3" unless BridgeRelay is 1, in which case treat it as "bridge". + * as "v3" unless BridgeRelay is 1, in which case treat it as "bridge". * Treat "0" as "". * Return 0 on success or -1 if not a recognized authority type (in which * case the value of PublishServerDescriptor_ is undefined). */ @@ -2598,7 +2598,7 @@ options_validate(or_options_t *old_options, or_options_t *options, options->V1AuthoritativeDir || options->V3AuthoritativeDir)) REJECT("AuthoritativeDir is set, but none of " - "(Bridge/HS/V1/V2/V3)AuthoritativeDir is set."); + "(Bridge/HS/V1/V3)AuthoritativeDir is set."); /* If we have a v3bandwidthsfile and it's broken, complain on startup */ if (options->V3BandwidthsFile && !old_options) { dirserv_read_measured_bandwidths(options->V3BandwidthsFile, NULL); @@ -5048,6 +5048,9 @@ parse_dir_authority_line(const char *line, dirinfo_type_t required_type, is_not_hidserv_authority = 1; } else if (!strcasecmp(flag, "bridge")) { type |= BRIDGE_DIRINFO; + } else if (!strcasecmp(flag, "no-v2")) { + /* obsolete, but may still be contained in DirAuthority lines generated + by various tools */; } else if (!strcasecmpstart(flag, "orport=")) { int ok; char *portstring = flag + strlen("orport="); diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 80a35c4..c0e000c 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -56,9 +56,6 @@ static time_t the_directory_is_dirty = 1; /** Do we need to regenerate the v1 runningrouters document when somebody * asks for it? */ static time_t runningrouters_is_dirty = 1; -/** Do we need to regenerate our v2 networkstatus document when somebody asks - * for it? */ -static time_t the_v2_networkstatus_is_dirty = 1; /** Most recently generated encoded signed v1 directory. (v1 auth dirservers * only.) */ @@ -929,8 +926,6 @@ directory_set_dirty(void) if (!runningrouters_is_dirty) runningrouters_is_dirty = now; } - if (!the_v2_networkstatus_is_dirty) - the_v2_networkstatus_is_dirty = now; } /** @@ -1477,7 +1472,7 @@ dirserv_clear_old_v1_info(time_t now) } } -/** Helper: If we're an authority for the right directory version (v1 or v2) +/** Helper: If we're an authority for the right directory version (v1) * (based on auth_type), try to regenerate * auth_src as appropriate and return it, falling back to cache_src on * failure. If we're a cache, simply return cache_src. diff --git a/src/or/or.h b/src/or/or.h index 29ec320..40fc567 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4677,8 +4677,6 @@ typedef enum { GEOIP_CLIENT_CONNECT = 0, /** We've served a networkstatus consensus as a directory server. */ GEOIP_CLIENT_NETWORKSTATUS = 1, - /** We've served a v2 networkstatus consensus as a directory server. */ - GEOIP_CLIENT_NETWORKSTATUS_V2 = 2, } geoip_client_action_t; /** Indicates either a positive reply or a reason for rejectng a network * status request that will be included in geoip statistics. */ diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 159f3ff..164b32d 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -3682,11 +3682,9 @@ routerlist_remove_old_routers(void) digestset_add(retain, rs->descriptor_digest)); } - /* If we have a consensus, - * we should consider pruning current routers that are too old and that - * nobody recommends. (If we don't have a consensus or enough v2 - * networkstatuses, then we should get more before we decide to kill - * routers.) */ + /* If we have a consensus, we should consider pruning current routers that + * are too old and that nobody recommends. (If we don't have a consensus, + * then we should get one before we decide to kill routers.) */ if (consensus) { cutoff = now - ROUTER_MAX_AGE; diff --git a/src/or/routerparse.c b/src/or/routerparse.c index ba0bdfb..4ad316c 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -339,7 +339,7 @@ static token_rule_t extrainfo_token_table[] = { END_OF_TABLE }; -/** List of tokens recognized in the body part of v2 and v3 networkstatus +/** List of tokens recognized in the body part of v3 networkstatus * documents. */ static token_rule_t rtrstatus_token_table[] = { T01("p", K_P, CONCAT_ARGS, NO_OBJ ), @@ -461,8 +461,7 @@ static token_rule_t networkstatus_consensus_token_table[] = { END_OF_TABLE }; -/** List of tokens recognized in the footer of v1/v2 directory/networkstatus - * footers. */ +/** List of tokens recognized in the footer of v1 directory footers. */ static token_rule_t networkstatus_vote_footer_token_table[] = { T01("directory-footer", K_DIRECTORY_FOOTER, NO_ARGS, NO_OBJ ), T01("bandwidth-weights", K_BW_WEIGHTS, ARGS, NO_OBJ ), diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 1df597f..7c625ce 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1065,7 +1065,8 @@ test_vrs_for_v3ns(vote_routerstatus_t *vrs, int voter, time_t now) test_eq(rs->addr, 0x99008801); test_eq(rs->or_port, 443); test_eq(rs->dir_port, 8000); - test_eq(vrs->flags, U64_LITERAL(80)); // no flags except "running" + /* no flags except "running" (16) and "v2dir" (64) */ + test_eq(vrs->flags, U64_LITERAL(80)); } else if (tor_memeq(rs->identity_digest, "\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5\x5" "\x5\x5\x5\x5", @@ -1090,7 +1091,8 @@ test_vrs_for_v3ns(vote_routerstatus_t *vrs, int voter, time_t now) test_assert(tor_addr_eq(&rs->ipv6_addr, &addr_ipv6)); test_eq(rs->ipv6_orport, 4711); if (voter == 1) { - test_eq(vrs->flags, U64_LITERAL(190)); // all except "authority","v2dir" + /* all except "authority" (1) and "v2dir" (64) */ + test_eq(vrs->flags, U64_LITERAL(190)); } else { /* 1023 - authority(1) - madeofcheese(16) - madeoftin(32) - v2dir(256) */ test_eq(vrs->flags, U64_LITERAL(718));

1 0

[tor/master] 10365: Close connections if the VERSIONS cell has an odd length.
by nickm＠torproject.org 03 Feb '14

03 Feb '14

commit 881c7c0f7d86af501f7eeb34b021636af85d186f Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Dec 24 21:50:58 2013 +0200 10365: Close connections if the VERSIONS cell has an odd length. Fixes issue 10365. --- changes/bug10365 | 7 +++++++ src/or/channeltls.c | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/changes/bug10365 b/changes/bug10365 new file mode 100644 index 0000000..f7a1515 --- /dev/null +++ b/changes/bug10365 @@ -0,0 +1,7 @@ + o Minor bugfixes: + + - When receving a VERSIONS cell with an odd number of bytes, close + the connection immediately. Fix for bug 10365; bugfix on + 0.2.0.10-alpha. Spotted by "bobnomnom"; fix by "rl1987". + + diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 4943054..9a29077 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1208,6 +1208,14 @@ channel_tls_process_versions_cell(var_cell_t *cell, channel_tls_t *chan) tor_assert(chan); tor_assert(chan->conn); + if ((cell->payload_len % 2) == 1) { + log_fn(LOG_PROTOCOL_WARN, LD_OR, + "Received a VERSION cell with odd payload length %d; " + "closing connection.",cell->payload_len); + connection_or_close_for_error(chan->conn, 0); + return; + } + started_here = connection_or_nonopen_was_started_here(chan->conn); if (chan->conn->link_proto != 0 ||

1 0

[tor/master] check-spaces fixes for test_router.c
by nickm＠torproject.org 03 Feb '14

03 Feb '14

commit 8db8fda43ffdf0a19eb6febfaadb6b1164973807 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 3 13:00:15 2014 -0500 check-spaces fixes for test_router.c --- src/test/test_router.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/test/test_router.c b/src/test/test_router.c index c13ccc6..5e81656 100644 --- a/src/test/test_router.c +++ b/src/test/test_router.c @@ -11,22 +11,21 @@ #include "router.h" #include "test.h" - /** Tese the case when node_get_by_id() returns NULL, node_describe_by_id * should return the base 16 encoding of the id. */ static void test_node_describe_by_id_null_node(void *arg) { + const char ID[] = "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA" + "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA"; (void) arg; - #define ID "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA" - /* make sure node_get_by_id returns NULL */ test_assert(!node_get_by_id(ID)); test_streq(node_describe_by_id(ID), "$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"); -done: + done: return; }

1 0

[torspec/master] add hidden service descriptor asynchronous events
by nickm＠torproject.org 03 Feb '14

03 Feb '14

commit a67ac4db6b7493748cd3b8e913f2597ae057bb0b Author: Qingping Hou <dave2008713(a)gmail.com> Date: Tue Sep 10 14:54:01 2013 -0400 add hidden service descriptor asynchronous events --- control-spec.txt | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/control-spec.txt b/control-spec.txt index 73e2e31..9d1df49 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1235,7 +1235,7 @@ These replies can be sent after a corresponding SETEVENTS command has been received. They will not be interleaved with other Reply elements, but they - can appear between a command and its corresponding reply. For example, + can not appear between a command and its corresponding reply. For example, this sequence is possible: C: SETEVENTS CIRC @@ -2423,6 +2423,28 @@ [First added in 0.2.5.2-alpha] +4.1.25. HiddenService descriptors + + The syntax is: + + "650" SP "HS_DESC" SP Action SP HSAddress SP AuthType SP HsDir [SP DescriptorID] + + Action = "REQUESTED" / "RECEIVED" / "IGNORE" / "FAILED" + HSAddress = 16*Base32Character + AuthType = "NO_AUTH" / "BASIC_AUTH" / "STEALTH_AUTH" / "UNKNOWN" + HsDir = LongName / Fingerprint + DescriptorID = 32*Base32Character + + These events will be triggerred when required HiddenService descriptor is + not found in the cache and a fetch from network is performed. + + If we already had the v0 descriptor, the newly fected v2 descriptor will be + ignored and a "HS_DESC" event with "IGNORE" action will be generated. + + For HsDir, LongName is always prefered. If HsDir cannot be found in node + list at the time event is sent, Fingerprint will be used instead. + + 5. Implementation notes 5.1. Authentication

1 0

[torspec/master] Merge remote-tracking branch 'houqp/hs_spec'
by nickm＠torproject.org 03 Feb '14

03 Feb '14

commit 3d291cfe31763abd0f09acb1d1524b2218fe5304 Merge: 7ab099c a67ac4d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 3 12:39:09 2014 -0500 Merge remote-tracking branch 'houqp/hs_spec' control-spec.txt | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)

1 0

[tor/master] add change log for hs_desc async event
by nickm＠torproject.org 03 Feb '14

03 Feb '14

commit 3b38fd87e812a104f835af59abeda012928e21b7 Author: Qingping Hou <dave2008713(a)gmail.com> Date: Wed Oct 9 11:47:54 2013 -0400 add change log for hs_desc async event --- changes/ticket8510 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/ticket8510 b/changes/ticket8510 new file mode 100644 index 0000000..c79129a --- /dev/null +++ b/changes/ticket8510 @@ -0,0 +1,4 @@ + o Minor features: + - Implement the HS_DESC async control event that notifies controller on + activities related to hidden service descriptors. Partly resolves + ticket 8510.

1 0

[tor/master] add hidden service descriptor async control event
by nickm＠torproject.org 03 Feb '14

03 Feb '14

commit 29c18f5b71d73a03b9895fbbf97a3a5a16099a50 Author: Qingping Hou <dave2008713(a)gmail.com> Date: Wed Oct 9 11:13:06 2013 -0400 add hidden service descriptor async control event --- src/or/control.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++- src/or/control.h | 14 +++++++- src/or/directory.c | 19 ++++++++--- src/or/rendclient.c | 4 +++ src/or/router.c | 23 +++++++++++++ src/or/router.h | 1 + 6 files changed, 147 insertions(+), 6 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 49212de..42fbf2f 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -940,6 +940,7 @@ static const struct control_event_t control_event_table[] = { { EVENT_TB_EMPTY, "TB_EMPTY" }, { EVENT_CIRC_BANDWIDTH_USED, "CIRC_BW" }, { EVENT_TRANSPORT_LAUNCHED, "TRANSPORT_LAUNCHED" }, + { EVENT_HS_DESC, "HS_DESC" }, { 0, NULL }, }; @@ -1549,7 +1550,7 @@ munge_extrainfo_into_routerinfo(const char *ri_body, outp += router_sig-ri_body; for (i=0; i < 2; ++i) { - const char *kwd = i?"\nwrite-history ":"\nread-history "; + const char *kwd = i ? "\nwrite-history " : "\nread-history "; const char *cp, *eol; if (!(cp = tor_memstr(ei_body, ei_len, kwd))) continue; @@ -4998,6 +4999,95 @@ control_event_transport_launched(const char *mode, const char *transport_name, mode, transport_name, fmt_addr(addr), port); } +/** Convert rendezvous auth type to string for HS_DESC control events + */ +const char * +rend_auth_type_to_string(rend_auth_type_t auth_type) +{ + const char *str; + + switch (auth_type) { + case REND_NO_AUTH: + str = "NO_AUTH"; + break; + case REND_BASIC_AUTH: + str = "BASIC_AUTH"; + break; + case REND_STEALTH_AUTH: + str = "STEALTH_AUTH"; + break; + default: + str = "UNKNOWN"; + } + + return str; +} + +/** send HS_DESC requested event. + * + * rend_query is used to fetch requested onion address and auth type. + * hs_dir is the description of contacting hs directory. + * desc_id_base32 is the ID of requested hs descriptor. + */ +void +control_event_hs_descriptor_requested(const rend_data_t *rend_query, + const char *hs_dir, + const char *desc_id_base32) +{ + tor_assert(hs_dir); + send_control_event(EVENT_HS_DESC, ALL_FORMATS, + "650 HS_DESC REQUESTED %s %s %s %s\r\n", + rend_query->onion_address, + rend_auth_type_to_string(rend_query->auth_type), + hs_dir, + desc_id_base32); +} + +/** send HS_DESC event after got response from hs directory. + * + * NOTE: this is an internal function used by following functions: + * control_event_hs_descriptor_received + * control_event_hs_descriptor_failed + * + * So do not call this function directly. + */ +void +control_event_hs_descriptor_receive_end(const char *action, + const rend_data_t *rend_query, + const char *hs_dir) +{ + send_control_event(EVENT_HS_DESC, ALL_FORMATS, + "650 HS_DESC %s %s %s %s\r\n", + action, + rend_query->onion_address, + rend_auth_type_to_string(rend_query->auth_type), + hs_dir); +} + +/** send HS_DESC RECEIVED event + * + * called when a we successfully received a hidden service descriptor. + */ +void +control_event_hs_descriptor_received(const rend_data_t *rend_query, + const char *hs_dir) +{ + tor_assert(hs_dir); + control_event_hs_descriptor_receive_end("RECEIVED", rend_query, hs_dir); +} + +/** send HS_DESC FAILED event + * + * called when request for hidden service descriptor returned failure. + */ +void +control_event_hs_descriptor_failed(const rend_data_t *rend_query, + const char *hs_dir) +{ + tor_assert(hs_dir); + control_event_hs_descriptor_receive_end("FAILED", rend_query, hs_dir); +} + /** Free any leftover allocated memory of the control.c subsystem. */ void control_free_all(void) diff --git a/src/or/control.h b/src/or/control.h index c8db643..be3cc24 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -99,6 +99,17 @@ void control_event_clients_seen(const char *controller_str); void control_event_transport_launched(const char *mode, const char *transport_name, tor_addr_t *addr, uint16_t port); +const char *rend_auth_type_to_string(rend_auth_type_t auth_type); +void control_event_hs_descriptor_requested(const rend_data_t *rend_query, + const char *desc_id_base32, + const char *hs_dir); +void control_event_hs_descriptor_receive_end(const char *action, + const rend_data_t *rend_query, + const char *hs_dir); +void control_event_hs_descriptor_received(const rend_data_t *rend_query, + const char *hs_dir); +void control_event_hs_descriptor_failed(const rend_data_t *rend_query, + const char *hs_dir); void control_free_all(void); @@ -140,7 +151,8 @@ void control_free_all(void); #define EVENT_TB_EMPTY 0x001C #define EVENT_CIRC_BANDWIDTH_USED 0x001D #define EVENT_TRANSPORT_LAUNCHED 0x0020 -#define EVENT_MAX_ 0x0020 +#define EVENT_HS_DESC 0x0021 +#define EVENT_MAX_ 0x0021 /* If EVENT_MAX_ ever hits 0x0040, we need to make the mask into a * different structure. */ diff --git a/src/or/directory.c b/src/or/directory.c index 12c5b18..2b93625 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1660,17 +1660,17 @@ connection_dir_client_reached_eof(dir_connection_t *conn) char *body; char *headers; char *reason = NULL; - size_t body_len=0, orig_len=0; + size_t body_len = 0, orig_len = 0; int status_code; - time_t date_header=0; + time_t date_header = 0; long delta; compress_method_t compression; int plausible; - int skewed=0; + int skewed = 0; int allow_partial = (conn->base_.purpose == DIR_PURPOSE_FETCH_SERVERDESC || conn->base_.purpose == DIR_PURPOSE_FETCH_EXTRAINFO || conn->base_.purpose == DIR_PURPOSE_FETCH_MICRODESC); - int was_compressed=0; + int was_compressed = 0; time_t now = time(NULL); int src_code; @@ -2275,6 +2275,10 @@ connection_dir_client_reached_eof(dir_connection_t *conn) } if (conn->base_.purpose == DIR_PURPOSE_FETCH_RENDDESC_V2) { + #define SEND_HS_DESC_FAILED_EVENT() ( \ + control_event_hs_descriptor_failed(conn->rend_data, \ + node_describe_by_id( \ + conn->identity_digest)) ) tor_assert(conn->rend_data); log_info(LD_REND,"Received rendezvous descriptor (size %d, status %d " "(%s))", @@ -2287,6 +2291,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn) "Retrying at another directory."); /* We'll retry when connection_about_to_close_connection() * cleans this dir conn up. */ + SEND_HS_DESC_FAILED_EVENT(); break; case -1: /* We already have a v0 descriptor here. Ignoring this one @@ -2299,6 +2304,9 @@ connection_dir_client_reached_eof(dir_connection_t *conn) /* success. notify pending connections about this. */ log_info(LD_REND, "Successfully fetched v2 rendezvous " "descriptor."); + control_event_hs_descriptor_received(conn->rend_data, + node_describe_by_id( + conn->identity_digest)); conn->base_.purpose = DIR_PURPOSE_HAS_FETCHED_RENDDESC; rend_client_desc_trynow(conn->rend_data->onion_address); break; @@ -2309,12 +2317,14 @@ connection_dir_client_reached_eof(dir_connection_t *conn) * connection_about_to_close_connection() cleans this conn up. */ log_info(LD_REND,"Fetching v2 rendezvous descriptor failed: " "Retrying at another directory."); + SEND_HS_DESC_FAILED_EVENT(); break; case 400: log_warn(LD_REND, "Fetching v2 rendezvous descriptor failed: " "http status 400 (%s). Dirserver didn't like our " "v2 rendezvous query? Retrying at another directory.", escaped(reason)); + SEND_HS_DESC_FAILED_EVENT(); break; default: log_warn(LD_REND, "Fetching v2 rendezvous descriptor failed: " @@ -2323,6 +2333,7 @@ connection_dir_client_reached_eof(dir_connection_t *conn) "Retrying at another directory.", status_code, escaped(reason), conn->base_.address, conn->base_.port); + SEND_HS_DESC_FAILED_EVENT(); break; } } diff --git a/src/or/rendclient.c b/src/or/rendclient.c index f00303f..de28bd1 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -26,6 +26,7 @@ #include "router.h" #include "routerlist.h" #include "routerset.h" +#include "control.h" static extend_info_t *rend_client_get_random_intro_impl( const rend_cache_entry_t *rend_query, @@ -694,6 +695,9 @@ directory_get_from_hs_dir(const char *desc_id, const rend_data_t *rend_query) (rend_query->auth_type == REND_NO_AUTH ? "[none]" : escaped_safe_str_client(descriptor_cookie_base64)), routerstatus_describe(hs_dir)); + control_event_hs_descriptor_requested(rend_query, + routerstatus_describe(hs_dir), + desc_id_base32); return 1; } diff --git a/src/or/router.c b/src/or/router.c index 959e5e3..de78895 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2926,6 +2926,29 @@ node_describe(const node_t *node) return node_get_description(buf, node); } +/** Return a human-readable description of the node whose identity is + * identity_digest. If node_get_by_id() returns NULL, base 16 encoding + * of identity_digest is returned instead. + * + * This function is not thread-safe. Each call to this function invalidates + * previous values returned by this function. + */ +const char * +node_describe_by_id(const char *identity_digest) +{ + static char buf[NODE_DESC_BUF_LEN]; + const node_t *node = NULL; + + node = node_get_by_id(identity_digest); + if (!node) { + buf[0] = '$'; + base16_encode(buf+1, HEX_DIGEST_LEN+1, identity_digest, DIGEST_LEN); + return buf; + } else { + return node_get_description(buf, node); + } +} + /** Return a human-readable description of the routerstatus_t rs. * * This function is not thread-safe. Each call to this function invalidates diff --git a/src/or/router.h b/src/or/router.h index 1079ec7..08cda73 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -133,6 +133,7 @@ const char *routerstatus_get_description(char *buf, const routerstatus_t *rs); const char *extend_info_get_description(char *buf, const extend_info_t *ei); const char *router_describe(const routerinfo_t *ri); const char *node_describe(const node_t *node); +const char *node_describe_by_id(const char *id_digest); const char *routerstatus_describe(const routerstatus_t *ri); const char *extend_info_describe(const extend_info_t *ei);

1 0

[tor/master] add test case for hidden service async events
by nickm＠torproject.org 03 Feb '14

03 Feb '14

commit 0b0d4b4ebcfe3711a8bcd27cbbdc05cd02530f38 Author: Qingping Hou <dave2008713(a)gmail.com> Date: Wed Dec 18 01:40:05 2013 -0500 add test case for hidden service async events --- src/test/Makefile.nmake | 3 +- src/test/include.am | 1 + src/test/test.c | 2 + src/test/test_hs.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 120 insertions(+), 1 deletion(-) diff --git a/src/test/Makefile.nmake b/src/test/Makefile.nmake index 6479f9d..822431f 100644 --- a/src/test/Makefile.nmake +++ b/src/test/Makefile.nmake @@ -14,7 +14,8 @@ LIBS = ..\..\..\build-alpha\lib\libevent.lib \ TEST_OBJECTS = test.obj test_addr.obj test_containers.obj \ test_controller_events.ogj test_crypto.obj test_data.obj test_dir.obj \ test_microdesc.obj test_pt.obj test_util.obj test_config.obj \ - test_cell_formats.obj test_replay.obj test_introduce.obj tinytest.obj + test_cell_formats.obj test_replay.obj test_introduce.obj tinytest.obj \ + test_hs.obj tinytest.obj: ..\ext\tinytest.c $(CC) $(CFLAGS) /D snprintf=_snprintf /c ..\ext\tinytest.c diff --git a/src/test/include.am b/src/test/include.am index c16dd14..fe30fa4 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -38,6 +38,7 @@ src_test_test_SOURCES = \ src/test/test_socks.c \ src/test/test_util.c \ src/test/test_config.c \ + src/test/test_hs.c \ src/ext/tinytest.c src_test_test_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) diff --git a/src/test/test.c b/src/test/test.c index 9b474e9..3f8e9c6 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1625,6 +1625,7 @@ extern struct testcase_t extorport_tests[]; extern struct testcase_t controller_event_tests[]; extern struct testcase_t logging_tests[]; extern struct testcase_t backtrace_tests[]; +extern struct testcase_t hs_tests[]; static struct testgroup_t testgroups[] = { { "", test_array }, @@ -1648,6 +1649,7 @@ static struct testgroup_t testgroups[] = { { "options/", options_tests }, { "extorport/", extorport_tests }, { "control/", controller_event_tests }, + { "hs/", hs_tests }, END_OF_GROUPS }; diff --git a/src/test/test_hs.c b/src/test/test_hs.c new file mode 100644 index 0000000..a9e6644 --- /dev/null +++ b/src/test/test_hs.c @@ -0,0 +1,115 @@ +/* Copyright (c) 2007-2013, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file test_hs.c + * \brief Unit tests for hidden service. + **/ + +#define CONTROL_PRIVATE +#include "or.h" +#include "test.h" +#include "control.h" + +/* Helper global variable for hidden service descriptor event test. + * It's used as a pointer to dynamically created message buffer in + * send_control_event_string_replacement function, which mocks + * send_control_event_string function. + * + * Always free it after use! */ +static char *received_msg = NULL; + +/** Mock function for send_control_event_string + */ +static void +send_control_event_string_replacement(uint16_t event, event_format_t which, + const char *msg) +{ + int msg_len; + + (void) event; + (void) which; + msg_len = strlen(msg); + received_msg = tor_malloc_zero(msg_len+1); + strncpy(received_msg, msg, msg_len); +} + +/** Make sure each hidden service descriptor async event generation + * + * function generates the message in expected format. + */ +static void +test_hs_desc_event(void *arg) +{ + #define STR_HS_ADDR "ajhb7kljbiru65qo" + #define STR_HS_DIR_LONGNAME \ + "$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=TestDir at 1.2.3.4" + #define STR_HS_ID "b3oeducbhjmbqmgw2i3jtz4fekkrinwj" + + rend_data_t rend_query; + const char *expected_msg; + + (void) arg; + MOCK(send_control_event_string, + send_control_event_string_replacement); + + /* setup rend_query struct */ + strncpy(rend_query.onion_address, STR_HS_ADDR, + REND_SERVICE_ID_LEN_BASE32+1); + rend_query.auth_type = 0; + + /* test request event */ + control_event_hs_descriptor_requested(&rend_query, STR_HS_DIR_LONGNAME, + STR_HS_ID); + expected_msg = + "650 HS_DESC REQUESTED "STR_HS_ADDR" NO_AUTH "STR_HS_DIR_LONGNAME\ + " "STR_HS_ID"\r\n"; + test_assert(received_msg); + test_streq(received_msg, expected_msg); + tor_free(received_msg); + received_msg = NULL; + + /* test received event */ + rend_query.auth_type = 1; + control_event_hs_descriptor_received(&rend_query, STR_HS_DIR_LONGNAME); + expected_msg = + "650 HS_DESC RECEIVED "STR_HS_ADDR" BASIC_AUTH "STR_HS_DIR_LONGNAME"\r\n"; + test_assert(received_msg); + test_streq(received_msg, expected_msg); + tor_free(received_msg); + received_msg = NULL; + + /* test failed event */ + rend_query.auth_type = 2; + control_event_hs_descriptor_failed(&rend_query, STR_HS_DIR_LONGNAME); + expected_msg = + "650 HS_DESC FAILED "STR_HS_ADDR" STEALTH_AUTH "STR_HS_DIR_LONGNAME"\r\n"; + test_assert(received_msg); + test_streq(received_msg, expected_msg); + tor_free(received_msg); + received_msg = NULL; + + /* test invalid auth type */ + rend_query.auth_type = 999; + control_event_hs_descriptor_failed(&rend_query, STR_HS_DIR_LONGNAME); + expected_msg = + "650 HS_DESC FAILED "STR_HS_ADDR" UNKNOWN "STR_HS_DIR_LONGNAME"\r\n"; + test_assert(received_msg); + test_streq(received_msg, expected_msg); + tor_free(received_msg); + received_msg = NULL; + + done: + UNMOCK(send_control_event_string); + if (received_msg) { + tor_free(received_msg); + received_msg = NULL; + } +} + +struct testcase_t hs_tests[] = { + { "hs_desc_event", test_hs_desc_event, TT_FORK, + NULL, NULL }, + END_OF_TESTCASES +}; +

1 0

[tor/master] add test case for node_describe_by_id
by nickm＠torproject.org 03 Feb '14

03 Feb '14

commit ebd99314cff907433eca835926a325c019f4b6c0 Author: Qingping Hou <dave2008713(a)gmail.com> Date: Sun Jan 26 00:18:55 2014 -0500 add test case for node_describe_by_id --- src/test/include.am | 1 + src/test/test.c | 2 ++ src/test/test_router.c | 38 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/src/test/include.am b/src/test/include.am index fe30fa4..b338cbe 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -39,6 +39,7 @@ src_test_test_SOURCES = \ src/test/test_util.c \ src/test/test_config.c \ src/test/test_hs.c \ + src/test/test_router.c \ src/ext/tinytest.c src_test_test_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) diff --git a/src/test/test.c b/src/test/test.c index 3f8e9c6..8b2a5ad 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1626,6 +1626,7 @@ extern struct testcase_t controller_event_tests[]; extern struct testcase_t logging_tests[]; extern struct testcase_t backtrace_tests[]; extern struct testcase_t hs_tests[]; +extern struct testcase_t router_tests[]; static struct testgroup_t testgroups[] = { { "", test_array }, @@ -1650,6 +1651,7 @@ static struct testgroup_t testgroups[] = { { "extorport/", extorport_tests }, { "control/", controller_event_tests }, { "hs/", hs_tests }, + { "router/", router_tests }, END_OF_GROUPS }; diff --git a/src/test/test_router.c b/src/test/test_router.c new file mode 100644 index 0000000..c13ccc6 --- /dev/null +++ b/src/test/test_router.c @@ -0,0 +1,38 @@ +/* Copyright (c) 2007-2013, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file test_router.c + * \brief Unit tests for router related functions. + **/ + +#include "or.h" +#include "nodelist.h" +#include "router.h" +#include "test.h" + + +/** Tese the case when node_get_by_id() returns NULL, node_describe_by_id + * should return the base 16 encoding of the id. + */ +static void +test_node_describe_by_id_null_node(void *arg) +{ + (void) arg; + + #define ID "\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA" + + /* make sure node_get_by_id returns NULL */ + test_assert(!node_get_by_id(ID)); + test_streq(node_describe_by_id(ID), + "$AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"); +done: + return; +} + +struct testcase_t router_tests[] = { + { "node_get_by_id_null_node", test_node_describe_by_id_null_node, TT_FORK, + NULL, NULL }, + END_OF_TESTCASES +}; +

1 0