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

[torspec/master] Merge remote-tracking branch 'rransom/bug2411a-v2'
by nickm＠torproject.org 22 Dec '11

22 Dec '11

commit 50c33cb3591eaa15afa1948e1c926381d9963ff4 Merge: 06a4623 2f040bc Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 22 10:59:26 2011 -0500 Merge remote-tracking branch 'rransom/bug2411a-v2' control-spec.txt | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 74 insertions(+), 4 deletions(-)

1 0

[torspec/master] Document (previously implemented) PURPOSE field of CIRC events
by nickm＠torproject.org 22 Dec '11

22 Dec '11

commit fb26214fbe8f471cdf9e2d99cb231962a573d7f5 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Jun 16 00:29:31 2011 -0700 Document (previously implemented) PURPOSE field of CIRC events --- control-spec.txt | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 79c3aeb..c7086ed 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1081,6 +1081,7 @@ The syntax is: "650" SP "CIRC" SP CircuitID SP CircStatus [SP Path] + [SP "PURPOSE=" Purpose] [SP "REASON=" Reason [SP "REMOTE_REASON=" Reason]] CRLF CircStatus = @@ -1094,7 +1095,11 @@ ; In Tor versions 0.1.2.2-alpha through 0.2.2.1-alpha with feature ; VERBOSE_NAMES turned off and before version 0.1.2.2-alpha, Path ; is as follows: - Path = ServerID *("," ServerID) + ; Path = ServerID *("," ServerID) + + Purpose = "GENERAL" / "HS_CLIENT_INTRO" / "HS_CLIENT_REND" / + "HS_SERVICE_INTRO" / "HS_SERVICE_REND" / "TESTING" / + "CONTROLLER" Reason = "NONE" / "TORPROTOCOL" / "INTERNAL" / "REQUESTED" / "HIBERNATING" / "RESOURCELIMIT" / "CONNECTFAILED" / @@ -1105,6 +1110,19 @@ The path is provided only when the circuit has been extended at least one hop. + The "PURPOSE" field is provided only in versions 0.2.1.6-alpha and + later, and only if extended events are enabled (see 3.19). Clients + MUST accept purposes not listed above. Purposes are defined as + follows: + + GENERAL (circuit for AP and/or directory request streams) + HS_CLIENT_INTRO (HS client-side introduction-point circuit) + HS_CLIENT_REND (HS client-side rendezvous circuit; carries AP streams) + HS_SERVICE_INTRO (HS service-side introduction-point circuit) + HS_SERVICE_REND (HS service-side rendezvous circuit) + TESTING (reachability-testing circuit; carries no traffic) + CONTROLLER (circuit built by a controller) + The "REASON" field is provided only for FAILED and CLOSED events, and only if extended events are enabled (see 3.19). Clients MUST accept reasons not listed above. Reasons are as given in tor-spec.txt, except for:

1 0

[torspec/master] Fix spec typos
by nickm＠torproject.org 22 Dec '11

22 Dec '11

commit 4651a4cf7fbfad807c2dd55048146fc87ecb0ac6 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Jun 23 16:50:08 2011 -0700 Fix spec typos --- control-spec.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 5643ad8..e770415 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -653,8 +653,8 @@ Sent from the client to the server. The format is: "EXTENDCIRCUIT" SP CircuitID - [SP ServerSpec *("," ServerSpec) - SP "purpose=" Purpose] CRLF + [SP ServerSpec *("," ServerSpec)] + [SP "purpose=" Purpose] CRLF This request takes one of two forms: either the CircuitID is zero, in which case it is a request for the server to build a new circuit,

1 0

[torspec/master] Fix trivial formatting issue
by nickm＠torproject.org 22 Dec '11

22 Dec '11

commit 08ee50971ebdb3affbf5aeabbb38af966a1ced80 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Jun 16 00:30:18 2011 -0700 Fix trivial formatting issue --- control-spec.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index c7086ed..5643ad8 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1196,7 +1196,7 @@ requesting program. Purpose = "DIR_FETCH" / "UPLOAD_DESC" / "DNS_REQUEST" / - "USER" / "DIRPORT_TEST" + "USER" / "DIRPORT_TEST" The "PURPOSE" field is provided only for NEW and NEWRESOLVE events, and only if extended events are enabled (see 3.19). Clients MUST accept

