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

[tor/maint-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.2
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 4a604d99382e4aad3df257e265c852f306f7bc7f Merge: d3894dc34 8b53dfc36 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 10:14:43 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.2 changes/bug26269 | 5 +++++ src/or/router.c | 15 +++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.3.4] Merge branch 'bug26269_029' into maint-0.2.9
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 8b53dfc3626f293f821b8e8afe88cca62224f20b Merge: 9faa28b60 015fcd0e1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 10:14:39 2018 -0400 Merge branch 'bug26269_029' into maint-0.2.9 changes/bug26269 | 5 +++++ src/or/router.c | 15 +++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 529faef28eb3e8907cfb814516953d6636f50487 Merge: afee78541 69918629f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 10:15:16 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26269 | 5 +++++ src/or/router.c | 17 ++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --cc src/or/router.c index 3879863e8,a3d7cd373..5485ec913 --- a/src/or/router.c +++ b/src/or/router.c @@@ -2636,12 -2523,11 +2637,14 @@@ check_descriptor_bandwidth_changed(time { static time_t last_changed = 0; uint64_t prev, cur; - if (!router_get_my_routerinfo()) + const routerinfo_t *my_ri = router_get_my_routerinfo(); + if (!my_ri) /* make sure routerinfo exists */ return; - prev = router_get_my_routerinfo()->bandwidthcapacity; + prev = my_ri->bandwidthcapacity; ++ + /* Consider ourselves to have zero bandwidth if we're hibernating or + * shutting down. */ cur = we_are_hibernating() ? 0 : rep_hist_bandwidth_assess(); if ((prev != cur && (!prev || !cur)) || cur > prev*2 || @@@ -3813,4 -3733,4 +3817,3 @@@ router_get_all_orports(const routerinfo fake_node.ri = (routerinfo_t *)ri; return node_get_all_orports(&fake_node); } --

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 69918629f56ee61ff6c538ea53caefefbabf84f6 Merge: 532873a92 4a604d993 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 10:14:43 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26269 | 5 +++++ src/or/router.c | 15 +++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-)

1 0

[translation/support-tormobile] Update translations for support-tormobile
by translation＠torproject.org 09 Jul '18

09 Jul '18

commit 1126d1437e65dab7c309560d112b1fb74e53dcbc Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 9 13:49:53 2018 +0000 Update translations for support-tormobile --- sv.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv.json b/sv.json index 924159716..72baedf93 100644 --- a/sv.json +++ b/sv.json @@ -21,7 +21,7 @@ "id": "#tormobile-4", "control": "tormobile-4", "title": "Hur kör jag Tor på Windows Phone?", - "description": "<p class=\"mb-3\">There is currently no supported method for running Tor on Windows Phone.</p>" + "description": "<p class=\"mb-3\">Det finns för närvarande inget sätt att använda Tor på en Windows-telefon</p>" }, "tormobile-5": { "id": "#tormobile-5",

1 0

[tor/master] Add CODE_OF_CONDUCT file
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 287b64ee1052508a5328549b2e18d91762a0eb5d Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Thu Jul 5 11:22:33 2018 +0300 Add CODE_OF_CONDUCT file --- CODE_OF_CONDUCT | 7 +++++++ CONTRIBUTING | 9 --------- Makefile.am | 1 + changes/doc26638 | 4 ++++ 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/CODE_OF_CONDUCT b/CODE_OF_CONDUCT new file mode 100644 index 000000000..d8d160a22 --- /dev/null +++ b/CODE_OF_CONDUCT @@ -0,0 +1,7 @@ +The Tor Project is committed to fostering a inclusive community +where people feel safe to engage, share their points of view, and +participate. For the latest version of our Code of Conduct, please +see + +https://gitweb.torproject.org/community/policies.git/plain/code_of_conduct.txt + diff --git a/CONTRIBUTING b/CONTRIBUTING index 3569f45a8..22fd6b638 100644 --- a/CONTRIBUTING +++ b/CONTRIBUTING @@ -15,15 +15,6 @@ more! You don't have to be a C developer to help with Tor: have a look at https://www.torproject.org/getinvolved/volunteer ! -The Tor Project is committed to fostering a inclusive community -where people feel safe to engage, share their points of view, and -participate. For the latest version of our Code of Conduct, please -see - -https://gitweb.torproject.org/community/policies.git/plain/code_of_conduct.txt - - - ### License issues Tor is distributed under the license terms in the LICENSE -- in diff --git a/Makefile.am b/Makefile.am index fe2479a64..10a09af8f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -138,6 +138,7 @@ include contrib/include.am EXTRA_DIST+= \ ChangeLog \ CONTRIBUTING \ + CODE_OF_CONDUCT \ INSTALL \ LICENSE \ Makefile.nmake \ diff --git a/changes/doc26638 b/changes/doc26638 new file mode 100644 index 000000000..82a2861cf --- /dev/null +++ b/changes/doc26638 @@ -0,0 +1,4 @@ + o Minor features (development): + - Move paragraph and URL to Tor's code of conduct document + from CONTRIBUTING to new CODE_OF_CONDUCT file. Resolves + ticket 26638.

1 0

[tor/master] Merge remote-tracking branch 'rl1987/doc26638'
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 4ff93dd94fb548251ad3d5379e4a329e51e93ef4 Merge: a1a55a33c 287b64ee1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:40:04 2018 -0400 Merge remote-tracking branch 'rl1987/doc26638' CODE_OF_CONDUCT | 7 +++++++ Makefile.am | 1 + changes/doc26638 | 4 ++++ 3 files changed, 12 insertions(+) diff --cc changes/doc26638 index 000000000,82a2861cf..d6f9b1de7 mode 000000,100644..100644 --- a/changes/doc26638 +++ b/changes/doc26638 @@@ -1,0 -1,4 +1,4 @@@ + o Minor features (development): - - Move paragraph and URL to Tor's code of conduct document ++ - Copy paragraph and URL to Tor's code of conduct document + from CONTRIBUTING to new CODE_OF_CONDUCT file. Resolves + ticket 26638.

1 0

[tor/master] Validate that DirAuthority address is IPv4
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit 46998fc8fd008f780f9d0ce827b89afab3cb0210 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue Jun 26 14:30:02 2018 +0300 Validate that DirAuthority address is IPv4 --- changes/bug26488 | 4 ++++ src/or/config.c | 17 +++++++++++++++++ src/test/test_config.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/changes/bug26488 b/changes/bug26488 new file mode 100644 index 000000000..f93d4c6f0 --- /dev/null +++ b/changes/bug26488 @@ -0,0 +1,4 @@ + o Major bugfixes (directory authority): + - Actually check that address we get from DirAuthority configuration + line is valid IPv4. Explicitly disallow DirAuthority adress to be + DNS hostname. Fixes bug 26488; bugfix on 0.1.2.10-rc. diff --git a/src/or/config.c b/src/or/config.c index 6bdb4ab7d..088243e34 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6417,6 +6417,23 @@ parse_dir_authority_line(const char *line, dirinfo_type_t required_type, } addrport = smartlist_get(items, 0); smartlist_del_keeporder(items, 0); + + const char *addrport_sep = strchr(addrport, ':'); + if (!addrport_sep) { + log_warn(LD_CONFIG, "Error parsing DirAuthority address '%s' " + "(':' not found)", addrport); + goto err; + } + + address = tor_strndup(addrport, addrport_sep - addrport); + if (!string_is_valid_ipv4_address(address)) { + log_warn(LD_CONFIG, "Error parsing DirAuthority address '%s' " + "(invalid IPv4 address)", address); + goto err; + } + + tor_free(address); + if (addr_port_lookup(LOG_WARN, addrport, &address, NULL, &dir_port)<0) { log_warn(LD_CONFIG, "Error parsing DirAuthority address '%s'", addrport); goto err; diff --git a/src/test/test_config.c b/src/test/test_config.c index 177368c65..fd504dd3d 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -1623,6 +1623,40 @@ test_config_parsing_trusted_dir_server(void *arg) #undef TEST_DIR_AUTH_LINE_END #undef TEST_DIR_AUTH_IPV6_FLAG +#define TEST_DIR_AUTH_LINE_START \ + "foobar orport=12345 " \ + "v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 " +#define TEST_DIR_AUTH_LINE_END_BAD_IP \ + "0.256.3.4:54321 " \ + "FDB2 FBD2 AAA5 25FA 2999 E617 5091 5A32 C777 3B17" +#define TEST_DIR_AUTH_LINE_END_WITH_DNS_ADDR \ + "torproject.org:54321 " \ + "FDB2 FBD2 AAA5 25FA 2999 E617 5091 5A32 C777 3B17" + +static void +test_config_parsing_invalid_dir_address(void *arg) +{ + (void)arg; + int rv; + + rv = parse_dir_authority_line(TEST_DIR_AUTH_LINE_START + TEST_DIR_AUTH_LINE_END_BAD_IP, + V3_DIRINFO, 1); + tt_int_op(rv, OP_EQ, -1); + + rv = parse_dir_authority_line(TEST_DIR_AUTH_LINE_START + TEST_DIR_AUTH_LINE_END_WITH_DNS_ADDR, + V3_DIRINFO, 1); + tt_int_op(rv, OP_EQ, -1); + + done: + return; +} + +#undef TEST_DIR_AUTH_LINE_START +#undef TEST_DIR_AUTH_LINE_END_BAD_IP +#undef TEST_DIR_AUTH_LINE_END_WITH_DNS_ADDR + /* No secrets here: * id is `echo "syn-propanethial-S-oxide" | shasum | cut -d" " -f1` */ @@ -5687,6 +5721,7 @@ struct testcase_t config_tests[] = { CONFIG_TEST(adding_trusted_dir_server, TT_FORK), CONFIG_TEST(adding_fallback_dir_server, TT_FORK), CONFIG_TEST(parsing_trusted_dir_server, 0), + CONFIG_TEST(parsing_invalid_dir_address, 0), CONFIG_TEST(parsing_fallback_dir_server, 0), CONFIG_TEST(adding_default_trusted_dir_servers, TT_FORK), CONFIG_TEST(adding_dir_servers, TT_FORK),

1 0

[tor/master] Merge branch 'bug26488'
by nickm＠torproject.org 09 Jul '18

09 Jul '18

commit a1a55a33c20364ccbc0540125d662203152a20c2 Merge: 03283c00d 46998fc8f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 9 09:37:14 2018 -0400 Merge branch 'bug26488' changes/bug26488 | 4 ++++ src/app/config/config.c | 17 +++++++++++++++++ src/test/test_config.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+)

1 0

[metrics-web/master] Fix unknown AS in aggregations
by karsten＠torproject.org 09 Jul '18

09 Jul '18

commit f7ce13e4f37cbf5540fe00e672bedd2b4906364f Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Fri Jul 6 11:17:58 2018 +0100 Fix unknown AS in aggregations AS numbers are strings when returned from Onionoo. "AS0" is used instead of the integer 0 as the placeholder for unknown autonomous systems. Fixes: #26518 --- src/main/resources/web/js/rs/collections/aggregates.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/web/js/rs/collections/aggregates.js b/src/main/resources/web/js/rs/collections/aggregates.js index 9ddce23..dbf65ea 100644 --- a/src/main/resources/web/js/rs/collections/aggregates.js +++ b/src/main/resources/web/js/rs/collections/aggregates.js @@ -30,8 +30,8 @@ define([ This code will never be assigned for use with ISO 3166-1 and is "user-assigned". Fun fact: UN/LOCODE assigns XZ to represent installations in international waters. */ relay.country = ((typeof relay.country) == "undefined") ? "xz" : relay.country; - relay.as_number = ((typeof relay.as_number) == "undefined") ? 0 : relay.as_number; - if (relay.as_number == 0) relay.as_name = "Unknown"; + relay.as_number = ((typeof relay.as_number) == "undefined") ? "AS0" : relay.as_number; + if (relay.as_number == "AS0") relay.as_name = "Unknown"; var ccAggregate = false; var asAggregate = false; @@ -75,7 +75,7 @@ define([ if (relay.country !== "xz") aggregates[aggregateKey].country.add(relay.country); } if (!asAggregate) { - if (relay.as_number !== 0) aggregates[aggregateKey].as.add(relay.as_number); + if (relay.as_number !== "AS0") aggregates[aggregateKey].as.add(relay.as_number); } aggregates[aggregateKey].relays++; if ((typeof relay.guard_probability) !== "undefined") aggregates[aggregateKey].guard_probability += relay.guard_probability;

1 0