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

[tor/master] Merge remote-tracking branch 'public/ticket6799_024_v2_squashed'
by nickm＠torproject.org 11 Jun '14

11 Jun '14

commit 3a2e25969fbb7bf38fcfafce676e7f56a1aca118 Merge: 7f35630 bbb8f12 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 11 11:57:56 2014 -0400 Merge remote-tracking branch 'public/ticket6799_024_v2_squashed' Conflicts: src/or/channel.c src/or/circuitlist.c src/or/connection.c Conflicts involved removal of next_circ_id and addition of unusable-circid tracking. changes/bug6799 | 20 ++++++++++++++++++++ src/or/channel.c | 11 +++++------ src/or/channel.h | 6 ++++-- src/or/channeltls.c | 2 +- src/or/circuitlist.c | 10 ++++++++-- src/or/connection.c | 4 +--- src/or/connection_or.c | 46 ++++++++++++++++++++++++++++++++++++++++------ src/or/connection_or.h | 2 ++ src/or/main.c | 38 ++++++++++++++++++++++---------------- src/or/or.h | 7 ++++--- 10 files changed, 107 insertions(+), 39 deletions(-) diff --cc src/or/channel.c index 63af2f9,ce2d012..1cc7864 --- a/src/or/channel.c +++ b/src/or/channel.c @@@ -726,10 -731,10 +728,10 @@@ channel_init(channel_t *chan chan->global_identifier = n_channels_allocated++; /* Init timestamp */ - chan->timestamp_last_added_nonpadding = time(NULL); + chan->timestamp_last_had_circuits = time(NULL); - /* Init next_circ_id */ - chan->next_circ_id = crypto_rand_int(1 << 15); + /* Warn about exhausted circuit IDs no more than hourly. */ + chan->last_warned_circ_ids_exhausted.rate = 3600; /* Initialize queues. */ TOR_SIMPLEQ_INIT(&chan->incoming_queue); @@@ -1681,18 -1687,6 +1685,13 @@@ channel_write_cell_queue_entry(channel_ chan->state == CHANNEL_STATE_OPEN || chan->state == CHANNEL_STATE_MAINT); - /* Increment the timestamp unless it's padding */ - if (!cell_queue_entry_is_padding(q)) { - chan->timestamp_last_added_nonpadding = approx_time(); - } - + { + circid_t circ_id; + if (is_destroy_cell(chan, q, &circ_id)) { + channel_note_destroy_not_pending(chan, circ_id); + } + } + /* Can we send it right out? If so, try */ if (TOR_SIMPLEQ_EMPTY(&chan->outgoing_queue) && chan->state == CHANNEL_STATE_OPEN) { diff --cc src/or/circuitlist.c index 6238e08,3cb429b..0140afc --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@@ -319,23 -211,17 +319,26 @@@ channel_note_destroy_not_pending(channe * with the corresponding circuit ID, and add the circuit as appropriate * to the (chan,id)-\>circuit map. */ void -circuit_set_p_circid_chan(or_circuit_t *circ, circid_t id, +circuit_set_p_circid_chan(or_circuit_t *or_circ, circid_t id, channel_t *chan) { - circuit_set_circid_chan_helper(TO_CIRCUIT(circ), CELL_DIRECTION_IN, - id, chan); + circuit_t *circ = TO_CIRCUIT(or_circ); + channel_t *old_chan = or_circ->p_chan; + circid_t old_id = or_circ->p_circ_id; + + circuit_set_circid_chan_helper(circ, CELL_DIRECTION_IN, id, chan); - if (chan) + if (chan) { - tor_assert(bool_eq(circ->p_chan_cells.n, circ->next_active_on_p_chan)); + tor_assert(bool_eq(or_circ->p_chan_cells.n, + or_circ->next_active_on_p_chan)); + chan->timestamp_last_had_circuits = approx_time(); + } ++ + if (circ->p_delete_pending && old_chan) { + channel_mark_circid_unusable(old_chan, old_id); + circ->p_delete_pending = 0; + } } /** Set the n_conn field of a circuit circ, along @@@ -345,18 -231,13 +348,21 @@@ voi circuit_set_n_circid_chan(circuit_t *circ, circid_t id, channel_t *chan) { + channel_t *old_chan = circ->n_chan; + circid_t old_id = circ->n_circ_id; + circuit_set_circid_chan_helper(circ, CELL_DIRECTION_OUT, id, chan); - if (chan) + if (chan) { tor_assert(bool_eq(circ->n_chan_cells.n, circ->next_active_on_n_chan)); + chan->timestamp_last_had_circuits = approx_time(); + } ++ + if (circ->n_delete_pending && old_chan) { + channel_mark_circid_unusable(old_chan, old_id); + circ->n_delete_pending = 0; + } } /** Change the state of circ to state, adding it to or removing diff --cc src/or/connection.c index cef9172,d99a54c..0b03092 --- a/src/or/connection.c +++ b/src/or/connection.c @@@ -269,8 -249,8 +269,6 @@@ dir_connection_new(int socket_family /** Allocate and return a new or_connection_t, initialized as by * connection_init(). * - * Set timestamp_last_added_nonpadding to now. - * - * Assign a pseudorandom next_circ_id between 0 and 2**15. - * * Initialize active_circuit_pqueue. * * Set active_circuit_pqueue_last_recalibrated to current cell_ewma tick. @@@ -280,14 -260,10 +278,14 @@@ or_connection_new(int type, int socket_ { or_connection_t *or_conn = tor_malloc_zero(sizeof(or_connection_t)); time_t now = time(NULL); - connection_init(now, TO_CONN(or_conn), CONN_TYPE_OR, socket_family); + tor_assert(type == CONN_TYPE_OR || type == CONN_TYPE_EXT_OR); + connection_init(now, TO_CONN(or_conn), type, socket_family); - or_conn->timestamp_last_added_nonpadding = time(NULL); + connection_or_set_canonical(or_conn, 0); + if (type == CONN_TYPE_EXT_OR) + connection_or_set_ext_or_identifier(or_conn); + return or_conn; } diff --cc src/or/connection_or.h index 8d93028,896556c..143540e --- a/src/or/connection_or.h +++ b/src/or/connection_or.h @@@ -45,9 -45,10 +45,11 @@@ void connection_or_close_for_error(or_c void connection_or_report_broken_states(int severity, int domain); -int connection_tls_start_handshake(or_connection_t *conn, int receiving); +MOCK_DECL(int,connection_tls_start_handshake,(or_connection_t *conn, + int receiving)); int connection_tls_continue_handshake(or_connection_t *conn); + void connection_or_set_canonical(or_connection_t *or_conn, + int is_canonical); int connection_init_or_handshake_state(or_connection_t *conn, int started_here); diff --cc src/or/or.h index 6aa6b59,3ed9f9f..f1d68b7 --- a/src/or/or.h +++ b/src/or/or.h @@@ -1482,13 -1422,12 +1482,16 @@@ typedef struct or_connection_t unsigned int is_outgoing:1; unsigned int proxy_type:2; /**< One of PROXY_NONE...PROXY_SOCKS5 */ unsigned int wide_circ_ids:1; + /** True iff this connection has had its bootstrap failure logged with + * control_event_bootstrap_problem. */ + unsigned int have_noted_bootstrap_problem:1; + uint16_t link_proto; /**< What protocol version are we using? 0 for * "none negotiated yet." */ - + uint16_t idle_timeout; /**< How long can this connection sit with no + * circuits on it before we close it? Based on + * IDLE_CIRCUIT_TIMEOUT_{NON,}CANONICAL and + * on is_canonical, randomized. */ or_handshake_state_t *handshake_state; /**< If we are setting this connection * up, state information to do so. */

1 0

[tor/master] whitespaces fixes
by nickm＠torproject.org 11 Jun '14

11 Jun '14

commit 02dafc270c0104e894f4725c356594d12cb4b2a8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 11 12:00:14 2014 -0400 whitespaces fixes --- src/or/circuituse.c | 1 - src/or/main.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 023bd4c..221afea 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -832,7 +832,6 @@ circuit_log_ancient_one_hop_circuits(int age) format_local_iso_time(created, (time_t)circ->timestamp_created.tv_sec); - if (circ->timestamp_dirty) { char dirty_since[ISO_TIME_LEN+1]; format_local_iso_time(dirty_since, circ->timestamp_dirty); diff --git a/src/or/main.c b/src/or/main.c index 3deab3e..f7ad41e 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1065,7 +1065,6 @@ run_connection_housekeeping(int i, time_t now) chan = TLS_CHAN_TO_BASE(or_conn->chan); tor_assert(chan); - if (channel_num_circuits(chan) != 0) { have_any_circuits = 1; chan->timestamp_last_had_circuits = now; @@ -1101,7 +1100,8 @@ run_connection_housekeeping(int i, time_t now) (int)conn->s,conn->address, conn->port); connection_or_close_normally(TO_OR_CONN(conn), 1); } else if (!have_any_circuits && - now - or_conn->idle_timeout >= chan->timestamp_last_had_circuits) { + now - or_conn->idle_timeout >= + chan->timestamp_last_had_circuits) { log_info(LD_OR,"Expiring non-used OR connection to fd %d (%s:%d) " "[no circuits for %d; timeout %d; %scanonical].", (int)conn->s, conn->address, conn->port,

1 0

[tor/master] Replace last_added_nonpadding with last_had_circuits
by nickm＠torproject.org 11 Jun '14

11 Jun '14

commit 6557e612959dd9a1df4e85df4a11153be38db3ca Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 16 10:32:31 2014 -0400 Replace last_added_nonpadding with last_had_circuits The point of the "idle timeout" for connections is to kill the connection a while after it has no more circuits. But using "last added a non-padding cell" as a proxy for that is wrong, since if the last circuit is closed from the other side of the connection, we will not have sent anything on that connection since well before the last circuit closed. This is part of fixing 6799. When applied to 0.2.5, it is also a fix for 12023. --- changes/bug6799 | 15 +++++++++++---- src/or/channel.c | 11 +++++------ src/or/channel.h | 6 ++++-- src/or/circuitlist.c | 10 ++++++++-- src/or/connection.c | 4 ---- src/or/connection_or.c | 5 ----- src/or/main.c | 29 ++++++++++++++++++++++------- src/or/or.h | 2 -- 8 files changed, 50 insertions(+), 32 deletions(-) diff --git a/changes/bug6799 b/changes/bug6799 index b50762b..14ba4ae 100644 --- a/changes/bug6799 +++ b/changes/bug6799 @@ -1,13 +1,20 @@ o Major features: - - Increate the base amount of time that a canonical connection + - Increase the base amount of time that a canonical connection (one that we have made to a known OR) is allowed to stay open from a 3 minutes to 15 minutes. This leaks less information about when circuits have closed, and avoids unnecessary overhead from renegotiating connections. Part of a fix for ticket 6799. - - Instead of closing connections at a fixed interval after their - last circuit closed, randomly add up to 50% to each connection's - maximum timout. This makes it harder to tell when the last + - Instead of closing connections after they have been idle for a + fixed interval, randomly add up to 50% to each connection's + maximum timeout. This makes it harder to tell when the last circuit closed by looking at when a connection closes. Part of a fix for ticket 6799. + + - Base connection idleness tests on the actual time elapsed since + the connection last had circuits, not on the time when we last + added non-padding. This also makes it harder to tell when the last + circuit closed by looking at when a connection closes. Part of a + fix for ticket 6799. + Incidentally fixes bug 12023; bugfix on 0.2.5.1-alpha. diff --git a/src/or/channel.c b/src/or/channel.c index 1270eac..ce2d012 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -117,7 +117,9 @@ HT_GENERATE(channel_idmap, channel_idmap_entry_s, node, channel_idmap_hash, static cell_queue_entry_t * cell_queue_entry_dup(cell_queue_entry_t *q); static void cell_queue_entry_free(cell_queue_entry_t *q, int handed_off); +#if 0 static int cell_queue_entry_is_padding(cell_queue_entry_t *q); +#endif static cell_queue_entry_t * cell_queue_entry_new_fixed(cell_t *cell); static cell_queue_entry_t * @@ -729,7 +731,7 @@ channel_init(channel_t *chan) chan->global_identifier = n_channels_allocated++; /* Init timestamp */ - chan->timestamp_last_added_nonpadding = time(NULL); + chan->timestamp_last_had_circuits = time(NULL); /* Init next_circ_id */ chan->next_circ_id = crypto_rand_int(1 << 15); @@ -1597,6 +1599,7 @@ cell_queue_entry_free(cell_queue_entry_t *q, int handed_off) tor_free(q); } +#if 0 /** * Check whether a cell queue entry is padding; this is a helper function * for channel_write_cell_queue_entry() @@ -1625,6 +1628,7 @@ cell_queue_entry_is_padding(cell_queue_entry_t *q) return 0; } +#endif /** * Allocate a new cell queue entry for a fixed-size cell @@ -1683,11 +1687,6 @@ channel_write_cell_queue_entry(channel_t *chan, cell_queue_entry_t *q) chan->state == CHANNEL_STATE_OPEN || chan->state == CHANNEL_STATE_MAINT); - /* Increment the timestamp unless it's padding */ - if (!cell_queue_entry_is_padding(q)) { - chan->timestamp_last_added_nonpadding = approx_time(); - } - /* Can we send it right out? If so, try */ if (TOR_SIMPLEQ_EMPTY(&chan->outgoing_queue) && chan->state == CHANNEL_STATE_OPEN) { diff --git a/src/or/channel.h b/src/or/channel.h index 2dca817..be40a30 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -187,8 +187,10 @@ struct channel_s { time_t timestamp_recv; /* Cell received from lower layer */ time_t timestamp_xmit; /* Cell sent to lower layer */ - /* Timestamp for relay.c */ - time_t timestamp_last_added_nonpadding; + /** Timestamp for run_connection_housekeeping(). We update this once a + * second when we run housekeeping and find a circuit on this channel, and + * whenever we add a circuit to the channel. */ + time_t timestamp_last_had_circuits; /** Unique ID for measuring direct network status requests;vtunneled ones * come over a circuit_t, which has a dirreq_id field as well, but is a diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index c7b15e4..3cb429b 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -217,8 +217,11 @@ circuit_set_p_circid_chan(or_circuit_t *circ, circid_t id, circuit_set_circid_chan_helper(TO_CIRCUIT(circ), CELL_DIRECTION_IN, id, chan); - if (chan) + if (chan) { tor_assert(bool_eq(circ->p_chan_cells.n, circ->next_active_on_p_chan)); + + chan->timestamp_last_had_circuits = approx_time(); + } } /** Set the n_conn field of a circuit circ, along @@ -230,8 +233,11 @@ circuit_set_n_circid_chan(circuit_t *circ, circid_t id, { circuit_set_circid_chan_helper(circ, CELL_DIRECTION_OUT, id, chan); - if (chan) + if (chan) { tor_assert(bool_eq(circ->n_chan_cells.n, circ->next_active_on_n_chan)); + + chan->timestamp_last_had_circuits = approx_time(); + } } /** Change the state of circ to state, adding it to or removing diff --git a/src/or/connection.c b/src/or/connection.c index b967eac..d99a54c 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -249,8 +249,6 @@ dir_connection_new(int socket_family) /** Allocate and return a new or_connection_t, initialized as by * connection_init(). * - * Set timestamp_last_added_nonpadding to now. - * * Assign a pseudorandom next_circ_id between 0 and 2**15. * * Initialize active_circuit_pqueue. @@ -264,8 +262,6 @@ or_connection_new(int socket_family) time_t now = time(NULL); connection_init(now, TO_CONN(or_conn), CONN_TYPE_OR, socket_family); - or_conn->timestamp_last_added_nonpadding = time(NULL); - connection_or_set_canonical(or_conn, 0); return or_conn; diff --git a/src/or/connection_or.c b/src/or/connection_or.c index f03b18d..3d239d4 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1929,9 +1929,6 @@ connection_or_write_cell_to_buf(const cell_t *cell, or_connection_t *conn) if (conn->base_.state == OR_CONN_STATE_OR_HANDSHAKING_V3) or_handshake_state_record_cell(conn, conn->handshake_state, cell, 0); - - if (cell->command != CELL_PADDING) - conn->timestamp_last_added_nonpadding = approx_time(); } /** Pack a variable-length cell into wire-format, and write it onto @@ -1952,8 +1949,6 @@ connection_or_write_var_cell_to_buf(const var_cell_t *cell, cell->payload_len, TO_CONN(conn)); if (conn->base_.state == OR_CONN_STATE_OR_HANDSHAKING_V3) or_handshake_state_record_var_cell(conn, conn->handshake_state, cell, 0); - if (cell->command != CELL_PADDING) - conn->timestamp_last_added_nonpadding = approx_time(); /* Touch the channel's active timestamp if there is one */ if (conn->chan) diff --git a/src/or/main.c b/src/or/main.c index 8a653ca..70b1340 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1003,6 +1003,8 @@ run_connection_housekeeping(int i, time_t now) connection_t *conn = smartlist_get(connection_array, i); const or_options_t *options = get_options(); or_connection_t *or_conn; + channel_t *chan = NULL; + int have_any_circuits; int past_keepalive = now >= conn->timestamp_lastwritten + options->KeepalivePeriod; @@ -1050,8 +1052,19 @@ run_connection_housekeeping(int i, time_t now) tor_assert(conn->outbuf); #endif + chan = TLS_CHAN_TO_BASE(or_conn->chan); + tor_assert(chan); + + + if (channel_num_circuits(chan) != 0) { + have_any_circuits = 1; + chan->timestamp_last_had_circuits = now; + } else { + have_any_circuits = 0; + } + if (channel_is_bad_for_new_circs(TLS_CHAN_TO_BASE(or_conn->chan)) && - !connection_or_get_num_circuits(or_conn)) { + ! have_any_circuits) { /* It's bad for new circuits, and has no unmarked circuits on it: * mark it now. */ log_info(LD_OR, @@ -1070,19 +1083,21 @@ run_connection_housekeeping(int i, time_t now) connection_or_close_normally(TO_OR_CONN(conn), 0); } } else if (we_are_hibernating() && - !connection_or_get_num_circuits(or_conn) && + ! have_any_circuits && !connection_get_outbuf_len(conn)) { /* We're hibernating, there's no circuits, and nothing to flush.*/ log_info(LD_OR,"Expiring non-used OR connection to fd %d (%s:%d) " "[Hibernating or exiting].", (int)conn->s,conn->address, conn->port); connection_or_close_normally(TO_OR_CONN(conn), 1); - } else if (!connection_or_get_num_circuits(or_conn) && - now >= or_conn->timestamp_last_added_nonpadding + - or_conn->idle_timeout) { + } else if (!have_any_circuits && + now - or_conn->idle_timeout >= chan->timestamp_last_had_circuits) { log_info(LD_OR,"Expiring non-used OR connection to fd %d (%s:%d) " - "[idle %d].", (int)conn->s,conn->address, conn->port, - (int)(now - or_conn->timestamp_last_added_nonpadding)); + "[no circuits for %d; timeout %d; %scanonical].", + (int)conn->s, conn->address, conn->port, + (int)(now - chan->timestamp_last_had_circuits), + or_conn->idle_timeout, + or_conn->is_canonical ? "" : "non"); connection_or_close_normally(TO_OR_CONN(conn), 0); } else if ( now >= or_conn->timestamp_lastempty + options->KeepalivePeriod*10 && diff --git a/src/or/or.h b/src/or/or.h index 21ee185..3ed9f9f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -1432,8 +1432,6 @@ typedef struct or_connection_t { * up, state information to do so. */ time_t timestamp_lastempty; /**< When was the outbuf last completely empty?*/ - time_t timestamp_last_added_nonpadding; /** When did we last add a - * non-padding cell to the outbuf? */ /* bandwidth* and *_bucket only used by ORs in OPEN state: */ int bandwidthrate; /**< Bytes/s added to the bucket. (OPEN ORs only.) */

1 0

[tor/master] Fix a 32-big conversion warning in 11970 fix
by nickm＠torproject.org 11 Jun '14

11 Jun '14

commit 7f3563058d6b9215fe93116a71db9573e790e017 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 11 11:29:44 2014 -0400 Fix a 32-big conversion warning in 11970 fix --- src/common/sandbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 9581fac..05b91be 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -1352,7 +1352,7 @@ typedef struct cached_getaddrinfo_item_t { static unsigned cached_getaddrinfo_item_hash(const cached_getaddrinfo_item_t *item) { - return siphash24g(item->name, strlen(item->name)) + item->family; + return (unsigned)siphash24g(item->name, strlen(item->name)) + item->family; } static unsigned

1 0

[metrics-web/master] Disable relay search and remove it from navigation.
by karsten＠torproject.org 11 Jun '14

11 Jun '14

commit 18d63dd7f414fb18940b254da8c3d6b5a7f54a95 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jun 11 17:22:11 2014 +0200 Disable relay search and remove it from navigation. --- website/etc/web.xml | 11 - .../org/torproject/metrics/web/StatusServlet.java | 24 - .../metrics/web/status/RelaySearchServlet.java | 514 +------------------- website/web/WEB-INF/banner.jsp | 10 - website/web/WEB-INF/error.jsp | 4 - website/web/WEB-INF/relay-search.jsp | 66 +-- 6 files changed, 4 insertions(+), 625 deletions(-) diff --git a/website/etc/web.xml b/website/etc/web.xml index 519a9e6..a78cd28 100644 --- a/website/etc/web.xml +++ b/website/etc/web.xml @@ -138,17 +138,6 @@ </servlet-mapping> <servlet> - <servlet-name>Status</servlet-name> - <servlet-class> - org.torproject.metrics.web.StatusServlet - </servlet-class> - </servlet> - <servlet-mapping> - <servlet-name>Status</servlet-name> - <url-pattern>/status.html</url-pattern> - </servlet-mapping> - - <servlet> <servlet-name>RelaySearch</servlet-name> <servlet-class> org.torproject.metrics.web.status.RelaySearchServlet diff --git a/website/src/org/torproject/metrics/web/StatusServlet.java b/website/src/org/torproject/metrics/web/StatusServlet.java deleted file mode 100644 index ec831df..0000000 --- a/website/src/org/torproject/metrics/web/StatusServlet.java +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2011, 2012 The Tor Project - * See LICENSE for licensing information */ -package org.torproject.metrics.web; - -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -public class StatusServlet extends HttpServlet { - - private static final long serialVersionUID = -7249872082399236981L; - - public void doGet(HttpServletRequest request, - HttpServletResponse response) throws IOException, ServletException { - - /* Forward the request to the JSP that does all the hard work. */ - request.getRequestDispatcher("WEB-INF/status.jsp").forward(request, - response); - } -} - diff --git a/website/src/org/torproject/metrics/web/status/RelaySearchServlet.java b/website/src/org/torproject/metrics/web/status/RelaySearchServlet.java index 49b091e..aac7f10 100644 --- a/website/src/org/torproject/metrics/web/status/RelaySearchServlet.java +++ b/website/src/org/torproject/metrics/web/status/RelaySearchServlet.java @@ -3,531 +3,21 @@ package org.torproject.metrics.web.status; import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.math.BigInteger; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.Statement; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.SortedMap; -import java.util.SortedSet; -import java.util.TimeZone; -import java.util.TreeMap; -import java.util.TreeSet; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.regex.Pattern; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.sql.DataSource; -import org.apache.commons.codec.binary.Base64; - -/** - * Web page that allows users to search for relays in the descriptor - * archives. - * - * Possible search terms for testing: - * - gabelmoo - * - gabelmoo 2010-09 - * - gabelmoo 2010-09-18 - * - gabelmoo $F2044413DAC2E02E3D6BCF4735A19BCA1DE97281 - * - gabelmoo 80.190.246 - * - gabelmoo $F2044413DAC2E02E3D6BCF4735A19BCA1DE97281 80.190.246 - * - 5898549205 dc737cc9dca16af6 79.212.74.45 - * - 5898549205 dc737cc9dca16af6 - * - 80.190.246.100 - * - $F2044413DAC2E02E3D6BCF4735A19BCA1DE97281 - * - $F2044413DAC2E02E3D6BCF4735A19BCA1DE97281 80.190.246 - * - 58985492 - * - 58985492 79.212.74.45 - */ public class RelaySearchServlet extends HttpServlet { - private static final long serialVersionUID = -1772662230310611805L; - - private Pattern alphaNumDotDashDollarSpacePattern = - Pattern.compile("[A-Za-z0-9\\.\\-$ ]+"); - - private Pattern numPattern = Pattern.compile("[0-9]+"); - - private Pattern hexPattern = Pattern.compile("[A-Fa-f0-9]+"); - - private Pattern alphaNumPattern = Pattern.compile("[A-Za-z0-9]+"); - - private SimpleDateFormat dayFormat = new SimpleDateFormat("yyyy-MM-dd"); - - private SimpleDateFormat monthFormat = new SimpleDateFormat("yyyy-MM"); - - private SimpleDateFormat dateTimeFormat = - new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - private long minValidAfterMillis; - - private DataSource ds; - - private Logger logger; - - public void init() { - - /* Initialize logger. */ - this.logger = Logger.getLogger(RelaySearchServlet.class.toString()); - - /* Initialize date format parsers. */ - dayFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - monthFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - - /* Look up data source. */ - try { - Context cxt = new InitialContext(); - this.ds = (DataSource) cxt.lookup("java:comp/env/jdbc/tordir"); - this.logger.info("Successfully looked up data source."); - } catch (NamingException e) { - this.logger.log(Level.WARNING, "Could not look up data source", e); - } - - /* Look up first consensus in the database. */ - try { - long requestedConnection = System.currentTimeMillis(); - Connection conn = this.ds.getConnection(); - String query = "SELECT MIN(validafter) AS first FROM consensus"; - Statement statement = conn.createStatement(); - ResultSet rs = statement.executeQuery(query); - if (rs.next()) { - this.minValidAfterMillis = rs.getTimestamp(1).getTime(); - } - rs.close(); - statement.close(); - conn.close(); - this.logger.info("Returned a database connection to the pool " - + "after " + (System.currentTimeMillis() - - requestedConnection) + " millis."); - } catch (SQLException e) { - this.logger.log(Level.WARNING, "Could not look up first consensus " - + "valid-after time in the database.", e); - } - } + private static final long serialVersionUID = -1772662230310611806L; public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - /* Read search parameter. If we don't have a search parameter, we're - * done here. */ - String searchParameter = request.getParameter("search"); - if (searchParameter == null || searchParameter.length() == 0) { - request.getRequestDispatcher("WEB-INF/relay-search.jsp").forward( - request, response); - return; - } - - /* Parse search parameter to identify what nickname, fingerprint, - * and/or IP address to search for. A valid query contains no more - * than one identifier for each of the fields. As a special case, - * there are search terms consisting of 8 to 19 hex characters that - * can be either a nickname or a fingerprint. */ - String searchNickname = ""; - String searchFingerprint = ""; - String searchIPAddress = ""; - SortedSet<String> searchDays = new TreeSet<String>(); - SortedSet<String> searchMonths = new TreeSet<String>(); - SortedSet<Long> searchDayTimestamps = new TreeSet<Long>(); - SortedSet<Long> searchMonthTimestamps = new TreeSet<Long>(); - boolean validQuery = false; - - /* Only parse search parameter if it contains nothing else than - * alphanumeric characters, dots, and spaces. */ - if (alphaNumDotDashDollarSpacePattern.matcher(searchParameter). - matches()) { - SortedSet<String> searchTerms = new TreeSet<String>(); - if (searchParameter.trim().contains(" ")) { - String[] split = searchParameter.trim().split(" "); - for (int i = 0; i < split.length; i++) { - if (split[i].length() > 0) { - searchTerms.add(split[i]); - } - } - } else { - searchTerms.add(searchParameter.trim()); - } - - /* Parse each search term separately. */ - for (String searchTerm : searchTerms) { - - /* If the search term contains a dot, it can only be an IP - * address. */ - if (searchTerm.contains(".") && !searchTerm.startsWith(".")) { - String[] octets = searchTerm.split("\\."); - if (searchIPAddress.length() > 0 || octets.length < 2 || - octets.length > 4) { - validQuery = false; - break; - } - boolean invalidOctet = false; - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < octets.length; i++) { - if (!numPattern.matcher(octets[i]).matches() || - octets[i].length() > 3 || - Integer.parseInt(octets[i]) > 255) { - invalidOctet = true; - break; - } else { - sb.append("." + Integer.parseInt(octets[i])); - } - } - if (invalidOctet) { - validQuery = false; - break; - } - if (octets.length < 4) { - sb.append("."); - } - searchIPAddress = sb.toString().substring(1); - validQuery = true; - } - - /* If the search term contains hyphens, it must be a month or a - * day. */ - else if (searchTerm.contains("-") && - searchTerm.startsWith("20")) { - try { - if (searchTerm.length() == 10) { - searchDayTimestamps.add(dayFormat.parse(searchTerm). - getTime()); - searchDays.add(searchTerm); - } else if (searchTerm.length() == 7) { - searchMonthTimestamps.add(monthFormat.parse(searchTerm). - getTime()); - searchMonths.add(searchTerm); - } else { - validQuery = false; - break; - } - } catch (ParseException e) { - validQuery = false; - break; - } - } - - /* If the search term starts with a $ followed by 8 to 40 hex - * characters, it must be a fingerprint. */ - else if ((searchTerm.length() >= 9 && searchTerm.length() <= 41 && - searchTerm.startsWith("$") && - hexPattern.matcher(searchTerm.substring(1)).matches()) || - (searchTerm.length() > 19 && searchTerm.length() <= 40 && - !searchTerm.startsWith("$") && - hexPattern.matcher(searchTerm).matches())) { - if (searchFingerprint.length() > 0) { - validQuery = false; - break; - } - searchFingerprint = searchTerm.substring( - (searchTerm.startsWith("$") ? 1 : 0)); - validQuery = true; - } - - /* If the search term contains up to 19 alphanumerical characters, - * it must be a nickname. */ - else if (searchTerm.length() <= 19 && - alphaNumPattern.matcher(searchTerm).matches()) { - if (searchNickname.length() > 0) { - validQuery = false; - break; - } - searchNickname = searchTerm; - validQuery = true; - } - - /* We didn't recognize this search term. */ - else { - validQuery = false; - break; - } - } - } - - /* We only accept at most one month or three days, but not both, or - * people could accidentally keep the database busy. */ - if (searchDays.size() > 3 || searchMonths.size() > 1 || - (searchMonths.size() == 1 && searchDays.size() > 0)) { - validQuery = false; - } - - /* If the query is invalid, stop here. */ - if (!validQuery) { - request.setAttribute("invalidQuery", "Query is invalid."); - request.getRequestDispatcher("WEB-INF/relay-search.jsp"). - forward(request, response); - return; - } - - /* Look up last consensus in the database. */ - long maxValidAfterMillis = -1L; - try { - long requestedConnection = System.currentTimeMillis(); - Connection conn = this.ds.getConnection(); - String query = "SELECT MAX(validafter) AS last FROM consensus"; - Statement statement = conn.createStatement(); - ResultSet rs = statement.executeQuery(query); - if (rs.next()) { - maxValidAfterMillis = rs.getTimestamp(1).getTime(); - } - rs.close(); - statement.close(); - conn.close(); - this.logger.info("Returned a database connection to the pool " - + "after " + (System.currentTimeMillis() - - requestedConnection) + " millis."); - } catch (SQLException e) { - this.logger.log(Level.WARNING, "Could not look up last consensus " - + "valid-after time in the database.", e); - } - - /* Prepare a string that says what we're searching for. */ - List<String> recognizedSearchTerms = new ArrayList<String>(); - if (searchNickname.length() > 0) { - recognizedSearchTerms.add("nickname " + searchNickname + ""); - } - if (searchFingerprint.length() > 0) { - recognizedSearchTerms.add("fingerprint " + searchFingerprint - + ""); - } - if (searchIPAddress.length() > 0) { - recognizedSearchTerms.add("IP address " + searchIPAddress - + ""); - } - List<String> recognizedIntervals = new ArrayList<String>(); - for (String searchTerm : searchMonths) { - recognizedIntervals.add("in " + searchTerm + ""); - } - for (String searchTerm : searchDays) { - recognizedIntervals.add("on " + searchTerm + ""); - } - StringBuilder searchNoticeBuilder = new StringBuilder(); - if (maxValidAfterMillis > 0L) { - searchNoticeBuilder.append("Most recent consensus in database is " - + "from " + dateTimeFormat.format(maxValidAfterMillis) - + "."); - } - searchNoticeBuilder.append("Searching for relays with "); - if (recognizedSearchTerms.size() == 1) { - searchNoticeBuilder.append(recognizedSearchTerms.get(0)); - } else if (recognizedSearchTerms.size() == 2) { - searchNoticeBuilder.append(recognizedSearchTerms.get(0) + " and " - + recognizedSearchTerms.get(1)); - } else { - for (int i = 0; i < recognizedSearchTerms.size() - 1; i++) { - searchNoticeBuilder.append(recognizedSearchTerms.get(i) + ", "); - } - searchNoticeBuilder.append("and " + recognizedSearchTerms.get( - recognizedSearchTerms.size() - 1)); - } - if (recognizedIntervals.size() == 1) { - searchNoticeBuilder.append(" running " - + recognizedIntervals.get(0)); - } else if (recognizedIntervals.size() == 2) { - searchNoticeBuilder.append(" running " + recognizedIntervals.get(0) - + " and/or " + recognizedIntervals.get(1)); - } else if (recognizedIntervals.size() > 2) { - searchNoticeBuilder.append(" running "); - for (int i = 0; i < recognizedIntervals.size() - 1; i++) { - searchNoticeBuilder.append(recognizedIntervals.get(i) + ", "); - } - searchNoticeBuilder.append("and/or " + recognizedIntervals.get( - recognizedIntervals.size() - 1)); - } - searchNoticeBuilder.append(" ..."); - String searchNotice = searchNoticeBuilder.toString(); - request.setAttribute("searchNotice", searchNotice); - - /* Prepare the query string. */ - StringBuilder conditionBuilder = new StringBuilder(); - boolean addAnd = false; - if (searchNickname.length() > 0) { - conditionBuilder.append((addAnd ? "AND " : "") - + "LOWER(nickname) LIKE '" + searchNickname.toLowerCase() - + "%' "); - addAnd = true; - } - if (searchFingerprint.length() > 0) { - conditionBuilder.append((addAnd ? "AND " : "") - + "fingerprint LIKE '" + searchFingerprint.toLowerCase() - + "%' "); - addAnd = true; - } - if (searchIPAddress.length() > 0) { - conditionBuilder.append((addAnd ? "AND " : "") - + "address LIKE '" + searchIPAddress + "%' "); - addAnd = true; - } - List<String> timeIntervals = new ArrayList<String>(); - if (searchDayTimestamps.size() > 0 || - searchMonthTimestamps.size() > 0) { - StringBuilder timeIntervalBuilder = new StringBuilder(); - boolean addOr = false; - timeIntervalBuilder.append("AND ("); - for (long searchTimestamp : searchDayTimestamps) { - if (searchTimestamp < this.minValidAfterMillis) { - request.setAttribute("outsideInterval", "Returned search " - + "results may be incomplete, as our data only dates back " - + "to " + dateTimeFormat.format(this.minValidAfterMillis) - + ". Older archives are not available."); - } - timeIntervalBuilder.append((addOr ? "OR " : "") - + "(validafter >= '" - + dateTimeFormat.format(searchTimestamp) + "' AND " - + "validafter < '" + dateTimeFormat.format(searchTimestamp - + 24L * 60L * 60L * 1000L) + "') "); - addOr = true; - } - for (long searchTimestamp : searchMonthTimestamps) { - if (searchTimestamp < this.minValidAfterMillis) { - request.setAttribute("outsideInterval", "Returned search " - + "results may be incomplete, as our data only dates back " - + "to " + dateTimeFormat.format(this.minValidAfterMillis) - + ". Older archives are not available."); - } - Calendar firstOfNextMonth = Calendar.getInstance( - TimeZone.getTimeZone("UTC")); - firstOfNextMonth.setTimeInMillis(searchTimestamp); - firstOfNextMonth.add(Calendar.MONTH, 1); - timeIntervalBuilder.append((addOr ? "OR " : "") - + "(validafter >= '" - + dateTimeFormat.format(searchTimestamp) + "' AND " - + "validafter < '" + dateTimeFormat.format( - firstOfNextMonth.getTimeInMillis()) + "') "); - addOr = true; - } - timeIntervalBuilder.append(") "); - timeIntervals.add(timeIntervalBuilder.toString()); - } else { - timeIntervals.add("AND validafter >= '" - + dateTimeFormat.format(System.currentTimeMillis() - - 4L * 24L * 60L * 60L * 1000L) + "' "); - timeIntervals.add("AND validafter >= '" - + dateTimeFormat.format(System.currentTimeMillis() - - 30L * 24L * 60L * 60L * 1000L) + "' "); - } - List<String> queries = new ArrayList<String>(); - for (String timeInterval : timeIntervals) { - StringBuilder queryBuilder = new StringBuilder(); - queryBuilder.append("SELECT validafter, fingerprint, descriptor, " - + "rawdesc FROM statusentry WHERE validafter IN (SELECT " - + "validafter FROM statusentry WHERE "); - queryBuilder.append(conditionBuilder.toString()); - queryBuilder.append(timeInterval); - queryBuilder.append("ORDER BY validafter DESC LIMIT 31) AND "); - queryBuilder.append(conditionBuilder.toString()); - queryBuilder.append(timeInterval); - queries.add(queryBuilder.toString()); - } - - /* Actually execute the query. */ - long startedQuery = System.currentTimeMillis(); - SortedMap<String, SortedSet<String>> foundDescriptors = - new TreeMap<String, SortedSet<String>>( - Collections.reverseOrder()); - Map<String, String> rawValidAfterLines = - new HashMap<String, String>(); - Map<String, String> rawStatusEntries = new HashMap<String, String>(); - String query = null; - int matches = 0; - try { - long requestedConnection = System.currentTimeMillis(); - Connection conn = this.ds.getConnection(); - while (!queries.isEmpty()) { - query = queries.remove(0); - this.logger.info("Running query '" + query + "'."); - Statement statement = conn.createStatement(); - ResultSet rs = statement.executeQuery(query); - while (rs.next()) { - matches++; - String validAfter = rs.getTimestamp(1).toString(). - substring(0, 19); - String fingerprint = rs.getString(2); - if (!foundDescriptors.containsKey(validAfter)) { - foundDescriptors.put(validAfter, new TreeSet<String>()); - } - foundDescriptors.get(validAfter).add(validAfter + " " - + fingerprint); - if (!rawValidAfterLines.containsKey(validAfter)) { - rawValidAfterLines.put(validAfter, "<tt>valid-after " - + "<a href=\"https://exonerator.torproject.org/" - + "consensus?valid-after=" - + validAfter.replaceAll(":", "-").replaceAll(" ", "-") - + "\" target=\"_blank\">" + validAfter + "</a></tt> "); - } - byte[] rawStatusEntry = rs.getBytes(4); - String statusEntryLines = null; - try { - statusEntryLines = new String(rawStatusEntry, "US-ASCII"); - } catch (UnsupportedEncodingException e) { - /* This shouldn't happen, because we know that ASCII is - * supported. */ - } - StringBuilder rawStatusEntryBuilder = new StringBuilder(); - String[] lines = statusEntryLines.split("\n"); - for (String line : lines) { - if (line.startsWith("r ")) { - String[] parts = line.split(" "); - String descriptorBase64 = String.format("%040x", - new BigInteger(1, Base64.decodeBase64(parts[3] - + "=="))); - rawStatusEntryBuilder.append("<tt>r " + parts[1] + " " - + parts[2] + " <a href=\"" - + "https://exonerator.torproject.org/" - + "serverdesc?desc-id=" - + descriptorBase64 + "\" target=\"_blank\">" + parts[3] - + "</a> " + parts[4] + " " + parts[5] + " " + parts[6] - + " " + parts[7] + " " + parts[8] + "</tt> "); - } else { - rawStatusEntryBuilder.append("<tt>" + line + "</tt> "); - } - } - rawStatusEntries.put(validAfter + " " + fingerprint, - rawStatusEntryBuilder.toString()); - } - rs.close(); - statement.close(); - if (matches >= 31) { - queries.clear(); - } - } - conn.close(); - this.logger.info("Returned a database connection to the pool " - + "after " + (System.currentTimeMillis() - - requestedConnection) + " millis."); - } catch (SQLException e) { - - /* Tell the user we have a database problem. */ - response.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR, - "Database problem"); - return; - } - request.setAttribute("query", query); - request.setAttribute("queryTime", System.currentTimeMillis() - - startedQuery); - request.setAttribute("foundDescriptors", foundDescriptors); - request.setAttribute("rawValidAfterLines", rawValidAfterLines); - request.setAttribute("rawStatusEntries", rawStatusEntries); - request.setAttribute("matches", matches); - - /* We're done. Let the JSP do the rest. */ + /* Let the JSP display that we're out of service. */ request.getRequestDispatcher("WEB-INF/relay-search.jsp").forward( request, response); } diff --git a/website/web/WEB-INF/banner.jsp b/website/web/WEB-INF/banner.jsp index 5f6a43f..3acea7f 100644 --- a/website/web/WEB-INF/banner.jsp +++ b/website/web/WEB-INF/banner.jsp @@ -12,8 +12,6 @@ %>class="current"<%} else {%>href="/graphs.html"<%}%>>Graphs</a> <a <% if (currentPage.endsWith("research.jsp")) { %>class="current"<%} else {%>href="/research.html"<%}%>>Research</a> - <a <% if (currentPage.endsWith("status.jsp")) { - %>class="current"<%} else {%>href="/status.html"<%}%>>Status</a> <%if (currentPage.endsWith("graphs.jsp") || currentPage.endsWith("network.jsp") || currentPage.endsWith("bubbles.jsp") || @@ -34,14 +32,6 @@ %>class="current"<%} else {%>href="/performance.html"<%} %>>Performance</a> - <%} else if (currentPage.endsWith("status.jsp") || - currentPage.endsWith("relay-search.jsp")) { - %> - - <a <%if (currentPage.endsWith("relay-search.jsp")){ - %>class="current"<%} else {%>href="/relay-search.html"<%} - %>>Relay Search</a> - <%} else if (currentPage.endsWith("research.jsp") || currentPage.endsWith("data.jsp") || currentPage.endsWith("formats.jsp") || diff --git a/website/web/WEB-INF/error.jsp b/website/web/WEB-INF/error.jsp index 1626035..17ddee3 100644 --- a/website/web/WEB-INF/error.jsp +++ b/website/web/WEB-INF/error.jsp @@ -55,10 +55,6 @@ Maybe you find what you're looking for on our sitemap: <li><a href="tools.html">Tools</a></li> <li><a href="stats.html">Statistics</a></li> </ul></li> -<li><a href="status.html">Status</a> -<ul> -<li><a href="relay-search.html">Relay Search</a></li> -</ul></li> </ul> diff --git a/website/web/WEB-INF/relay-search.jsp b/website/web/WEB-INF/relay-search.jsp index e6eb630..90b7512 100644 --- a/website/web/WEB-INF/relay-search.jsp +++ b/website/web/WEB-INF/relay-search.jsp @@ -13,73 +13,11 @@ <%@ include file="banner.jsp"%> <div class="main-column"> <h2>Tor Metrics Portal: Relay Search</h2> - Notice: This service will be shut down - after June 10, 2014. Possible alternatives are + Sorry, this service has been shut down + on June 10, 2014. Possible alternatives are <a href="https://atlas.torproject.org">Atlas</a> and <a href="https://globe.torproject.org">Globe</a>. - Search for a relay in the relay descriptor archive by typing - (part of) a nickname, $-prefixed fingerprint, or IP - address and optionally a month (yyyy-mm) or up to three - days (yyyy-mm-dd) in the following search field and - clicking Search. The search will stop after 30 hits or, unless you - provide a month or a day, after parsing the last 30 days of relay - lists. - - <form action="relay-search.html"> - <table> - <tr> - <td><input type="text" name="search" - value="<c:out value="${param.search}"/>"></td> - <td><input type="submit" value="Search"></td> - </tr> - </table> - </form> - - <c:if test="${not empty invalidQuery}"> - Sorry, I didn't understand your query. Please provide a - nickname (e.g., "gabelmoo"), at least the first 8 hex characters - of a fingerprint prefixed by $ (e.g., "$F2044413"), or at least - the first two octets of an IPv4 address in dotted-decimal notation - (e.g., "80.190"). You can also provide at most three months or - days in ISO 8601 format (e.g., "2010-09" or "2010-09-17"). - </c:if> - <c:if test="${not empty outsideInterval}"> - ${outsideInterval} - </c:if> - <c:if test="${not empty searchNotice}"> - ${searchNotice} - </c:if> - <c:if test="${not empty query}"> -  - </c:if> - <c:if test="${not empty queryTime}"> - <c:forEach var="consensus" items="${foundDescriptors}"> - ${rawValidAfterLines[consensus.key]} - <c:forEach var="statusentry" items="${consensus.value}"> - ${rawStatusEntries[statusentry]} - </c:forEach> - - </c:forEach> - Found - <c:choose> - <c:when test="${matches > 30}"> - more than 30 relays (displaying only those in the last - consensuses) - </c:when> - <c:otherwise> - ${matches} relays - </c:otherwise> - </c:choose> - in <fmt:formatNumber value="${queryTime / 1000}" pattern="#.###"/> - seconds. - <c:if test="${queryTime > 10000}"> - In theory, search time should not exceed 10 seconds. The - query was '${query}'. If this or similar searches remain slow, - please <a href="mailto:tor-assistants@torproject.org">let us - know</a>! - </c:if> - </c:if> </div> </div> <div class="bottom" id="bottom">

1 0

[orbot/master] improve process id finding using android 'toolbox'
by n8fr8＠torproject.org 11 Jun '14

11 Jun '14

commit b4fa943fe924d669abd3d5a043eb702905ea1da4 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jun 11 07:51:22 2014 -0400 improve process id finding using android 'toolbox' --- src/org/torproject/android/service/TorService.java | 8 ++++++-- src/org/torproject/android/service/TorServiceConstants.java | 2 +- src/org/torproject/android/service/TorServiceUtils.java | 11 +++++++---- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index ce2d075..b43e5a2 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -966,9 +966,13 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - catch (Exception e) + catch (FileNotFoundException e) + { + logNotice("unable to get control port: no file yet"); + } + catch (IOException e) { - logException("unable to get control port",e); + logNotice("unable to get control port IOException"); } diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 74b2ef7..449e535 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -35,7 +35,7 @@ public interface TorServiceConstants { public final static String SHELL_CMD_CHMOD = "chmod"; public final static String SHELL_CMD_KILL = "kill -9"; public final static String SHELL_CMD_RM = "rm"; - public final static String SHELL_CMD_PS = "ps"; + public final static String SHELL_CMD_PS = "toolbox ps"; //public final static String SHELL_CMD_PIDOF = "pidof"; public final static String SHELL_CMD_LINK = "ln -s"; public final static String SHELL_CMD_CP = "cp"; diff --git a/src/org/torproject/android/service/TorServiceUtils.java b/src/org/torproject/android/service/TorServiceUtils.java index 70c5746..16a9a17 100644 --- a/src/org/torproject/android/service/TorServiceUtils.java +++ b/src/org/torproject/android/service/TorServiceUtils.java @@ -78,16 +78,19 @@ public class TorServiceUtils implements TorServiceConstants { Process procPs = null; - //String processKey = new File(command).getName(); + String processKey = new File(command).getName(); - procPs = r.exec(SHELL_CMD_PS); // this is the android ps <name> command + procPs = r.exec(SHELL_CMD_PS + ' ' + processKey); // this is the android ps <name> command BufferedReader reader = new BufferedReader(new InputStreamReader(procPs.getInputStream())); - String line = reader.readLine(); //read first line "headers" USER PID PPID etc + String line = null; while ((line = reader.readLine())!=null) { - if (line.contains(command)) + if (line.contains("PID")) + continue; + + if (line.contains(processKey)) { String[] lineParts = line.split("\\s+");

1 0

[orbot/master] ensure readers are closed; ensure socks settings are applied
by n8fr8＠torproject.org 11 Jun '14

11 Jun '14

commit aa8ff95e298b3278a944a03ac91a4a4acfe34e37 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jun 11 08:08:11 2014 -0400 ensure readers are closed; ensure socks settings are applied --- src/org/torproject/android/service/TorService.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index b43e5a2..49bd672 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -948,9 +948,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst private int getControlPort () { + File fileControl = new File(appBinHome,"control.txt"); + int result = -1; + try { - File fileControl = new File(appBinHome,"control.txt"); logNotice("Reading control port config file: " + fileControl.getAbsolutePath()); BufferedReader bufferedReader = new BufferedReader(new FileReader(fileControl)); @@ -961,22 +963,23 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (line != null) { String[] lineParts = line.split(":"); - return Integer.parseInt(lineParts[1]); + result = Integer.parseInt(lineParts[1]); } + bufferedReader.close(); + } catch (FileNotFoundException e) { - logNotice("unable to get control port: no file yet"); + logNotice("unable to get control port; no file at: " + fileControl.getAbsolutePath()); } catch (IOException e) { - logNotice("unable to get control port IOException"); + logNotice("unable to read control port config file"); } - - return -1; + return result; } private void checkAddressAndCountry () throws IOException @@ -2006,7 +2009,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst mBinder.updateConfiguration("SafeSocks", safeSocks ? "1" : "0", false); mBinder.updateConfiguration("TestSocks", "1", false); mBinder.updateConfiguration("WarnUnsafeSocks", "1", false); - + mBinder.saveConfiguration(); + } private void blockPlaintextPorts (String portList) throws RemoteException

1 0

[orbot/master] update to 14.0.2
by n8fr8＠torproject.org 11 Jun '14

11 Jun '14

commit b26b9d473951881fca5fa9a39fcacb5909c2c4bb Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jun 11 08:57:01 2014 -0400 update to 14.0.2 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2577b01..35ff58c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="14.0.1" - android:versionCode="101" + android:versionName="14.0.2" + android:versionCode="102" android:installLocation="auto" >

1 0

[orbot/master] reduce memory usage of polipo
by n8fr8＠torproject.org 11 Jun '14

11 Jun '14

commit 6ab9a7bff148483f408da98aa685a662c087f20b Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jun 11 11:26:10 2014 -0400 reduce memory usage of polipo --- res/raw/torpolipo.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/res/raw/torpolipo.conf b/res/raw/torpolipo.conf index 32850f6..5707c03 100644 --- a/res/raw/torpolipo.conf +++ b/res/raw/torpolipo.conf @@ -44,15 +44,15 @@ socksProxyType = socks5 # Uncomment this if you want Polipo to use a ridiculously small amount # of memory (a hundred C-64 worth or so): -# chunkHighMark = 819200 -# objectHighMark = 128 +chunkHighMark = 819200 +objectHighMark = 128 # Uncomment this if you've got plenty of memory: # chunkHighMark = 50331648 # objectHighMark = 16384 -chunkHighMark = 67108864 +#chunkHighMark = 67108864 ### On-disk data ### ************

1 0

[orbot/master] ensure polipo conf is updated; default to 9051 for ctrl port
by n8fr8＠torproject.org 11 Jun '14

11 Jun '14

commit c2be4ac15b4faeb65d00965ba2d5dc02b15a52cd Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jun 11 11:26:30 2014 -0400 ensure polipo conf is updated; default to 9051 for ctrl port --- .../android/service/TorResourceInstaller.java | 16 ++++++++++++++++ src/org/torproject/android/service/TorService.java | 7 ++++++- .../android/service/TorServiceConstants.java | 2 ++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/org/torproject/android/service/TorResourceInstaller.java b/src/org/torproject/android/service/TorResourceInstaller.java index b8cdf26..414c33c 100644 --- a/src/org/torproject/android/service/TorResourceInstaller.java +++ b/src/org/torproject/android/service/TorResourceInstaller.java @@ -138,6 +138,22 @@ public class TorResourceInstaller implements TorServiceConstants { return true; } + public boolean installPolipoConf () throws IOException, FileNotFoundException, TimeoutException + { + + InputStream is; + File outFile; + + Shell shell = Shell.startShell(new ArrayList<String>(),installFolder.getAbsolutePath()); + + is = context.getResources().openRawResource(R.raw.torpolipo); + outFile = new File(installFolder, POLIPOCONFIG_ASSET_KEY); + shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); + streamToFile(is,outFile, false, false); + + return true; + } + /* * Extract the Tor binary from the APK file using ZIP */ diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 49bd672..aac581b 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -561,6 +561,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst String extraLines = prefs.getString("pref_custom_torrc", null); boolean success = installer.installTorrc(extraLines); + success = installer.installPolipoConf(); if (version == null || (!version.equals(BINARY_TOR_VERSION)) || (!fileTor.exists())) { @@ -881,10 +882,14 @@ public class TorService extends Service implements TorServiceConstants, TorConst { int controlPort = getControlPort(); - logNotice( "Connecting to control port: " + controlPort); + + if (controlPort == -1 && i == maxAttempts) + controlPort = DEFAULT_CONTROL_PORT; if (controlPort != -1) { + logNotice( "Connecting to control port: " + controlPort); + torConnSocket = new Socket(IP_LOCALHOST, controlPort); torConnSocket.setSoTimeout(CONTROL_SOCKET_TIMEOUT); diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 449e535..58f59ab 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -88,5 +88,7 @@ public interface TorServiceConstants { //name of the iptables binary public final static String IPTABLES_ASSET_KEY = "xtables"; + public final static int DEFAULT_CONTROL_PORT = 9051; + }

1 0