1 0

[torspec/master] Document new fields added for #2411
by nickm＠torproject.org 22 Dec '11

22 Dec '11

commit 2f040bc03e61d1eef482e6e170ba9de1a3fd434a Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Jun 24 13:58:02 2011 -0700 Document new fields added for #2411 --- control-spec.txt | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 53 insertions(+), 1 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index e770415..aa04120 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1081,7 +1081,8 @@ The syntax is: "650" SP "CIRC" SP CircuitID SP CircStatus [SP Path] - [SP "PURPOSE=" Purpose] + [SP "BUILD_FLAGS=" BuildFlags] [SP "PURPOSE=" Purpose] + [SP "HS_STATE=" HSState] [SP "REND_QUERY=" HSAddress] [SP "REASON=" Reason [SP "REMOTE_REASON=" Reason]] CRLF CircStatus = @@ -1097,10 +1098,23 @@ ; is as follows: ; Path = ServerID *("," ServerID) + BuildFlags = BuildFlag *("," BuildFlag) + BuildFlag = "ONEHOP_TUNNEL" / "IS_INTERNAL" / + "NEED_CAPACITY" / "NEED_UPTIME" + Purpose = "GENERAL" / "HS_CLIENT_INTRO" / "HS_CLIENT_REND" / "HS_SERVICE_INTRO" / "HS_SERVICE_REND" / "TESTING" / "CONTROLLER" + HSState = "HSCI_CONNECTING" / "HSCI_INTRO_SENT" / "HSCI_DONE" / + "HSCR_CONNECTING" / "HSCR_ESTABLISHED_IDLE" / + "HSCR_ESTABLISHED_WAITING" / "HSCR_JOINED" / + "HSSI_CONNECTING" / "HSSI_ESTABLISHED" / + "HSSR_CONNECTING" / "HSSR_JOINED" + + HSAddress = 16*Base32Character + Base32Character = ALPHA / "2" / "3" / "4" / "5" / "6" / "7" + Reason = "NONE" / "TORPROTOCOL" / "INTERNAL" / "REQUESTED" / "HIBERNATING" / "RESOURCELIMIT" / "CONNECTFAILED" / "OR_IDENTITY" / "OR_CONN_CLOSED" / "TIMEOUT" / @@ -1110,6 +1124,15 @@ The path is provided only when the circuit has been extended at least one hop. + The "BUILD_FLAGS" field is provided only in versions 0.2.3.2-alpha + and later. Clients MUST accept build flags not listed above. + Build flags are defined as follows: + + ONEHOP_TUNNEL (one-hop circuit, used for tunneled directory conns) + IS_INTERNAL (internal circuit, not to be used for exiting streams) + NEED_CAPACITY (this circuit must use only high-capacity nodes) + NEED_UPTIME (this circuit must use only high-uptime nodes) + The "PURPOSE" field is provided only in versions 0.2.1.6-alpha and later, and only if extended events are enabled (see 3.19). Clients MUST accept purposes not listed above. Purposes are defined as @@ -1123,6 +1146,35 @@ TESTING (reachability-testing circuit; carries no traffic) CONTROLLER (circuit built by a controller) + The "HS_STATE" field is provided only for hidden-service circuits, + and only in versions 0.2.3.2-alpha and later. Clients MUST accept + hidden-service circuit states not listed above. Hidden-service + circuit states are defined as follows: + + HSCI_* (client-side introduction-point circuit states) + HSCI_CONNECTING (connecting to intro point) + HSCI_INTRO_SENT (sent INTRODUCE1; waiting for reply from IP) + HSCI_DONE (received reply from IP relay; closing) + + HSCR_* (client-side rendezvous-point circuit states) + HSCR_CONNECTING (connecting to or waiting for reply from RP) + HSCR_ESTABLISHED_IDLE (established RP; waiting for introduction) + HSCR_ESTABLISHED_WAITING (introduction sent to HS; waiting for rend) + HSCR_JOINED (connected to HS) + + HSSI_* (service-side introduction-point circuit states) + HSSI_CONNECTING (connecting to intro point) + HSSI_ESTABLISHED (established intro point) + + HSSR_* (service-side rendezvous-point circuit states) + HSSR_CONNECTING (connecting to client's rend point) + HSSR_JOINED (connected to client's RP circuit) + + The "REND_QUERY" field is provided only for hidden-service-related + circuits, and only in versions 0.2.3.2-alpha and later. Clients + MUST accept hidden service addresses in formats other than that + specified above. + The "REASON" field is provided only for FAILED and CLOSED events, and only if extended events are enabled (see 3.19). Clients MUST accept reasons not listed above. Reasons are as given in tor-spec.txt, except for:

