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

[tor/master] Merge remote-tracking branch 'dgoulet/ticket19254_032_01'
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit 962b0b849bf0c2fcca387e334985b349a255de0a Merge: e88fb4f4f 2be4f793e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 15 11:52:10 2017 -0400 Merge remote-tracking branch 'dgoulet/ticket19254_032_01' changes/feature19254 | 3 +++ src/or/control.c | 28 ++++++++++++++++++++++------ 2 files changed, 25 insertions(+), 6 deletions(-)

1 0

[torspec/master] Merge remote-tracking branch 'dgoulet/ticket19254_01'
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit 1bf2c16fbd351d9313dd4db12c39aa849a1229e6 Merge: eb7c64b 00b9daf Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 15 11:53:01 2017 -0400 Merge remote-tracking branch 'dgoulet/ticket19254_01' control-spec.txt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)

1 0

[torspec/master] Add timestamps to the CIRC_BW and STREAM_BW events.
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit 00b9dafcf306f61d527ae6bdb9b3e842aa64a1c3 Author: Donncha O'Cearbhaill <donncha(a)donncha.is> Date: Fri Jun 3 11:01:58 2016 +0100 Add timestamps to the CIRC_BW and STREAM_BW events. Resolves ticket 19254. --- control-spec.txt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 275221c..9f99a0d 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -2635,9 +2635,11 @@ 4.1.13. Bandwidth used on an application stream The syntax is: - "650" SP "STREAM_BW" SP StreamID SP BytesWritten SP BytesRead CRLF + "650" SP "STREAM_BW" SP StreamID SP BytesWritten SP BytesRead SP + Time CRLF BytesWritten = 1*DIGIT BytesRead = 1*DIGIT + Time = ISOTime2Frac BytesWritten and BytesRead are the number of bytes written and read by the application since the last STREAM_BW event on this stream. @@ -2646,6 +2648,9 @@ that the application *wrote* the byte. That's why the order of "written" vs "read" is opposite for stream_bw events compared to bw events. + The Time field is provided only in versions 0.3.2.1-alpha and later. It + records when Tor created the bandwidth event. + These events are generated about once per second per stream; no events are generated for streams that have not written or read. These events apply only to streams entering Tor (such as on a SOCKSPort, TransPort, @@ -2838,14 +2843,18 @@ The syntax is: "650" SP "CIRC_BW" SP "ID=" CircuitID SP "READ=" BytesRead SP - "WRITTEN=" BytesWritten CRLF + "WRITTEN=" BytesWritten SP "TIME=" Time CRLF BytesRead = 1*DIGIT BytesWritten = 1*DIGIT + Time = ISOTime2Frac BytesRead and BytesWritten are the number of bytes read and written by all applications with streams attached to this circuit since the last CIRC_BW event. + The Time field is provided only in versions 0.3.2.1-alpha and later. It + records when Tor created the bandwidth event. + These events are generated about once per second per circuit; no events are generated for circuits that had no attached stream writing or reading.

1 0

[tor/master] Make NETINFO clock skew detection work on clients
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit e31a7be161903b3fbe182224470d86c0814c988d Author: Taylor Yu <catalyst(a)torproject.org> Date: Thu Sep 14 20:43:52 2017 -0500 Make NETINFO clock skew detection work on clients An unnecessary routerlist check in the NETINFO clock skew detection in channel_tls_process_netinfo_cell() was preventing clients from reporting NETINFO clock skew to controllers. --- changes/bug23532 | 5 +++++ src/or/channeltls.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug23532 b/changes/bug23532 new file mode 100644 index 000000000..3eb2345ce --- /dev/null +++ b/changes/bug23532 @@ -0,0 +1,5 @@ + o Minor bugfixes (usability, control port): + - Stop making an unnecessary routerlist check in NETINFO clock + skew detection; this was preventing clients from reporting + NETINFO clock skew to controllers. Fixes bug 23532; bugfix on + 0.2.4.4-alpha. diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 1db395fdd..fe1e7e91d 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1827,8 +1827,9 @@ channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *chan) /** Warn when we get a netinfo skew with at least this value. */ #define NETINFO_NOTICE_SKEW 3600 if (labs(apparent_skew) > NETINFO_NOTICE_SKEW && - router_get_by_id_digest(chan->conn->identity_digest)) { - int trusted = router_digest_is_trusted_dir(chan->conn->identity_digest); + (started_here || + connection_or_digest_is_known_relay(identity_digest))) { + int trusted = router_digest_is_trusted_dir(identity_digest); clock_skew_warning(TO_CONN(chan->conn), apparent_skew, trusted, LD_GENERAL, "NETINFO cell", "OR"); }

1 0

