July 2020 - tor-commits - lists.torproject.org

[torspec/master] Merge branch 'neel/bug28279'
by dgoulet＠torproject.org 01 Jul '20

01 Jul '20

commit 211ffbc224e9b86e1fdaf30c480b04b20f25cd84 Merge: 7479cd9 05101ef Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jul 1 12:37:47 2020 -0400 Merge branch 'neel/bug28279' control-spec.txt | 10 ++++++++++ 1 file changed, 10 insertions(+)

1 0

[tor/master] Add GETINFO "rephist/{tap, ntor}/onion_handshakes_{assigned/requested}" test
by dgoulet＠torproject.org 01 Jul '20

01 Jul '20

commit 4173876bc4a81c471be53b5c93dacf2566b52fb0 Author: Neel Chauhan <neel(a)neelc.org> Date: Wed May 27 21:49:22 2020 -0700 Add GETINFO "rephist/{tap,ntor}/onion_handshakes_{assigned/requested}" test --- src/test/test_controller.c | 87 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/src/test/test_controller.c b/src/test/test_controller.c index a69ec17db..f6dccf3bf 100644 --- a/src/test/test_controller.c +++ b/src/test/test_controller.c @@ -19,6 +19,7 @@ #include "feature/rend/rendservice.h" #include "feature/nodelist/authcert.h" #include "feature/nodelist/nodelist.h" +#include "feature/stats/rephist.h" #include "test/test.h" #include "test/test_helpers.h" #include "lib/net/resolve.h" @@ -2112,6 +2113,91 @@ test_control_getconf(void *arg) smartlist_free(reply_strs); } +static int +mock_rep_hist_get_circuit_handshake(uint16_t type) +{ + int ret; + + switch (type) { + case ONION_HANDSHAKE_TYPE_NTOR: + ret = 80; + break; + case ONION_HANDSHAKE_TYPE_TAP: + ret = 86; + break; + default: + ret = 0; + break; + } + + return ret; +} + +static void +test_rep_hist(void *arg) +{ + /* We just need one of these to pass, it doesn't matter what's in it */ + control_connection_t dummy; + /* Get results out */ + char *answer = NULL; + const char *errmsg = NULL; + + (void) arg; + + /* We need these for returning the (mock) rephist. */ + MOCK(rep_hist_get_circuit_handshake_requested, + mock_rep_hist_get_circuit_handshake); + MOCK(rep_hist_get_circuit_handshake_assigned, + mock_rep_hist_get_circuit_handshake); + + /* NTor tests */ + getinfo_helper_rephist(&dummy, "stats/ntor/requested", + &answer, &errmsg); + tt_ptr_op(answer, OP_NE, NULL); + tt_ptr_op(errmsg, OP_EQ, NULL); + tt_str_op(answer, OP_EQ, "80"); + tor_free(answer); + errmsg = NULL; + + getinfo_helper_rephist(&dummy, "stats/ntor/assigned", + &answer, &errmsg); + tt_ptr_op(answer, OP_NE, NULL); + tt_ptr_op(errmsg, OP_EQ, NULL); + tt_str_op(answer, OP_EQ, "80"); + tor_free(answer); + errmsg = NULL; + + /* TAP tests */ + getinfo_helper_rephist(&dummy, "stats/tap/requested", + &answer, &errmsg); + tt_ptr_op(answer, OP_NE, NULL); + tt_ptr_op(errmsg, OP_EQ, NULL); + tt_str_op(answer, OP_EQ, "86"); + tor_free(answer); + errmsg = NULL; + + getinfo_helper_rephist(&dummy, "stats/tap/assigned", + &answer, &errmsg); + tt_ptr_op(answer, OP_NE, NULL); + tt_ptr_op(errmsg, OP_EQ, NULL); + tt_str_op(answer, OP_EQ, "86"); + tor_free(answer); + errmsg = NULL; + + getinfo_helper_rephist(&dummy, "stats/tap/onion_circuits_ddosed", + &answer, &errmsg); + tt_ptr_op(answer, OP_EQ, NULL); + tt_str_op(errmsg, OP_EQ, "Unrecognized handshake type"); + errmsg = NULL; + + done: + UNMOCK(rep_hist_get_circuit_handshake_requested); + UNMOCK(rep_hist_get_circuit_handshake_assigned); + tor_free(answer); + + return; +} + #ifndef COCCI #define PARSER_TEST(type) \ { "parse/" #type, test_controller_parse_cmd, 0, &passthrough_setup, \ @@ -2146,5 +2232,6 @@ struct testcase_t controller_tests[] = { { "getinfo_md_all", test_getinfo_md_all, 0, NULL, NULL }, { "control_reply", test_control_reply, 0, NULL, NULL }, { "control_getconf", test_control_getconf, 0, NULL, NULL }, + { "rep_hist", test_rep_hist, 0, NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/master] control: Add a key to GETINFO to fetch the circuit onion handshake rephist values
by dgoulet＠torproject.org 01 Jul '20