1 0

[tor/master] Use fewer TO_ORIGIN_CIRCUIT casts in getinfo_helper_events
by nickm＠torproject.org 22 Dec '11

22 Dec '11

commit 8d5200c6b527443040520786397d1ffd81b42e23 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Jun 23 15:02:16 2011 -0700 Use fewer TO_ORIGIN_CIRCUIT casts in getinfo_helper_events --- src/or/control.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 620b2f5..2957309 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1846,29 +1846,30 @@ getinfo_helper_events(control_connection_t *control_conn, { (void) control_conn; if (!strcmp(question, "circuit-status")) { - circuit_t *circ; + circuit_t *circ_; smartlist_t *status = smartlist_create(); - for (circ = _circuit_get_global_list(); circ; circ = circ->next) { + for (circ_ = _circuit_get_global_list(); circ_; circ_ = circ_->next) { + origin_circuit_t *circ; char *s, *circdesc; size_t slen; const char *state; - if (! CIRCUIT_IS_ORIGIN(circ) || circ->marked_for_close) + if (! CIRCUIT_IS_ORIGIN(circ_) || circ_->marked_for_close) continue; + circ = TO_ORIGIN_CIRCUIT(circ_); - if (circ->state == CIRCUIT_STATE_OPEN) + if (circ->_base.state == CIRCUIT_STATE_OPEN) state = "BUILT"; - else if (TO_ORIGIN_CIRCUIT(circ)->cpath) + else if (circ->cpath) state = "EXTENDED"; else state = "LAUNCHED"; - circdesc = circuit_describe_status_for_controller( - TO_ORIGIN_CIRCUIT(circ)); + circdesc = circuit_describe_status_for_controller(circ); slen = strlen(circdesc)+strlen(state)+30; s = tor_malloc(slen+1); tor_snprintf(s, slen, "%lu %s%s%s", - (unsigned long)TO_ORIGIN_CIRCUIT(circ)->global_identifier, + (unsigned long)circ->global_identifier, state, *circdesc ? " " : "", circdesc); smartlist_add(status, s); tor_free(circdesc);

1 0

[tor/master] List service address in CIRC events for HS-related circs
by nickm＠torproject.org 22 Dec '11

22 Dec '11

commit d0ed7cbf8b83f675dcd858abbdfda98eb3bafc88 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Jun 24 05:18:21 2011 -0700 List service address in CIRC events for HS-related circs --- changes/feature2411 | 7 ++++--- src/or/control.c | 9 +++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/changes/feature2411 b/changes/feature2411 index e029162..633a5ce 100644 --- a/changes/feature2411 +++ b/changes/feature2411 @@ -4,8 +4,9 @@ controllers in CIRC events and in replies to 'GETINFO circuit-status'. Implements part of ticket 2411. - - Report the current state of a hidden-service-related circuit to - controllers in CIRC events and in replies to 'GETINFO - circuit-status'. Implements part of ticket 2411. + - Report the hidden service address and current state of a + hidden-service-related circuit to controllers in CIRC events and + in replies to 'GETINFO circuit-status'. Implements part of + ticket 2411. diff --git a/src/or/control.c b/src/or/control.c index 6b7f9dc..42eaed2 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1842,6 +1842,15 @@ circuit_describe_status_for_controller(origin_circuit_t *circ) } } + if (circ->rend_data != NULL) { + char *rend_query_arg = NULL; + + tor_asprintf(&rend_query_arg, "REND_QUERY=%s", + circ->rend_data->onion_address); + + smartlist_add(descparts, rend_query_arg); + } + rv = smartlist_join_strings(descparts, " ", 0, NULL); SMARTLIST_FOREACH(descparts, char *, cp, tor_free(cp));

1 0

[tor/master] Merge remote-tracking branch 'rransom/feature2411-v4'
by nickm＠torproject.org 22 Dec '11

22 Dec '11

commit 7cb804343b827ce048c2468d16f6887238790241 Merge: 782b7f4 d0ed7cb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 22 10:51:39 2011 -0500 Merge remote-tracking branch 'rransom/feature2411-v4' changes/feature2411 | 12 ++++ src/or/circuitlist.c | 57 ++++++++++++++++++++ src/or/circuitlist.h | 1 + src/or/control.c | 142 ++++++++++++++++++++++++++++++++++++++----------- 4 files changed, 180 insertions(+), 32 deletions(-)

1 0

[tor/master] Report HS circ states stored in circ purpose field in CIRC events
by nickm＠torproject.org 22 Dec '11

22 Dec '11

commit c7d01b0541a10a51b5e41f3e68eabb90fca3067a Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Jun 23 17:28:59 2011 -0700 Report HS circ states stored in circ purpose field in CIRC events --- changes/feature2411 | 4 +++ src/or/circuitlist.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/or/circuitlist.h | 1 + src/or/control.c | 13 +++++++++++ 4 files changed, 75 insertions(+), 0 deletions(-) diff --git a/changes/feature2411 b/changes/feature2411 index b60fbfd..e029162 100644 --- a/changes/feature2411 +++ b/changes/feature2411 @@ -4,4 +4,8 @@ controllers in CIRC events and in replies to 'GETINFO circuit-status'. Implements part of ticket 2411. + - Report the current state of a hidden-service-related circuit to + controllers in CIRC events and in replies to 'GETINFO + circuit-status'. Implements part of ticket 2411. + diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 25b80f1..daf2eef 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -378,6 +378,63 @@ circuit_purpose_to_controller_string(uint8_t purpose) } } +/** Return a string specifying the state of the hidden-service circuit + * purpose purpose, or NULL if purpose is not a + * hidden-service-related circuit purpose. */ +const char * +circuit_purpose_to_controller_hs_state_string(uint8_t purpose) +{ + switch (purpose) + { + default: + log_fn(LOG_WARN, LD_BUG, + "Unrecognized circuit purpose: %d", + (int)purpose); + tor_fragile_assert(); + /* fall through */ + + case CIRCUIT_PURPOSE_OR: + case CIRCUIT_PURPOSE_C_GENERAL: + case CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT: + case CIRCUIT_PURPOSE_TESTING: + case CIRCUIT_PURPOSE_CONTROLLER: + return NULL; + + case CIRCUIT_PURPOSE_INTRO_POINT: + return "OR_HSSI_ESTABLISHED"; + case CIRCUIT_PURPOSE_REND_POINT_WAITING: + return "OR_HSCR_ESTABLISHED"; + case CIRCUIT_PURPOSE_REND_ESTABLISHED: + return "OR_HS_R_JOINED"; + + case CIRCUIT_PURPOSE_C_INTRODUCING: + return "HSCI_CONNECTING"; + case CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT: + return "HSCI_INTRO_SENT"; + case CIRCUIT_PURPOSE_C_INTRODUCE_ACKED: + return "HSCI_DONE"; + + case CIRCUIT_PURPOSE_C_ESTABLISH_REND: + return "HSCR_CONNECTING"; + case CIRCUIT_PURPOSE_C_REND_READY: + return "HSCR_ESTABLISHED_IDLE"; + case CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED: + return "HSCR_ESTABLISHED_WAITING"; + case CIRCUIT_PURPOSE_C_REND_JOINED: + return "HSCR_JOINED"; + + case CIRCUIT_PURPOSE_S_ESTABLISH_INTRO: + return "HSSI_CONNECTING"; + case CIRCUIT_PURPOSE_S_INTRO: + return "HSSI_ESTABLISHED"; + + case CIRCUIT_PURPOSE_S_CONNECT_REND: + return "HSSR_CONNECTING"; + case CIRCUIT_PURPOSE_S_REND_JOINED: + return "HSSR_JOINED"; + } +} + /** Return a human-readable string for the circuit purpose purpose. */ const char * circuit_purpose_to_string(uint8_t purpose) diff --git a/src/or/circuitlist.h b/src/or/circuitlist.h index 7b01ca3..8ed089c 100644 --- a/src/or/circuitlist.h +++ b/src/or/circuitlist.h @@ -15,6 +15,7 @@ circuit_t * _circuit_get_global_list(void); const char *circuit_state_to_string(int state); const char *circuit_purpose_to_controller_string(uint8_t purpose); +const char *circuit_purpose_to_controller_hs_state_string(uint8_t purpose); const char *circuit_purpose_to_string(uint8_t purpose); void circuit_dump_by_conn(connection_t *conn, int severity); void circuit_set_p_circid_orconn(or_circuit_t *circ, circid_t id, diff --git a/src/or/control.c b/src/or/control.c index 2957309..6b7f9dc 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1829,6 +1829,19 @@ circuit_describe_status_for_controller(origin_circuit_t *circ) smartlist_add(descparts, purpose); } + { + char *hs_state_arg = NULL; + const char *hs_state = + circuit_purpose_to_controller_hs_state_string(circ->_base.purpose); + + if (hs_state != NULL) { + tor_asprintf(&hs_state_arg, "HS_STATE=%s", + hs_state); + + smartlist_add(descparts, hs_state_arg); + } + } + rv = smartlist_join_strings(descparts, " ", 0, NULL); SMARTLIST_FOREACH(descparts, char *, cp, tor_free(cp));

1 0

[tor/master] Separate circuit-close reasons from circ description
by nickm＠torproject.org 22 Dec '11

22 Dec '11

commit b149ab00d788f559b576b60b813cbe0d3b260dbb Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Jun 23 12:02:03 2011 -0700 Separate circuit-close reasons from circ description --- src/or/control.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index 109eb88..05a2c66 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -3233,7 +3233,8 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp, int reason_code) { const char *status; - char extended_buf[96]; + char purpose[32]; + char reasons[64] = ""; if (!EVENT_IS_INTERESTING(EVENT_CIRCUIT_STATUS)) return 0; tor_assert(circ); @@ -3250,23 +3251,22 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp, return 0; } - tor_snprintf(extended_buf, sizeof(extended_buf), "PURPOSE=%s", + tor_snprintf(purpose, sizeof(purpose), "PURPOSE=%s", circuit_purpose_to_controller_string(circ->_base.purpose)); if (tp == CIRC_EVENT_FAILED || tp == CIRC_EVENT_CLOSED) { const char *reason_str = circuit_end_reason_to_control_string(reason_code); char *reason = NULL; - size_t n=strlen(extended_buf); if (!reason_str) { reason = tor_malloc(16); tor_snprintf(reason, 16, "UNKNOWN_%d", reason_code); reason_str = reason; } if (reason_code > 0 && reason_code & END_CIRC_REASON_FLAG_REMOTE) { - tor_snprintf(extended_buf+n, sizeof(extended_buf)-n, + tor_snprintf(reasons, sizeof(reasons), " REASON=DESTROYED REMOTE_REASON=%s", reason_str); } else { - tor_snprintf(extended_buf+n, sizeof(extended_buf)-n, + tor_snprintf(reasons, sizeof(reasons), " REASON=%s", reason_str); } tor_free(reason); @@ -3276,9 +3276,11 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp, char *vpath = circuit_list_path_for_controller(circ); const char *sp = strlen(vpath) ? " " : ""; send_control_event(EVENT_CIRCUIT_STATUS, ALL_FORMATS, - "650 CIRC %lu %s%s%s %s\r\n", + "650 CIRC %lu %s%s%s %s%s\r\n", (unsigned long)circ->global_identifier, - status, sp, vpath, extended_buf); + status, sp, vpath, + purpose, + reasons); tor_free(vpath); }

1 0