April 2018 - tor-commits - lists.torproject.org

[metrics-web/master] Move connbidirect graph to Traffic category.
by karsten＠torproject.org 23 Apr '18

23 Apr '18

commit 3ef4b4b43a700814388e2230dd1ff8e015891a1f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Apr 23 12:06:51 2018 +0200 Move connbidirect graph to Traffic category. Implements #25896. --- src/main/resources/web/json/categories.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/web/json/categories.json b/src/main/resources/web/json/categories.json index 82cf1f4..06efe8f 100644 --- a/src/main/resources/web/json/categories.json +++ b/src/main/resources/web/json/categories.json @@ -49,6 +49,7 @@ "advbwdist-relay", "bwhist-flags", "dirbytes", + "connbidirect", "uncharted-data-flow" ] }, @@ -60,8 +61,7 @@ "description": "We use <a href=\"https://gitweb.torproject.org/torperf.git\">Torperf</a> and <a href=\"https://github.com/robgjansen/onionperf\">OnionPerf</a> to run performance measurements. Both work by fetching files of different sizes over Tor and measuring how long that takes.", "metrics": [ "torperf", - "torperf-failures", - "connbidirect" + "torperf-failures" ] }, {

1 0

[metrics-web/master] Update news.json to version 256 of doc/MetricsTimeline.
by karsten＠torproject.org 23 Apr '18

23 Apr '18