[tor/master] Refactor channeltls.c lightly
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit 37fed742d15025a96c1a0f7df6a686fdc97b5f8f Author: Taylor Yu <catalyst(a)torproject.org> Date: Fri Sep 15 08:59:00 2017 -0500 Refactor channeltls.c lightly Refactor some repetitive deep indirections in several functions in channeltls.c into local variables. --- src/or/channeltls.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 4ccd3b5fb..1db395fdd 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1680,6 +1680,8 @@ channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *chan) long apparent_skew = 0; tor_addr_t my_apparent_addr = TOR_ADDR_NULL; + int started_here = 0; + const char *identity_digest = NULL; tor_assert(cell); tor_assert(chan); @@ -1699,10 +1701,12 @@ channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *chan) } tor_assert(chan->conn->handshake_state && chan->conn->handshake_state->received_versions); + started_here = connection_or_nonopen_was_started_here(chan->conn); + identity_digest = chan->conn->identity_digest; if (chan->conn->base_.state == OR_CONN_STATE_OR_HANDSHAKING_V3) { tor_assert(chan->conn->link_proto >= 3); - if (chan->conn->handshake_state->started_here) { + if (started_here) { if (!(chan->conn->handshake_state->authenticated)) { log_fn(LOG_PROTOCOL_WARN, LD_OR, "Got a NETINFO cell from server, " @@ -1813,7 +1817,7 @@ channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *chan) "they will not consider this connection canonical. They " "think we are at %s, but we think its %s.", safe_str(descr), - safe_str(hex_str(chan->conn->identity_digest, DIGEST_LEN)), + safe_str(hex_str(identity_digest, DIGEST_LEN)), safe_str(tor_addr_is_null(&my_apparent_addr) ? "<none>" : fmt_and_decorate_addr(&my_apparent_addr)), safe_str(fmt_addr32(me->addr))); @@ -1857,8 +1861,7 @@ channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *chan) safe_str_client(chan->conn->base_.address), chan->conn->base_.port, (int)(chan->conn->link_proto), - hex_str(TLS_CHAN_TO_BASE(chan)->identity_digest, - DIGEST_LEN), + hex_str(identity_digest, DIGEST_LEN), tor_addr_is_null(&my_apparent_addr) ? "<none>" : fmt_and_decorate_addr(&my_apparent_addr)); } @@ -1929,7 +1932,7 @@ channel_tls_process_certs_cell(var_cell_t *cell, channel_tls_t *chan) int n_certs, i; certs_cell_t *cc = NULL; - int send_netinfo = 0; + int send_netinfo = 0, started_here = 0; memset(x509_certs, 0, sizeof(x509_certs)); memset(ed_certs, 0, sizeof(ed_certs)); @@ -1947,6 +1950,11 @@ channel_tls_process_certs_cell(var_cell_t *cell, channel_tls_t *chan) goto err; \ } while (0) + /* Can't use connection_or_nonopen_was_started_here(); its conn->tls + * check looks like it breaks + * test_link_handshake_recv_certs_ok_server(). */ + started_here = chan->conn->handshake_state->started_here; + if (chan->conn->base_.state != OR_CONN_STATE_OR_HANDSHAKING_V3) ERR("We're not doing a v3 handshake!"); if (chan->conn->link_proto < 3) @@ -2060,7 +2068,7 @@ channel_tls_process_certs_cell(var_cell_t *cell, channel_tls_t *chan) /* Note that this warns more loudly about time and validity if we were * _trying_ to connect to an authority, not necessarily if we _did_ connect * to one. */ - if (chan->conn->handshake_state->started_here && + if (started_here && router_digest_is_trusted_dir(TLS_CHAN_TO_BASE(chan)->identity_digest)) severity = LOG_WARN; else @@ -2078,7 +2086,7 @@ channel_tls_process_certs_cell(var_cell_t *cell, channel_tls_t *chan) if (!checked_rsa_id) ERR("Invalid certificate chain!"); - if (chan->conn->handshake_state->started_here) { + if (started_here) { /* No more information is needed. */ chan->conn->handshake_state->authenticated = 1;

1 0

[tor/master] Merge remote-tracking branch 'catalyst-oniongit/bug23532'
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit e88fb4f4f8345a2067dbb2af0173002bab4637ce Merge: 199f13755 e31a7be16 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 15 11:17:18 2017 -0400 Merge remote-tracking branch 'catalyst-oniongit/bug23532' changes/bug23532 | 5 +++++ src/or/channeltls.c | 27 ++++++++++++++++++--------- 2 files changed, 23 insertions(+), 9 deletions(-)

1 0

[onionoo/master] Update to metrics-lib 2.1.0 and to Java 8.
by karsten＠torproject.org 15 Sep '17

15 Sep '17

commit dac49478131731961bebde0aadf092c5300f956a Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 15 11:32:30 2017 +0200 Update to metrics-lib 2.1.0 and to Java 8. --- CHANGELOG.md | 6 ++++++ build.xml | 2 +- src/build | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf75ee8..82dcbee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# Changes in version 4.1-1.?.? - 2017-??-?? + + * Major changes + - Update to metrics-lib 2.1.0 and to Java 8. + + # Changes in version 4.1-1.4.1 - 2017-08-31 * Medium changes diff --git a/build.xml b/build.xml index b807e18..1b82b14 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="onionoo.protocol.version" value="4.1"/> <property name="release.version" value="${onionoo.protocol.version}-1.4.1-dev"/> - <property name="metricslibversion" value="2.0.0"/> + <property name="metricslibversion" value="2.1.0"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" value="onionoo-${release.version}.war"/> diff --git a/src/build b/src/build index b491c84..a64b94a 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit b491c845ab81027d2f29fe541f8303ff151d3d0b +Subproject commit a64b94a635e5396266d5c5b5cf88850b9f4b6a24

1 0

[onionoo/master] Prepare for 4.1-1.5.0 release.
by karsten＠torproject.org 15 Sep '17

15 Sep '17

commit 45124399017050adb10b7be3f935317137459338 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 15 11:36:28 2017 +0200 Prepare for 4.1-1.5.0 release. --- CHANGELOG.md | 2 +- build.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82dcbee..ad009ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 4.1-1.?.? - 2017-??-?? +# Changes in version 4.1-1.5.0 - 2017-09-15 * Major changes - Update to metrics-lib 2.1.0 and to Java 8. diff --git a/build.xml b/build.xml index 1b82b14..210dad6 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="4.1"/> <property name="release.version" - value="${onionoo.protocol.version}-1.4.1-dev"/> + value="${onionoo.protocol.version}-1.5.0"/> <property name="metricslibversion" value="2.1.0"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/master] Bump version to 4.1-1.5.0-dev.
by karsten＠torproject.org 15 Sep '17

15 Sep '17

commit 3b1bcd1387b59069328b5062b5069f136bb10f77 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 15 16:10:44 2017 +0200 Bump version to 4.1-1.5.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 210dad6..c8a4173 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="4.1"/> <property name="release.version" - value="${onionoo.protocol.version}-1.5.0"/> + value="${onionoo.protocol.version}-1.5.0-dev"/> <property name="metricslibversion" value="2.1.0"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[collector/master] Update to metrics-lib 2.1.0 and to Java 8.
by karsten＠torproject.org 15 Sep '17

15 Sep '17

commit e6d14962867f02408c704edac078ca9c512a4d21 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 15 11:32:12 2017 +0200 Update to metrics-lib 2.1.0 and to Java 8. --- CHANGELOG.md | 3 +++ build.xml | 2 +- src/build | 2 +- src/main/java/org/torproject/collector/index/CreateIndexJson.java | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ada02ae..7d70bbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changes in version 1.?.? - 2017-??-?? + * Major changes + - Update to metrics-lib 2.1.0 and to Java 8. + * Medium changes - When synchronizing descriptors from another CollecTor instance, keep annotations provided by the descriptor and only add the diff --git a/build.xml b/build.xml index 279cd2f..3e162f0 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="release.version" value="1.2.1-dev" /> <property name="project-main-class" value="org.torproject.collector.Main" /> <property name="name" value="collector"/> - <property name="metricslibversion" value="2.0.0" /> + <property name="metricslibversion" value="2.1.0" /> <property name="jarincludes" value="collector.properties logback.xml" /> <patternset id="runtime" > diff --git a/src/build b/src/build index b491c84..a64b94a 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit b491c845ab81027d2f29fe541f8303ff151d3d0b +Subproject commit a64b94a635e5396266d5c5b5cf88850b9f4b6a24 diff --git a/src/main/java/org/torproject/collector/index/CreateIndexJson.java b/src/main/java/org/torproject/collector/index/CreateIndexJson.java index 4b55d51..e10109b 100644 --- a/src/main/java/org/torproject/collector/index/CreateIndexJson.java +++ b/src/main/java/org/torproject/collector/index/CreateIndexJson.java @@ -9,8 +9,8 @@ import org.torproject.collector.conf.Key; import org.torproject.collector.cron.CollecTorMain; import org.torproject.descriptor.index.DirectoryNode; import org.torproject.descriptor.index.FileNode; -import org.torproject.descriptor.index.FileType; import org.torproject.descriptor.index.IndexNode; +import org.torproject.descriptor.internal.FileType; import com.google.gson.Gson; import com.google.gson.GsonBuilder;

1 0