tor-commits July 2011

tor-commits@lists.torproject.org

16 participants
868 discussions

[tor/master] Implement sensible isolation for tunneled directory conns
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit 8314fa5e5c8d300323589ff97599f8f93b847b78 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 8 15:54:30 2011 -0400 Implement sensible isolation for tunneled directory conns One-hop dirconn streams all share a session group, and get the ISO_SESSIONGRP flag: they may share circuits with each other and nothing else. Anonymized dirconn streams get a new internal-use-only ISO_STREAM flag: they may not share circuits with anything, including each other. --- src/or/config.c | 6 +++--- src/or/connection.c | 2 +- src/or/connection_edge.c | 18 ++++++++++++++++-- src/or/connection_edge.h | 2 ++ src/or/directory.c | 8 +++++++- src/or/or.h | 9 +++++++++ 6 files changed, 38 insertions(+), 7 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 14acf59..86ccb92 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4973,7 +4973,7 @@ parse_client_port_config(smartlist_t *out, cfg->type = listener_type; cfg->port = port ? port : defaultport; tor_addr_copy(&cfg->addr, &addr); - cfg->session_group = -1; + cfg->session_group = SESSION_GROUP_UNSET; cfg->isolation_flags = ISO_DEFAULT; smartlist_add(out, cfg); } @@ -4992,7 +4992,7 @@ parse_client_port_config(smartlist_t *out, cfg->type = listener_type; cfg->port = defaultport; tor_addr_from_str(&cfg->addr, defaultaddr); - cfg->session_group = -1; + cfg->session_group = SESSION_GROUP_UNSET; cfg->isolation_flags = ISO_DEFAULT; smartlist_add(out, cfg); } @@ -5006,7 +5006,7 @@ parse_client_port_config(smartlist_t *out, for (; ports; ports = ports->next) { tor_addr_t addr; int port; - int sessiongroup = -1; + int sessiongroup = SESSION_GROUP_UNSET; unsigned isolation = ISO_DEFAULT; char *addrport; diff --git a/src/or/connection.c b/src/or/connection.c index 5e5abca..0fae11e 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -868,7 +868,7 @@ connection_create_listener(const struct sockaddr *listensockaddr, tor_socket_t s; /* the socket we're going to make */ uint16_t usePort = 0, gotPort = 0; int start_reading = 0; - static int global_next_session_group = -2; + static int global_next_session_group = SESSION_GROUP_FIRST_AUTO; if (get_n_open_sockets() >= get_options()->_ConnLimit-1) { warn_too_many_conns(); diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index cfa6a3d..42f74b7 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -2497,7 +2497,9 @@ connection_ap_handshake_send_resolve(edge_connection_t *ap_conn) edge_connection_t * connection_ap_make_link(connection_t *partner, char *address, uint16_t port, - const char *digest, int use_begindir, int want_onehop) + const char *digest, + int session_group, int isolation_flags, + int use_begindir, int want_onehop) { edge_connection_t *conn; @@ -2515,7 +2517,6 @@ connection_ap_make_link(connection_t *partner, conn->socks_request->has_finished = 0; /* waiting for 'connected' */ strlcpy(conn->socks_request->address, address, sizeof(conn->socks_request->address)); - conn->original_dest_address = tor_strdup(address); conn->socks_request->port = port; conn->socks_request->command = SOCKS_COMMAND_CONNECT; conn->want_onehop = want_onehop; @@ -2528,6 +2529,11 @@ connection_ap_make_link(connection_t *partner, digest, DIGEST_LEN); } + /* Populate isolation fields. */ + conn->original_dest_address = tor_strdup(address); + conn->session_group = session_group; + conn->isolation_flags = isolation_flags; + conn->_base.address = tor_strdup("(Tor_internal)"); tor_addr_make_unspec(&conn->_base.addr); conn->_base.port = 0; @@ -3291,6 +3297,9 @@ connection_edge_streams_are_compatible(const edge_connection_t *a, tor_strdup(a->socks_request->address); } + if (iso & ISO_STREAM) + return 0; + if ((iso & ISO_DESTPORT) && a->socks_request->port != b->socks_request->port) return 0; if ((iso & ISO_DESTADDR) && @@ -3350,6 +3359,11 @@ connection_edge_compatible_with_circuit(const edge_connection_t *conn, tor_strdup(conn->socks_request->address); } + /* If isolation_values_set, then the circuit is not compatible with + * any new ISO_STREAM stream. */ + if (iso & ISO_STREAM) + return 0; + if ((iso & ISO_DESTPORT) && conn->socks_request->port != circ->dest_port) return 0; if ((iso & ISO_DESTADDR) && diff --git a/src/or/connection_edge.h b/src/or/connection_edge.h index 8bd308d..85293a0 100644 --- a/src/or/connection_edge.h +++ b/src/or/connection_edge.h @@ -36,6 +36,8 @@ int connection_ap_handshake_send_resolve(edge_connection_t *ap_conn); edge_connection_t *connection_ap_make_link(connection_t *partner, char *address, uint16_t port, const char *digest, + int session_group, + int isolation_flags, int use_begindir, int want_onehop); void connection_ap_handshake_socks_reply(edge_connection_t *conn, char *reply, size_t replylen, diff --git a/src/or/directory.c b/src/or/directory.c index 2667f12..744bc12 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -973,6 +973,10 @@ directory_initiate_command_rend(const char *address, const tor_addr_t *_addr, } } else { /* we want to connect via a tor connection */ edge_connection_t *linked_conn; + /* Anonymized tunneled connections can never share a circuit. + * One-hop directory connections can share circuits with each other + * but nothing else. */ + int iso_flags = anonymized_connection ? ISO_STREAM : ISO_SESSIONGRP; /* If it's an anonymized connection, remember the fact that we * wanted it for later: maybe we'll want it again soon. */ @@ -988,7 +992,9 @@ directory_initiate_command_rend(const char *address, const tor_addr_t *_addr, linked_conn = connection_ap_make_link(TO_CONN(conn), conn->_base.address, conn->_base.port, - digest, use_begindir, conn->dirconn_direct); + digest, + SESSION_GROUP_DIRCONN, iso_flags, + use_begindir, conn->dirconn_direct); if (!linked_conn) { log_warn(LD_NET,"Making tunnel to dirserver failed."); connection_mark_for_close(TO_CONN(conn)); diff --git a/src/or/or.h b/src/or/or.h index ace92ce..26e9970 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2642,11 +2642,20 @@ typedef enum invalid_router_usage_t { #define ISO_SESSIONGRP (1u<<5) /** Isolate based on newnym epoch (always on). */ #define ISO_NYM_EPOCH (1u<<6) +/** Isolate all streams (Internal only). */ +#define ISO_STREAM (1u<<7) /**@}*/ /** Default isolation level for ports. */ #define ISO_DEFAULT (ISO_CLIENTADDR|ISO_SOCKSAUTH|ISO_SESSIONGRP|ISO_NYM_EPOCH) +/** Indicates that we haven't yet set a session group on a port_cfg_t. */ +#define SESSION_GROUP_UNSET -1 +/** Session group reserved for directory connections */ +#define SESSION_GROUP_DIRCONN -2 +/** First automatically allocated session group number */ +#define SESSION_GROUP_FIRST_AUTO -3 + /** Configuration for a single port that we're listening on. */ typedef struct port_cfg_t { tor_addr_t addr; /**< The actual IP to listen on, if !is_unix_addr. */

1 0

[tor/master] Fix spurious warning in bufferevent socks parsing
by nickm＠torproject.org 20 Jul '11

20 Jul '11

commit 553ae5dfb5f6bb49889b2b1735217dae803f92d7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 19 20:40:15 2011 -0400 Fix spurious warning in bufferevent socks parsing The problem was that we weren't initializing want_length to 0 before calling parse_socks() the first time, so it looked like we were risking an infinite loop when in fact we were safe. Fixes 3615; bugfix on 0.2.3.2-alpha. --- changes/bug3615 | 3 +++ src/or/buffers.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug3615 b/changes/bug3615 new file mode 100644 index 0000000..704b3fa --- /dev/null +++ b/changes/bug3615 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Fix a spurious warning when parsing SOCKS requests with + bufferevents enabled. Fixes bug 3615; bugfix on 0.2.3.2-alpha. diff --git a/src/or/buffers.c b/src/or/buffers.c index 256b507..e2b0bd0 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -1581,12 +1581,12 @@ fetch_from_evbuffer_socks(struct evbuffer *buf, socks_request_t *req, */ struct evbuffer_iovec v; int i; - want_length = evbuffer_get_contiguous_space(buf); n_drain = 0; - i = evbuffer_peek(buf, want_length, NULL, &v, 1); + i = evbuffer_peek(buf, -1, NULL, &v, 1); tor_assert(i == 1); data = v.iov_base; datalen = v.iov_len; + want_length = 0; res = parse_socks(data, datalen, req, log_sockstype, safe_socks, &n_drain, &want_length);

1 0

[tor/master] Specify text or binary mode in every start_writing_to_stdio_file call
by nickm＠torproject.org 19 Jul '11

19 Jul '11

commit f021df58246b5cb9b1312e5339f484462ba94b02 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Mon Jul 18 18:12:31 2011 -0700 Specify text or binary mode in every start_writing_to_stdio_file call --- changes/bug3607 | 15 +++++++++++++++ src/or/geoip.c | 4 ++-- src/or/rendservice.c | 6 ++++-- src/or/rephist.c | 2 +- src/tools/tor-gencert.c | 4 ++-- 5 files changed, 24 insertions(+), 7 deletions(-) diff --git a/changes/bug3607 b/changes/bug3607 new file mode 100644 index 0000000..2e86253 --- /dev/null +++ b/changes/bug3607 @@ -0,0 +1,15 @@ + o Minor bugfixes: + + - Write several files (currently, buffer-stats, dirreq-stats, and + entry-stats on relays that collect those statistics, client_keys + and hostname files for hidden services that use authentication, + and (in the tor-gencert utility) newly generated identity and + signing keys) in text mode, on OSes that distinguish text mode + from binary mode (i.e. on Windows). Previously, we wouldn't + specify text mode or binary mode, leading to an assertion + failure. Fixes bug 3607. Bugfix on 0.2.1.1-alpha (when the + DirRecordUsageByCountry option which would have triggered the + assertion failure was added), although this assertion failure + would have occurred in tor-gencert on Windows in 0.2.0.1-alpha. + + diff --git a/src/or/geoip.c b/src/or/geoip.c index c621ea8..c51142c 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -976,7 +976,7 @@ geoip_dirreq_stats_write(time_t now) data_v2 = geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS_V2); data_v3 = geoip_get_client_history(GEOIP_CLIENT_NETWORKSTATUS); format_iso_time(written, now); - out = start_writing_to_stdio_file(filename, OPEN_FLAGS_APPEND, + out = start_writing_to_stdio_file(filename, OPEN_FLAGS_APPEND | O_TEXT, 0600, &open_file); if (!out) goto done; @@ -1309,7 +1309,7 @@ geoip_entry_stats_write(time_t now) filename = get_datadir_fname2("stats", "entry-stats"); data = geoip_get_client_history(GEOIP_CLIENT_CONNECT); format_iso_time(written, now); - out = start_writing_to_stdio_file(filename, OPEN_FLAGS_APPEND, + out = start_writing_to_stdio_file(filename, OPEN_FLAGS_APPEND | O_TEXT, 0600, &open_file); if (!out) goto done; diff --git a/src/or/rendservice.c b/src/or/rendservice.c index d9a9364..8a01711 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -635,13 +635,15 @@ rend_service_load_keys(void) } /* Prepare client_keys and hostname files. */ - if (!(cfile = start_writing_to_stdio_file(cfname, OPEN_FLAGS_REPLACE, + if (!(cfile = start_writing_to_stdio_file(cfname, + OPEN_FLAGS_REPLACE | O_TEXT, 0600, &open_cfile))) { log_warn(LD_CONFIG, "Could not open client_keys file %s", escaped(cfname)); goto err; } - if (!(hfile = start_writing_to_stdio_file(fname, OPEN_FLAGS_REPLACE, + if (!(hfile = start_writing_to_stdio_file(fname, + OPEN_FLAGS_REPLACE | O_TEXT, 0600, &open_hfile))) { log_warn(LD_CONFIG, "Could not open hostname file %s", escaped(fname)); goto err; diff --git a/src/or/rephist.c b/src/or/rephist.c index b7341f3..2444700 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -2500,7 +2500,7 @@ rep_hist_buffer_stats_write(time_t now) if (check_private_dir(statsdir, CPD_CREATE, get_options()->User) < 0) goto done; filename = get_datadir_fname2("stats", "buffer-stats"); - out = start_writing_to_stdio_file(filename, OPEN_FLAGS_APPEND, + out = start_writing_to_stdio_file(filename, OPEN_FLAGS_APPEND | O_TEXT, 0600, &open_file); if (!out) goto done; diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index a04edda..7a516b4 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -264,7 +264,7 @@ load_identity_key(void) } if (!(f = start_writing_to_stdio_file(identity_key_file, - OPEN_FLAGS_REPLACE, 0400, + OPEN_FLAGS_REPLACE | O_TEXT, 0400, &open_file))) return 1; @@ -349,7 +349,7 @@ generate_signing_key(void) } if (!(f = start_writing_to_stdio_file(signing_key_file, - OPEN_FLAGS_REPLACE, 0600, + OPEN_FLAGS_REPLACE | O_TEXT, 0600, &open_file))) return 1;

1 0

[tor/master] Untangle first sentence of changes/bug3607
by nickm＠torproject.org 19 Jul '11

19 Jul '11

commit 3e3aac5fd552b7b1949b0d2e12368cea26449b83 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 19 11:14:01 2011 -0400 Untangle first sentence of changes/bug3607 --- changes/bug3607 | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/changes/bug3607 b/changes/bug3607 index 2e86253..5ece219 100644 --- a/changes/bug3607 +++ b/changes/bug3607 @@ -1,12 +1,12 @@ o Minor bugfixes: - - Write several files (currently, buffer-stats, dirreq-stats, and - entry-stats on relays that collect those statistics, client_keys - and hostname files for hidden services that use authentication, - and (in the tor-gencert utility) newly generated identity and - signing keys) in text mode, on OSes that distinguish text mode - from binary mode (i.e. on Windows). Previously, we wouldn't - specify text mode or binary mode, leading to an assertion + - Write several files in text mode, on OSes that distinguish text + mode from binary mode (namely, Windows). These files are: + buffer-stats, dirreq-stats, and entry-stats on relays that collect + those statistics; client_keys and hostname files for hidden + services that use authentication; and (in the tor-gencert utility) + newly generated identity and signing keys. Previously, we + wouldn't specify text mode or binary mode, leading to an assertion failure. Fixes bug 3607. Bugfix on 0.2.1.1-alpha (when the DirRecordUsageByCountry option which would have triggered the assertion failure was added), although this assertion failure

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 19 Jul '11

19 Jul '11

commit c2d3da6303a6a5e41eabcb18b56ee5d8434a9817 Merge: 2163e42 3e3aac5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 19 12:59:10 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug3607 | 15 +++++++++++++++ src/or/geoip.c | 4 ++-- src/or/rendservice.c | 6 ++++-- src/or/rephist.c | 2 +- src/tools/tor-gencert.c | 4 ++-- 5 files changed, 24 insertions(+), 7 deletions(-)

1 0

[tor/maint-0.2.2] Specify text or binary mode in every start_writing_to_stdio_file call
by nickm＠torproject.org 19 Jul '11

19 Jul '11

1 0

[tor/maint-0.2.2] Untangle first sentence of changes/bug3607
by nickm＠torproject.org 19 Jul '11

19 Jul '11

1 0

[arm/master] fix: avoiding catch-all during controller init
by atagar＠torproject.org 19 Jul '11

19 Jul '11

commit 7e8427563602a709afdc8a34585d9cbd905d8c87 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 19 09:18:23 2011 -0700 fix: avoiding catch-all during controller init Misplaced finally clause is obscuring any exceptions that are raised during arm's initialization. Only doing daemon shutdown for expected issues so unexpected issues are propagated. --- src/cli/controller.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index e8b28cc..1554949 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -661,9 +661,10 @@ def startTorMonitor(startTime): try: curses.wrapper(drawTorMonitor, startTime) + shutdownDaemons() except KeyboardInterrupt: - pass # skip printing stack trace in case of keyboard interrupt - finally: shutdownDaemons() + # skip printing stack trace in case of keyboard interrupt + shutdownDaemons() def drawTorMonitor(stdscr, startTime): """

1 0

[arm/master] fix: skipping log parsing if misformatted
by atagar＠torproject.org 19 Jul '11

19 Jul '11

commit dc04a95a054338957076b6b00d3813c731d61529 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 19 09:29:56 2011 -0700 fix: skipping log parsing if misformatted Prepopulating from Tor's log file can cause us to crash if the log file's misformatted. This can happen if either our log path has something other than a Tor log or in edge cases like running out of disk space. Caught by Sjon. --- src/cli/logPanel.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/src/cli/logPanel.py b/src/cli/logPanel.py index 2e0d038..0b4ab9c 100644 --- a/src/cli/logPanel.py +++ b/src/cli/logPanel.py @@ -284,6 +284,13 @@ def getLogFileEntries(runlevels, readLimit = None, addLimit = None, config = Non # entries look like: # Jul 15 18:29:48.806 [notice] Parsing GEOIP file. lineComp = line.split() + + # Checks that we have all the components we expect. This could happen if + # we're either not parsing a tor log or in weird edge cases (like being + # out of disk space) + + if len(lineComp) < 4: continue + eventType = lineComp[3][1:-1].upper() if eventType in runlevels:

1 0

[flashproxy/master] Remove debug=1 from tests; text output slows the transfers down a lot.
by dcf＠torproject.org 19 Jul '11

19 Jul '11

commit 72bd74a91ad923924326d7d7ad9a9f6af4b2181e Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 18 18:13:40 2011 -0700 Remove debug=1 from tests; text output slows the transfers down a lot. --- experiments/00 | 2 +- experiments/01 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/experiments/00 b/experiments/00 index a93ff3a..ecc8c48 100755 --- a/experiments/00 +++ b/experiments/00 @@ -50,7 +50,7 @@ done # Start the flash proxy, server side echo "starting flash proxy server side..." -firefox --remote "openURL(http://localhost:1080/swfcat.swf?debug=1&facilitator=127.0.0.1:4701)" +firefox --remote "openURL(http://localhost:1080/swfcat.swf?facilitator=127.0.0.1:4701)" let query_fac_time=NUM_CLIENTS+2 sleep ${query_fac_time} diff --git a/experiments/01 b/experiments/01 index 8a62479..10ee99d 100755 --- a/experiments/01 +++ b/experiments/01 @@ -52,7 +52,7 @@ sleep 15 # Start the flash proxy, server side echo "starting flash proxy server side..." -firefox --remote "openURL(http://localhost:1080/swfcat.swf?debug=1&facilitator=127.0.0.1:4701)" +firefox --remote "openURL(http://localhost:1080/swfcat.swf?facilitator=127.0.0.1:4701)" sleep 15

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
87
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2011