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

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'
by nickm＠torproject.org 09 Sep '14

09 Sep '14

commit 2ecaa59bd794f1cba6a4ce3b82b73a8b4d27b2ab Merge: 781b477 d229025 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 8 15:16:45 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug13085 | 3 +++ src/or/control.c | 8 ++++---- src/or/control.h | 4 ++-- src/or/or.h | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'
by nickm＠torproject.org 09 Sep '14

09 Sep '14

commit ad0ae89b3c872ee89f4bd6096e650d4e2c855330 Merge: 2ecaa59 a3c49ca Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 9 10:22:42 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' changes/bug13071 | 3 +++ src/or/directory.c | 12 +++++++----- 2 files changed, 10 insertions(+), 5 deletions(-)

1 0

[tor/master] Add more escaped() calls in directory.c
by nickm＠torproject.org 09 Sep '14

09 Sep '14

commit a3c49ca79aa28d869223773eb8e8774013f3eb77 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 9 10:22:01 2014 -0400 Add more escaped() calls in directory.c Patch from teor to fix 13071. --- changes/bug13071 | 3 +++ src/or/directory.c | 12 +++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/changes/bug13071 b/changes/bug13071 new file mode 100644 index 0000000..8212b6c --- /dev/null +++ b/changes/bug13071 @@ -0,0 +1,3 @@ + o Minor bugfixes (relay): + - Escape all strings from the directory connection before logging them. + Fixes bug 13071; bugfix on 0.1.1.15. Patch from "teor". diff --git a/src/or/directory.c b/src/or/directory.c index 51ea312..298271f 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2497,7 +2497,7 @@ client_likes_consensus(networkstatus_t *v, const char *want_url) if (base16_decode(want_digest, DIGEST_LEN, d, want_len*2) < 0) { log_fn(LOG_PROTOCOL_WARN, LD_DIR, - "Failed to decode requested authority digest %s.", d); + "Failed to decode requested authority digest %s.", escaped(d)); continue; }; @@ -2557,7 +2557,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, * act as if no If-Modified-Since header had been given. */ tor_free(header); } - log_debug(LD_DIRSERV,"rewritten url as '%s'.", url); + log_debug(LD_DIRSERV,"rewritten url as '%s'.", escaped(url)); url_mem = url; url_len = strlen(url); @@ -3006,7 +3006,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, const char *query = url + strlen("/tor/rendezvous2/"); if (strlen(query) == REND_DESC_ID_V2_LEN_BASE32) { log_info(LD_REND, "Got a v2 rendezvous descriptor request for ID '%s'", - safe_str(query)); + safe_str(escaped(query))); switch (rend_cache_lookup_v2_desc_as_dir(query, &descp)) { case 1: /* valid */ write_http_response_header(conn, strlen(descp), 0, 0); @@ -3140,7 +3140,7 @@ directory_handle_command_post(dir_connection_t *conn, const char *headers, write_http_status_line(conn, 400, "Bad request"); return 0; } - log_debug(LD_DIRSERV,"rewritten url as '%s'.", url); + log_debug(LD_DIRSERV,"rewritten url as '%s'.", escaped(url)); /* Handle v2 rendezvous service publish request. */ if (options->HidServDirectoryV2 && @@ -3273,7 +3273,9 @@ directory_handle_command(dir_connection_t *conn) } http_set_address_origin(headers, TO_CONN(conn)); - //log_debug(LD_DIRSERV,"headers %s, body %s.", headers, body); + // we should escape headers here as well, + // but we can't call escaped() twice, as it uses the same buffer + //log_debug(LD_DIRSERV,"headers %s, body %s.", headers, escaped(body)); if (!strncasecmp(headers,"GET",3)) r = directory_handle_command_get(conn, headers, body, body_len);

1 0

[tor/maint-0.2.5] Add more escaped() calls in directory.c
by nickm＠torproject.org 09 Sep '14

09 Sep '14

commit a3c49ca79aa28d869223773eb8e8774013f3eb77 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 9 10:22:01 2014 -0400 Add more escaped() calls in directory.c Patch from teor to fix 13071. --- changes/bug13071 | 3 +++ src/or/directory.c | 12 +++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/changes/bug13071 b/changes/bug13071 new file mode 100644 index 0000000..8212b6c --- /dev/null +++ b/changes/bug13071 @@ -0,0 +1,3 @@ + o Minor bugfixes (relay): + - Escape all strings from the directory connection before logging them. + Fixes bug 13071; bugfix on 0.1.1.15. Patch from "teor". diff --git a/src/or/directory.c b/src/or/directory.c index 51ea312..298271f 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2497,7 +2497,7 @@ client_likes_consensus(networkstatus_t *v, const char *want_url) if (base16_decode(want_digest, DIGEST_LEN, d, want_len*2) < 0) { log_fn(LOG_PROTOCOL_WARN, LD_DIR, - "Failed to decode requested authority digest %s.", d); + "Failed to decode requested authority digest %s.", escaped(d)); continue; }; @@ -2557,7 +2557,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, * act as if no If-Modified-Since header had been given. */ tor_free(header); } - log_debug(LD_DIRSERV,"rewritten url as '%s'.", url); + log_debug(LD_DIRSERV,"rewritten url as '%s'.", escaped(url)); url_mem = url; url_len = strlen(url); @@ -3006,7 +3006,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers, const char *query = url + strlen("/tor/rendezvous2/"); if (strlen(query) == REND_DESC_ID_V2_LEN_BASE32) { log_info(LD_REND, "Got a v2 rendezvous descriptor request for ID '%s'", - safe_str(query)); + safe_str(escaped(query))); switch (rend_cache_lookup_v2_desc_as_dir(query, &descp)) { case 1: /* valid */ write_http_response_header(conn, strlen(descp), 0, 0); @@ -3140,7 +3140,7 @@ directory_handle_command_post(dir_connection_t *conn, const char *headers, write_http_status_line(conn, 400, "Bad request"); return 0; } - log_debug(LD_DIRSERV,"rewritten url as '%s'.", url); + log_debug(LD_DIRSERV,"rewritten url as '%s'.", escaped(url)); /* Handle v2 rendezvous service publish request. */ if (options->HidServDirectoryV2 && @@ -3273,7 +3273,9 @@ directory_handle_command(dir_connection_t *conn) } http_set_address_origin(headers, TO_CONN(conn)); - //log_debug(LD_DIRSERV,"headers %s, body %s.", headers, body); + // we should escape headers here as well, + // but we can't call escaped() twice, as it uses the same buffer + //log_debug(LD_DIRSERV,"headers %s, body %s.", headers, escaped(body)); if (!strncasecmp(headers,"GET",3)) r = directory_handle_command_get(conn, headers, body, body_len);

1 0

[tor/release-0.2.5] Expand the event_mask field in controller conns to 64 bits
by arma＠torproject.org 09 Sep '14

09 Sep '14

commit d229025fefa6faa228d9154e391293d9d5b320d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 8 15:15:05 2014 -0400 Expand the event_mask field in controller conns to 64 bits Back in 078d6bcd, we added an event number 0x20, but we didn't make the event_mask field big enough to compensate. Patch by "teor". Fixes 13085; bugfix on 0.2.5.1-alpha. --- changes/bug13085 | 3 +++ src/or/control.c | 8 ++++---- src/or/control.h | 4 ++-- src/or/or.h | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/changes/bug13085 b/changes/bug13085 new file mode 100644 index 0000000..a46457c --- /dev/null +++ b/changes/bug13085 @@ -0,0 +1,3 @@ + o Minor bugfixes (controller): + - Actually send TRANSPORT_LAUNCHED and HS_DESC events to controllers. + Fixes bug 13085; bugfix on 0.2.5.1-alpha. Patch by "teor". diff --git a/src/or/control.c b/src/or/control.c index 4a6b18d..9378f38 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -582,7 +582,7 @@ send_control_event_string,(uint16_t event, event_format_t which, conn->state == CONTROL_CONN_STATE_OPEN) { control_connection_t *control_conn = TO_CONTROL_CONN(conn); - if (control_conn->event_mask & (1<<event)) { + if (control_conn->event_mask & (((event_mask_t)1)<<event)) { int is_err = 0; connection_write_to_buf(msg, strlen(msg), TO_CONN(control_conn)); if (event == EVENT_ERR_MSG) @@ -950,7 +950,7 @@ handle_control_setevents(control_connection_t *conn, uint32_t len, const char *body) { int event_code = -1; - uint32_t event_mask = 0; + event_mask_t event_mask = 0; smartlist_t *events = smartlist_new(); (void) len; @@ -978,7 +978,7 @@ handle_control_setevents(control_connection_t *conn, uint32_t len, return 0; } } - event_mask |= (1 << event_code); + event_mask |= (((event_mask_t)1) << event_code); } SMARTLIST_FOREACH_END(ev); SMARTLIST_FOREACH(events, char *, e, tor_free(e)); @@ -2880,7 +2880,7 @@ handle_control_resolve(control_connection_t *conn, uint32_t len, int is_reverse = 0; (void) len; /* body is nul-terminated; it's safe to ignore the length */ - if (!(conn->event_mask & ((uint32_t)1L<<EVENT_ADDRMAP))) { + if (!(conn->event_mask & (((event_mask_t)1)<<EVENT_ADDRMAP))) { log_warn(LD_CONTROL, "Controller asked us to resolve an address, but " "isn't listening for ADDRMAP events. It probably won't see " "the answer."); diff --git a/src/or/control.h b/src/or/control.h index 68a6c24..494f04b 100644 --- a/src/or/control.h +++ b/src/or/control.h @@ -156,8 +156,8 @@ void control_free_all(void); #define EVENT_TRANSPORT_LAUNCHED 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. */ +/* If EVENT_MAX_ ever hits 0x003F, we need to make the mask into a + * different structure, as it can only handle a maximum left shift of 1<<63. */ /* Used only by control.c and test.c */ STATIC size_t write_escaped_data(const char *data, size_t len, char **out); diff --git a/src/or/or.h b/src/or/or.h index 0f1457f..1609587 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1737,8 +1737,9 @@ typedef struct dir_connection_t { typedef struct control_connection_t { connection_t base_; - uint32_t event_mask; /**< Bitfield: which events does this controller - * care about? */ + uint64_t event_mask; /**< Bitfield: which events does this controller + * care about? + * EVENT_MAX_ is >31, so we need a 64 bit mask */ /** True if we have sent a protocolinfo reply on this connection. */ unsigned int have_sent_protocolinfo:1;

1 0

[tor/release-0.2.5] Add cscope generated files to .gitignore.
by arma＠torproject.org 09 Sep '14

09 Sep '14

commit f551a053e35a937da2e01d382639e79f1e6d2369 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 8 15:07:54 2014 -0400 Add cscope generated files to .gitignore. Closes #13092; patch from dgoulet. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index de1eb04..1a47990 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,8 @@ # Python droppings *.pyc *.pyo +# Cscope +cscope.* # / /Makefile

1 0

[tor/release-0.2.5] Merge branch 'maint-0.2.5' into release-0.2.5
by arma＠torproject.org 09 Sep '14

09 Sep '14

commit 83e069fd52349009ba2518355d68d6a2c0ac4652 Merge: 32c5806 d229025 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Sep 9 07:17:28 2014 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 .gitignore | 2 ++ changes/bug13085 | 3 +++ src/or/control.c | 8 ++++---- src/or/control.h | 4 ++-- src/or/or.h | 5 +++-- 5 files changed, 14 insertions(+), 8 deletions(-)

1 0

[meek/master] Set Content-Type: application/octet-stream in meek-server.
by dcf＠torproject.org 09 Sep '14

09 Sep '14

commit fa5fbb807a5d81cd234caf402f262d4a5de0533e Author: David Fifield <david(a)bamsoftware.com> Date: Mon Aug 4 00:27:07 2014 -0700 Set Content-Type: application/octet-stream in meek-server. Even thought it takes up space in the header, it looks like Google and Amazon try to sniff the type and add the header anyway if it is missing. (They set "text/plain; charset=utf-8" for zero-length bodies and "application/octet-stream" for non-zero bodies). So we might as well add it preemptively. https://trac.torproject.org/projects/tor/ticket/12778 --- meek-server/meek-server.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index b0c9fa3..4edf850 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -164,6 +164,8 @@ func transact(session *Session, w http.ResponseWriter, req *http.Request) error } } // log.Printf("read %d bytes from ORPort: %q", n, buf[:n]) + // Set a Content-Type to prevent Go and the CDN from trying to guess. + w.Header().Set("Content-Type", "application/octet-stream") n, err = w.Write(buf[:n]) if err != nil { return errors.New(fmt.Sprintf("writing to response: %s", err))

1 0

[arm/master] Don't skip bandwidth graph prepopulation for non-relays
by atagar＠torproject.org 09 Sep '14

09 Sep '14

commit d3ba32b253c58eb11a6019e79efc6e8e2808e811 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 8 19:06:51 2014 -0700 Don't skip bandwidth graph prepopulation for non-relays I'm not quite sure why we skipped it. Maybe the state file won't have the bandwidth entries? Probably no harm in checking anyway. --- arm/graphing/bandwidth_stats.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arm/graphing/bandwidth_stats.py b/arm/graphing/bandwidth_stats.py index f8fea43..1c8b4b4 100644 --- a/arm/graphing/bandwidth_stats.py +++ b/arm/graphing/bandwidth_stats.py @@ -135,13 +135,7 @@ class BandwidthStats(graph_panel.GraphStats): returns True if successful and False otherwise. """ - # checks that this is a relay (if ORPort is unset, then skip) - controller = tor_controller() - or_port = controller.get_conf('ORPort', None) - - if or_port == '0': - return start_time = system.start_time(controller.get_pid(None)) uptime = time.time() - start_time if start_time else None

1 0

[arm/master] Replacing code for getting process uptime
by atagar＠torproject.org 09 Sep '14

09 Sep '14

commit f06b621813ec8bfc871df41449ba5b45d6ee6a41 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Sep 8 16:51:10 2014 -0700 Replacing code for getting process uptime We had a hack here where we got more attributes than we wanted to piggyback on cached values fetched for other things. That hack no longer works, and stem has a very nice function for this so using that. --- arm/graphing/bandwidth_stats.py | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/arm/graphing/bandwidth_stats.py b/arm/graphing/bandwidth_stats.py index ce8b5b1..f8fea43 100644 --- a/arm/graphing/bandwidth_stats.py +++ b/arm/graphing/bandwidth_stats.py @@ -143,30 +143,14 @@ class BandwidthStats(graph_panel.GraphStats): if or_port == '0': return - # gets the uptime (using the same parameters as the header panel to take - # advantage of caching) - # TODO: stem dropped system caching support so we'll need to think of - # something else - - uptime = None - query_pid = controller.get_pid(None) - - if query_pid: - query_param = ['%cpu', 'rss', '%mem', 'etime'] - query_cmd = 'ps -p %s -o %s' % (query_pid, ','.join(query_param)) - ps_call = system.call(query_cmd, None) - - if ps_call and len(ps_call) == 2: - stats = ps_call[1].strip().split() - - if len(stats) == 4: - uptime = stats[3] + start_time = system.start_time(controller.get_pid(None)) + uptime = time.time() - start_time if start_time else None # checks if tor has been running for at least a day, the reason being that # the state tracks a day's worth of data and this should only prepopulate # results associated with this tor instance - if not uptime or '-' not in uptime: + if not uptime or uptime < (24 * 60 * 60): log.notice(msg('panel.graphing.prepopulation_failure', error = 'insufficient uptime')) return False

1 0