01 Jul '20

commit 4477317cbec059eefb4b86b88efa16f3a5ba7e52 Author: Neel Chauhan <neel(a)neelc.org> Date: Wed May 27 20:40:02 2020 -0700 control: Add a key to GETINFO to fetch the circuit onion handshake rephist values --- src/feature/control/control_getinfo.c | 44 +++++++++++++++++++++++++++++++++++ src/feature/control/control_getinfo.h | 4 ++++ src/feature/stats/rephist.c | 20 ++++++++++++++++ src/feature/stats/rephist.h | 3 +++ 4 files changed, 71 insertions(+) diff --git a/src/feature/control/control_getinfo.c b/src/feature/control/control_getinfo.c index b2d0c9680..23f8a6124 100644 --- a/src/feature/control/control_getinfo.c +++ b/src/feature/control/control_getinfo.c @@ -51,6 +51,7 @@ #include "feature/rend/rendcache.h" #include "feature/stats/geoip_stats.h" #include "feature/stats/predict_ports.h" +#include "feature/stats/rephist.h" #include "lib/version/torversion.h" #include "lib/encoding/kvline.h" @@ -1436,6 +1437,39 @@ getinfo_helper_liveness(control_connection_t *control_conn, return 0; } +/** Implementation helper for GETINFO: answers queries about circuit onion + * handshake rephist values */ +STATIC int +getinfo_helper_rephist(control_connection_t *control_conn, + const char *question, char **answer, + const char **errmsg) +{ + (void) control_conn; + (void) errmsg; + int result; + + if (!strcmp(question, "stats/ntor/assigned")) { + result = + rep_hist_get_circuit_handshake_assigned(ONION_HANDSHAKE_TYPE_NTOR); + } else if (!strcmp(question, "stats/ntor/requested")) { + result = + rep_hist_get_circuit_handshake_requested(ONION_HANDSHAKE_TYPE_NTOR); + } else if (!strcmp(question, "stats/tap/assigned")) { + result = + rep_hist_get_circuit_handshake_assigned(ONION_HANDSHAKE_TYPE_TAP); + } else if (!strcmp(question, "stats/tap/requested")) { + result = + rep_hist_get_circuit_handshake_requested(ONION_HANDSHAKE_TYPE_TAP); + } else { + *errmsg = "Unrecognized handshake type"; + return -1; + } + + tor_asprintf(answer, "%d", result); + + return 0; +} + /** Implementation helper for GETINFO: answers queries about shared random * value. */ static int @@ -1660,6 +1694,16 @@ static const getinfo_item_t getinfo_items[] = { "Onion services detached from the control connection."), ITEM("sr/current", sr, "Get current shared random value."), ITEM("sr/previous", sr, "Get previous shared random value."), + PREFIX("stats/ntor/", rephist, "NTor circuit handshake stats."), + ITEM("stats/ntor/assigned", rephist, + "Assigned NTor circuit handshake stats."), + ITEM("stats/ntor/requested", rephist, + "Requested NTor circuit handshake stats."), + PREFIX("stats/tap/", rephist, "TAP circuit handshake stats."), + ITEM("stats/tap/assigned", rephist, + "Assigned TAP circuit handshake stats."), + ITEM("stats/tap/requested", rephist, + "Requested TAP circuit handshake stats."), { NULL, NULL, NULL, 0 } }; diff --git a/src/feature/control/control_getinfo.h b/src/feature/control/control_getinfo.h index 0ada49258..f61d63244 100644 --- a/src/feature/control/control_getinfo.h +++ b/src/feature/control/control_getinfo.h @@ -60,6 +60,10 @@ STATIC int getinfo_helper_current_time( control_connection_t *control_conn, const char *question, char **answer, const char **errmsg); +STATIC int getinfo_helper_rephist( + control_connection_t *control_conn, + const char *question, char **answer, + const char **errmsg); #endif /* defined(CONTROL_GETINFO_PRIVATE) */ #endif /* !defined(TOR_CONTROL_GETINFO_H) */ diff --git a/src/feature/stats/rephist.c b/src/feature/stats/rephist.c index 71e2e0008..d4826cd1a 100644 --- a/src/feature/stats/rephist.c +++ b/src/feature/stats/rephist.c @@ -2455,6 +2455,26 @@ rep_hist_note_circuit_handshake_assigned(uint16_t type) onion_handshakes_assigned[type]++; } +/** Get the circuit handshake value that is requested. */ +MOCK_IMPL(int, +rep_hist_get_circuit_handshake_requested, (uint16_t type)) +{ + if (BUG(type > MAX_ONION_HANDSHAKE_TYPE)) { + return 0; + } + return onion_handshakes_requested[type]; +} + +/** Get the circuit handshake value that is assigned. */ +MOCK_IMPL(int, +rep_hist_get_circuit_handshake_assigned, (uint16_t type)) +{ + if (BUG(type > MAX_ONION_HANDSHAKE_TYPE)) { + return 0; + } + return onion_handshakes_assigned[type]; +} + /** Log our onionskin statistics since the last time we were called. */ void rep_hist_log_circuit_handshake_stats(time_t now) diff --git a/src/feature/stats/rephist.h b/src/feature/stats/rephist.h index 92c3d2a5a..d08b8833c 100644 --- a/src/feature/stats/rephist.h +++ b/src/feature/stats/rephist.h @@ -77,6 +77,9 @@ void rep_hist_note_circuit_handshake_requested(uint16_t type); void rep_hist_note_circuit_handshake_assigned(uint16_t type); void rep_hist_log_circuit_handshake_stats(time_t now); +MOCK_DECL(int, rep_hist_get_circuit_handshake_requested, (uint16_t type)); +MOCK_DECL(int, rep_hist_get_circuit_handshake_assigned, (uint16_t type)); + void rep_hist_hs_stats_init(time_t now); void rep_hist_hs_stats_term(void); time_t rep_hist_hs_stats_write(time_t now);