commit b0506154323fa2c73152afb147976e5e7611a853 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Apr 23 12:27:19 2018 +0200 Update news.json to version 256 of doc/MetricsTimeline. --- src/main/resources/web/json/news.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/main/resources/web/json/news.json b/src/main/resources/web/json/news.json index 8385b6e..32b0630 100644 --- a/src/main/resources/web/json/news.json +++ b/src/main/resources/web/json/news.json @@ -4597,6 +4597,21 @@ ] }, { + "start": "2018-04-16", + "ongoing": true, + "places": [ + "ru" + ], + "shortDescription": "Russia tries to block Telegram; disrupts many services on Amazon and Google cloud services.", + "description": "Russia tries to block Telegram; disrupts many services on Amazon and Google cloud services.", + "links": [ + { + "label": "article", + "target": "https://www.bleepingcomputer.com/news/government/russia-bans-18-million-ama…" + } + ] + }, + { "start": "2016-02-24", "places": [ "tm"

1 0

[metrics-web/master] Update Onionoo specification for version 6.0.
by karsten＠torproject.org 23 Apr '18

23 Apr '18

commit 1ec5da2243334c27b95cf7011ae428c78c1010e0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 17 15:04:58 2018 +0200 Update Onionoo specification for version 6.0. --- src/main/resources/web/jsps/onionoo.jsp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/resources/web/jsps/onionoo.jsp b/src/main/resources/web/jsps/onionoo.jsp index 540ca23..b225732 100644 --- a/src/main/resources/web/jsps/onionoo.jsp +++ b/src/main/resources/web/jsps/onionoo.jsp @@ -304,9 +304,8 @@ required fields on March 14, 2018. Added "version_status" field to details documents on April 6, 2018. <a href="#versions_5_2" class="anchor">#</a></li> <li><a id="versions_6_0"></a>6.0 -(scheduled, but not deployed yet!): Include all exit addresses in -"exit_addresses", regardless of whether they're used as OR addresses or not, to -be deployed after April 14, 2018. +Included all exit addresses in "exit_addresses", regardless of whether they are +used as onion-routing addresses or not on April 17, 2018. <a href="#versions_6_0" class="anchor">#</a></li> </ul> @@ -1053,7 +1052,7 @@ IPv6 hex characters are all lower-case. <li> <a id="details_relay_exit_addresses"></a> -exit_addresses +exit_addresses updated <code class="typeof">array of strings</code> optional <a href="#details_relay_exit_addresses" class="anchor">#</a> @@ -1061,9 +1060,9 @@ IPv6 hex characters are all lower-case. Array of IPv4 or IPv6 addresses that the relay used to exit to the Internet in the past 24 hours. IPv6 hex characters are all lower-case. -Only those addresses are listed that are different from onion-routing -addresses. Omitted if array is empty. +Changed on April 17, 2018 to include all exit addresses, regardless of whether +they are used as onion-routing addresses or not. </li>

1 0

[webwml/master] Update press clips
by hiro＠torproject.org 23 Apr '18

23 Apr '18

commit f20a59e8c65ed8cf704c39a95666735dc6472842 Author: hiro <hiro(a)torproject.org> Date: Mon Apr 23 10:51:23 2018 +0200 Update press clips --- press/en/press.wml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/press/en/press.wml b/press/en/press.wml index 7954c480..bf789dd9 100644 --- a/press/en/press.wml +++ b/press/en/press.wml @@ -50,6 +50,36 @@ some of the significant Tor-related stories that have popped up. </tr> </thead> +<tr style="background-color: #e5e5e5;"> +<td>2018 Apr 2</td> +<td>Digital Trends</td> +<td><a href="https://www.digitaltrends.com/home/alexa-voice-charity-donation/">Raise your voice for a good cause</a></td> +</tr> + +<tr style=""> +<td>2018 Mar 19</td> +<td>Mozilla</td> +<td><a href="https://medium.com/read-write-participate/welcoming-11-new-partners-in-the-…">11 New Partners in Quest for Internet Health</a></td> +</tr> + +<tr style="background-color: #e5e5e5;"> +<td>2018 Mar 15</td> +<td>Tom's Hardware</td> +<td><a href="https://www.tomshardware.com/news/turkey-blocks-protonmail-encrypted-email,…">Turkey Blocks ProtonMail E2E Encrypted Email Service</a></td> +</tr> + +<tr style=""> +<td>2018 Feb 22</td> +<td>CyberScoop</td> +<td><a href="https://www.cyberscoop.com/shari-steele-tor-director-resigns">Tor executive director Shari Steele to step down</a></td> +</tr> + +<tr style="background-color: #e5e5e5;"> +<td>2018 Feb 22</td> +<td>The Verge</td> +<td><a href="https://www.theverge.com/2018/2/22/17042544/tor-director-shari-steele-steps…">Tor director Shari Steele steps down</a></td> +</tr> + <tr style=""> <td>2018 Feb 3</td> <td>WIRED</td>

1 0

[tor/master] Add spell check to makefile to check for typos ticket#25024
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit 48092540d09d87d6385b227fe255921285371838 Author: Deepesh Pathak <deepshpathak(a)gmail.com> Date: Tue Jan 30 03:33:01 2018 +0530 Add spell check to makefile to check for typos ticket#25024 - Use misspell to check for typos in codebase - Add `make check-typos` to run the checks - Add `check-typos` to `make check` --- Makefile.am | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 04ca88a23..b892c69f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -97,7 +97,7 @@ doxygen: test: all $(top_builddir)/src/test/test -check-local: check-spaces check-changes +check-local: check-spaces check-changes check-typos need-chutney-path: @if test ! -d "$$CHUTNEY_PATH"; then \ @@ -217,6 +217,26 @@ check-logs: $(top_srcdir)/scripts/maint/checkLogs.pl \ $(top_srcdir)/src/*/*.[ch] | sort -n +.PHONY: check-typos +check-typos: + @if test -x "`which misspell 2>&1;true`"; then \ + echo "Checking for Typos ..."; \ + (`which misspell` \ + $(top_srcdir)/src/**/*.[ch] \ + $(top_srcdir)/doc \ + $(top_srcdir)/contrib \ + $(top_srcdir)/scripts \ + $(top_srcdir)/README \ + $(top_srcdir)/ChangeLog \ + $(top_srcdir)/INSTALL \ + $(top_srcdir)/ReleaseNotes \ + $(top_srcdir)/LICENSE); \ + else \ + echo "Tor can use misspell to check for typos."; \ + echo "It seems that you don't have misspell installed."; \ + echo "You can install the latest version of misspell here: https://github.com/client9/misspell#install"; \ + fi + .PHONY: check-changes check-changes: if USEPYTHON

1 0

[tor/master] Tweak changes file for 25024 to mention "check-typos"
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit fa21ac1de615e8a2f6f1b9fca3c3db96a9529197 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Apr 22 20:52:55 2018 -0400 Tweak changes file for 25024 to mention "check-typos" --- changes/ticket25024 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/changes/ticket25024 b/changes/ticket25024 index 0ff22d092..0e5069cf8 100644 --- a/changes/ticket25024 +++ b/changes/ticket25024 @@ -1,3 +1,4 @@ o Minor features (code quality): - - Add spell checking using misspell in Makefile. + - Add optional spell-checking for the Tor codebase, using the "misspell" + program. To use this feature, run "make check-typos". Closes ticket 25024.

1 0

[tor/master] add changes file and update check-typos in makefile
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit 72bfcb37f13a22780a0a771f17d3b5953703c815 Author: Deepesh Pathak <deepshpathak(a)gmail.com> Date: Sun Apr 15 01:05:49 2018 +0530 add changes file and update check-typos in makefile --- ChangeLog | 2 +- Makefile.am | 6 +++--- changes/ticket25024 | 3 +++ src/common/crypto_rsa.h | 2 +- src/or/protover.c | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 98da35a07..e0468e4e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -875,7 +875,7 @@ Changes in version 0.3.3.2-alpha - 2018-02-10 would call the Rust implementation of protover_get_supported_protocols(). This was due to the C version returning a static string, whereas the Rust version newly allocated - a CString to pass accross the FFI boundary. Consequently, the C + a CString to pass across the FFI boundary. Consequently, the C code was not expecting to need to free() what it was given. Fixes bug 25127; bugfix on 0.3.2.1-alpha. diff --git a/Makefile.am b/Makefile.am index b892c69f7..cccad6c5e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -97,7 +97,7 @@ doxygen: test: all $(top_builddir)/src/test/test -check-local: check-spaces check-changes check-typos +check-local: check-spaces check-changes need-chutney-path: @if test ! -d "$$CHUTNEY_PATH"; then \ @@ -221,8 +221,8 @@ check-logs: check-typos: @if test -x "`which misspell 2>&1;true`"; then \ echo "Checking for Typos ..."; \ - (`which misspell` \ - $(top_srcdir)/src/**/*.[ch] \ + (misspell \ + $(top_srcdir)/src/[^e]*/*.[ch] \ $(top_srcdir)/doc \ $(top_srcdir)/contrib \ $(top_srcdir)/scripts \ diff --git a/changes/ticket25024 b/changes/ticket25024 new file mode 100644 index 000000000..0ff22d092 --- /dev/null +++ b/changes/ticket25024 @@ -0,0 +1,3 @@ + o Minor features (code quality): + - Add spell checking using misspell in Makefile. + Closes ticket 25024. diff --git a/src/common/crypto_rsa.h b/src/common/crypto_rsa.h index 2f5442a5d..e95208931 100644 --- a/src/common/crypto_rsa.h +++ b/src/common/crypto_rsa.h @@ -35,7 +35,7 @@ /** A public key, or a public/private key-pair. */ typedef struct crypto_pk_t crypto_pk_t; -/* RSA enviroment setup */ +/* RSA environment setup */ MOCK_DECL(crypto_pk_t *,crypto_pk_new,(void)); void crypto_pk_free_(crypto_pk_t *env); #define crypto_pk_free(pk) FREE_AND_NULL(crypto_pk_t, crypto_pk_free_, (pk)) diff --git a/src/or/protover.c b/src/or/protover.c index 6532f09c2..18382ba7c 100644 --- a/src/or/protover.c +++ b/src/or/protover.c @@ -715,7 +715,7 @@ protover_all_supported(const char *s, char **missing_out) versions->high = i; } /* If the last one to be unsupported is one less than the current - * one, we're in a continous range, so set the high field. */ + * one, we're in a continuous range, so set the high field. */ if ((versions->high && versions->high == i - 1) || /* Similarly, if the last high wasn't set and we're currently * one higher than the low, add current index as the highest

1 0

[tor/master] Merge branch 'ticket25024_squashed'
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit 915791bc483ca3c8adb63d211afd52b3f98007a9 Merge: 1ba9b7e01 fa21ac1de Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Apr 22 20:53:04 2018 -0400 Merge branch 'ticket25024_squashed' ChangeLog | 2 +- Makefile.am | 20 ++++++++++++++++++++ changes/ticket25024 | 4 ++++ src/common/crypto_rsa.h | 2 +- src/or/protover.c | 2 +- 5 files changed, 27 insertions(+), 3 deletions(-)

1 0

[tor/master] Bug 25400: Make CIRC_BW event properly total everything on a circ.
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit dfa6808f57e5856edd4e25a957f3f06707264199 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Feb 12 09:11:14 2018 +0000 Bug 25400: Make CIRC_BW event properly total everything on a circ. --- changes/bug25400 | 5 +++++ src/or/command.c | 14 ++++++++++++++ src/or/connection.c | 22 +--------------------- src/or/control.c | 8 -------- src/or/relay.c | 9 +++++++++ 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/changes/bug25400 b/changes/bug25400 new file mode 100644 index 000000000..cee7ea83b --- /dev/null +++ b/changes/bug25400 @@ -0,0 +1,5 @@ + o Minor bugfix (controler): + - Make CIRC_BW event reflect the total of all data sent on a circuit, + including padding and dropped cells. Also fix a mis-counting bug + when STREAM_BW events were enabled. Fixes bug 25400; bugfix on + 0.2.5.2-alpha. diff --git a/src/or/command.c b/src/or/command.c index 4f99462f3..18cbbca25 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -495,6 +495,20 @@ command_process_relay_cell(cell_t *cell, channel_t *chan) /* if we're a relay and treating connections with recent local * traffic better, then this is one of them. */ channel_timestamp_client(chan); + + /* Count all circuit bytes here for control port accuracy. We want + * to count even invalid/dropped relay cells, hence counting + * before the recognized check and the connection_edge_process_relay + * cell checks. + */ + origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(circ); + + /* Count the payload bytes only. We don't care about cell headers */ + if (PREDICT_LIKELY(UINT32_MAX - ocirc->n_read_circ_bw > + CELL_PAYLOAD_SIZE)) + ocirc->n_read_circ_bw += (int)CELL_PAYLOAD_SIZE; + else + ocirc->n_read_circ_bw = UINT32_MAX; } if (!CIRCUIT_IS_ORIGIN(circ) && diff --git a/src/or/connection.c b/src/or/connection.c index 957398985..e8ecf0db9 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -3479,25 +3479,15 @@ connection_buf_read_from_socket(connection_t *conn, ssize_t *max_to_read, /* change *max_to_read */ *max_to_read = at_most - n_read; - /* Update edge_conn->n_read and ocirc->n_read_circ_bw */ + /* Update edge_conn->n_read */ if (conn->type == CONN_TYPE_AP) { edge_connection_t *edge_conn = TO_EDGE_CONN(conn); - circuit_t *circ = circuit_get_by_edge_conn(edge_conn); - origin_circuit_t *ocirc; /* Check for overflow: */ if (PREDICT_LIKELY(UINT32_MAX - edge_conn->n_read > n_read)) edge_conn->n_read += (int)n_read; else edge_conn->n_read = UINT32_MAX; - - if (circ && CIRCUIT_IS_ORIGIN(circ)) { - ocirc = TO_ORIGIN_CIRCUIT(circ); - if (PREDICT_LIKELY(UINT32_MAX - ocirc->n_read_circ_bw > n_read)) - ocirc->n_read_circ_bw += (int)n_read; - else - ocirc->n_read_circ_bw = UINT32_MAX; - } } /* If CONN_BW events are enabled, update conn->n_read_conn_bw for @@ -3815,22 +3805,12 @@ connection_handle_write_impl(connection_t *conn, int force) if (n_written && conn->type == CONN_TYPE_AP) { edge_connection_t *edge_conn = TO_EDGE_CONN(conn); - circuit_t *circ = circuit_get_by_edge_conn(edge_conn); - origin_circuit_t *ocirc; /* Check for overflow: */ if (PREDICT_LIKELY(UINT32_MAX - edge_conn->n_written > n_written)) edge_conn->n_written += (int)n_written; else edge_conn->n_written = UINT32_MAX; - - if (circ && CIRCUIT_IS_ORIGIN(circ)) { - ocirc = TO_ORIGIN_CIRCUIT(circ); - if (PREDICT_LIKELY(UINT32_MAX - ocirc->n_written_circ_bw > n_written)) - ocirc->n_written_circ_bw += (int)n_written; - else - ocirc->n_written_circ_bw = UINT32_MAX; - } } /* If CONN_BW events are enabled, update conn->n_written_conn_bw for diff --git a/src/or/control.c b/src/or/control.c index 0539ddaca..016fd46a4 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -5800,8 +5800,6 @@ control_event_or_conn_status(or_connection_t *conn, or_conn_status_event_t tp, int control_event_stream_bandwidth(edge_connection_t *edge_conn) { - circuit_t *circ; - origin_circuit_t *ocirc; struct timeval now; char tbuf[ISO_TIME_USEC_LEN+1]; if (EVENT_IS_INTERESTING(EVENT_STREAM_BANDWIDTH_USED)) { @@ -5817,12 +5815,6 @@ control_event_stream_bandwidth(edge_connection_t *edge_conn) (unsigned long)edge_conn->n_written, tbuf); - circ = circuit_get_by_edge_conn(edge_conn); - if (circ && CIRCUIT_IS_ORIGIN(circ)) { - ocirc = TO_ORIGIN_CIRCUIT(circ); - ocirc->n_read_circ_bw += edge_conn->n_read; - ocirc->n_written_circ_bw += edge_conn->n_written; - } edge_conn->n_written = edge_conn->n_read = 0; } diff --git a/src/or/relay.c b/src/or/relay.c index 72a902d8b..d43720478 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -371,6 +371,15 @@ circuit_package_relay_cell(cell_t *cell, circuit_t *circ, } relay_encrypt_cell_outbound(cell, TO_ORIGIN_CIRCUIT(circ), layer_hint); + + /* Update circ written totals for control port */ + origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(circ); + if (PREDICT_LIKELY(UINT32_MAX - ocirc->n_written_circ_bw + > CELL_PAYLOAD_SIZE)) + ocirc->n_written_circ_bw += (int)CELL_PAYLOAD_SIZE; + else + ocirc->n_written_circ_bw = UINT32_MAX; + } else { /* incoming cell */ if (CIRCUIT_IS_ORIGIN(circ)) { /* We should never package an _incoming_ cell from the circuit

1 0

[tor/master] Helper function to add u32 without overflow.
by nickm＠torproject.org 23 Apr '18

23 Apr '18

commit 0e06a9c3e76620881db95718f60441ce7de0f3c9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 2 07:12:15 2018 +0000 Helper function to add u32 without overflow. --- src/common/util.c | 13 +++++++++++++ src/common/util.h | 2 ++ src/test/test_util.c | 18 ++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/src/common/util.c b/src/common/util.c index 041e7aee3..b14b6f397 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -572,6 +572,19 @@ add_laplace_noise(int64_t signal_, double random_, double delta_f, return signal_ + noise; } +/* Helper: safely add two uint32_t's, capping at UINT32_MAX rather + * than overflow */ +uint32_t +tor_add_u32_nowrap(uint32_t a, uint32_t b) +{ + /* a+b > UINT32_MAX check, without overflow */ + if (PREDICT_UNLIKELY(a > UINT32_MAX - b)) { + return UINT32_MAX; + } else { + return a+b; + } +} + /* Helper: return greatest common divisor of a,b */ static uint64_t gcd64(uint64_t a, uint64_t b) diff --git a/src/common/util.h b/src/common/util.h index ae27e5f01..c0d20e1b2 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -176,6 +176,8 @@ int n_bits_set_u8(uint8_t v); int64_t clamp_double_to_int64(double number); void simplify_fraction64(uint64_t *numer, uint64_t *denom); +uint32_t tor_add_u32_nowrap(uint32_t a, uint32_t b); + /* Compute the CEIL of a divided by b, for nonnegative a * and positive b. Works on integer types only. Not defined if a+(b-1) * can overflow. */ diff --git a/src/test/test_util.c b/src/test/test_util.c index 24b43c899..350273bf4 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -6050,6 +6050,23 @@ test_util_monotonic_time_add_msec(void *arg) } static void +test_util_nowrap_math(void *arg) +{ + (void)arg; + + tt_u64_op(0, OP_EQ, tor_add_u32_nowrap(0, 0)); + tt_u64_op(1, OP_EQ, tor_add_u32_nowrap(0, 1)); + tt_u64_op(1, OP_EQ, tor_add_u32_nowrap(1, 0)); + tt_u64_op(4, OP_EQ, tor_add_u32_nowrap(2, 2)); + tt_u64_op(UINT32_MAX, OP_EQ, tor_add_u32_nowrap(UINT32_MAX-1, 2)); + tt_u64_op(UINT32_MAX, OP_EQ, tor_add_u32_nowrap(2, UINT32_MAX-1)); + tt_u64_op(UINT32_MAX, OP_EQ, tor_add_u32_nowrap(UINT32_MAX, UINT32_MAX)); + + done: + ; +} + +static void test_util_htonll(void *arg) { (void)arg; @@ -6243,6 +6260,7 @@ struct testcase_t util_tests[] = { UTIL_TEST(listdir, 0), UTIL_TEST(parent_dir, 0), UTIL_TEST(ftruncate, 0), + UTIL_TEST(nowrap_math, 0), UTIL_TEST(num_cpus, 0), UTIL_TEST_WIN_ONLY(load_win_lib, 0), UTIL_TEST_NO_WIN(exit_status, 0),

1 0