1 0

[tor/master] Merge branch 'tor-github/pr/1907'
by dgoulet＠torproject.org 01 Jul '20

01 Jul '20

commit f30f53e0992e78127602a15c27efd10060e45930 Merge: 368156fcb b558971c0 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jul 1 12:26:19 2020 -0400 Merge branch 'tor-github/pr/1907' changes/ticket28279 | 5 ++ src/feature/control/control_getinfo.c | 44 ++++++++++++++++++ src/feature/control/control_getinfo.h | 4 ++ src/feature/stats/rephist.c | 20 ++++++++ src/feature/stats/rephist.h | 3 ++ src/test/test_controller.c | 87 +++++++++++++++++++++++++++++++++++ 6 files changed, 163 insertions(+)

1 0

[tor/master] test: Rename test_rep_hist to test_stats
by dgoulet＠torproject.org 01 Jul '20

01 Jul '20

commit f152d5b15f50972c69021f386a806587d91a0654 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jul 1 12:31:28 2020 -0400 test: Rename test_rep_hist to test_stats The exposed interface is "stats/" thus make the unit tests clear that it is testing that specific GETINFO command. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/test_controller.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_controller.c b/src/test/test_controller.c index f6dccf3bf..49efeb5f8 100644 --- a/src/test/test_controller.c +++ b/src/test/test_controller.c @@ -2134,7 +2134,7 @@ mock_rep_hist_get_circuit_handshake(uint16_t type) } static void -test_rep_hist(void *arg) +test_stats(void *arg) { /* We just need one of these to pass, it doesn't matter what's in it */ control_connection_t dummy; @@ -2232,6 +2232,6 @@ struct testcase_t controller_tests[] = { { "getinfo_md_all", test_getinfo_md_all, 0, NULL, NULL }, { "control_reply", test_control_reply, 0, NULL, NULL }, { "control_getconf", test_control_getconf, 0, NULL, NULL }, - { "rep_hist", test_rep_hist, 0, NULL, NULL }, + { "stats", test_stats, 0, NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/master] Add changes file for Ticket #28279
by dgoulet＠torproject.org 01 Jul '20

01 Jul '20

commit b558971c070e481546f4f6b9d101db86e111f2d4 Author: Neel Chauhan <neel(a)neelc.org> Date: Thu May 28 03:42:50 2020 -0700 Add changes file for Ticket #28279 --- changes/ticket28279 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/ticket28279 b/changes/ticket28279 new file mode 100644 index 000000000..1c085c2a6 --- /dev/null +++ b/changes/ticket28279 @@ -0,0 +1,5 @@ + o Minor features (control port, rephist): + - Introduce GETINFO "stats/ntor/{assigned/requested}" and + "stats/tap/{assigned/requested}" to get the NTorand TAP + circuit onion handshake rephist values respectively. + Closes ticket 28279. Patch by Neel Chauhan.

1 0

[translation/torbutton-branddtd_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-branddtd_completed
by translation＠torproject.org 01 Jul '20

01 Jul '20

commit 40520e288cbbed26cc3c77e73e91a0caa12921c6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 1 15:47:30 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-branddtd_… --- da/brand.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/brand.dtd b/da/brand.dtd index c64497d5c2..b7a5cc9e0d 100644 --- a/da/brand.dtd +++ b/da/brand.dtd @@ -10,7 +10,7 @@  -<!ENTITY brandProductName ""> +<!ENTITY brandProductName "Tor Browser">  <!ENTITY plugins.installed.find "Klik for at indlæse installerede systemplugins">

1 0

[translation/torbutton-brandproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-brandproperties_completed
by translation＠torproject.org 01 Jul '20

01 Jul '20

commit fccebebfb3e9ea981871dc4a1096ea6f5324605d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 1 15:47:26 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-brandprop… --- da/brand.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/brand.properties b/da/brand.properties index 27253e6be1..d975e5e6d9 100644 --- a/da/brand.properties +++ b/da/brand.properties @@ -8,7 +8,7 @@ brandFullName=Tor Browser # LOCALIZATION NOTE(brandProductName): # This brand name can be used in messages where the product name needs to # remain unchanged across different versions (Nightly, Beta, etc.). -# brandProductName=Tor Browser +brandProductName=Tor Browser vendorShortName=Tor-projekt homePageSingleStartMain=Firefox Start, en hurtig startside med indbygget søgning

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 01 Jul '20

01 Jul '20

commit c43bbab1f1773386e3fe080ec6c3f27adfb7f3d5 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 1 15:46:27 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- da.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da.po b/da.po index 39aec468ce..184693e968 100644 --- a/da.po +++ b/da.po @@ -21,7 +21,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-19 19:37+0200\n" -"PO-Revision-Date: 2020-07-01 13:41+0000\n" +"PO-Revision-Date: 2020-07-01 15:34+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -418,7 +418,7 @@ msgstr "" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338 msgid "Enabled" -msgstr "" +msgstr "Aktiveret" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:340 msgid "Disabled (default)"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 01 Jul '20

01 Jul '20

commit c174b62fec09b95d62cff99d4824fc030d9c2eca Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 1 15:45:46 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- da.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/da.po b/da.po index d2fa5b3476..0a76a2d9e5 100644 --- a/da.po +++ b/da.po @@ -21,7 +21,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-06-19 19:37+0200\n" -"PO-Revision-Date: 2020-07-01 13:41+0000\n" +"PO-Revision-Date: 2020-07-01 15:34+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -414,7 +414,7 @@ msgstr "Offline" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:329 msgid "_Unsafe Browser" -msgstr "" +msgstr "Usikker browser" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tailsgreeter/ui/additional_settings.py:338 msgid "Enabled" @@ -1640,11 +1640,11 @@ msgstr "" #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:572 msgid "Disable the Unsafe Browser (default)" -msgstr "" +msgstr "Deaktivér den usikre browser (standard)" #: ../config/chroot_local-includes/usr/share/tails/greeter/additional_settings.ui.in:617 msgid "Enable the Unsafe Browser" -msgstr "" +msgstr "Aktiverer den usikre browser" #: ../config/chroot_local-includes/usr/share/tails/greeter/main.ui.in:100 msgid "Settings were loaded from the persistent storage."

1 0