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

[tor/release-0.3.3] Rename string_is_valid_hostname -> string_is_valid_nonrfc_hostname
by nickm＠torproject.org 28 Mar '18

28 Mar '18

commit b504c854d34a938943f68c3036840f10a84fcea4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 28 07:42:27 2018 -0400 Rename string_is_valid_hostname -> string_is_valid_nonrfc_hostname Per discussion on 25055. --- src/common/util.c | 4 ++-- src/common/util.h | 2 +- src/test/test_util.c | 55 ++++++++++++++++++++++++++-------------------------- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 5ae4d0408..90aaf0ebe 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -1094,7 +1094,7 @@ string_is_valid_dest(const char *string) retval = string_is_valid_ipv4_address(string) || string_is_valid_ipv6_address(string) || - string_is_valid_hostname(string); + string_is_valid_nonrfc_hostname(string); tor_free(tmp); @@ -1108,7 +1108,7 @@ string_is_valid_dest(const char *string) * with misconfigured zones that have been encountered in the wild. */ int -string_is_valid_hostname(const char *string) +string_is_valid_nonrfc_hostname(const char *string) { int result = 1; int has_trailing_dot; diff --git a/src/common/util.h b/src/common/util.h index d6bda8036..938078912 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -234,7 +234,7 @@ const char *find_str_at_start_of_line(const char *haystack, int string_is_C_identifier(const char *string); int string_is_key_value(int severity, const char *string); int string_is_valid_dest(const char *string); -int string_is_valid_hostname(const char *string); +int string_is_valid_nonrfc_hostname(const char *string); int string_is_valid_ipv4_address(const char *string); int string_is_valid_ipv6_address(const char *string); diff --git a/src/test/test_util.c b/src/test/test_util.c index c734426a5..036f739b8 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -5559,56 +5559,57 @@ test_util_hostname_validation(void *arg) (void)arg; // Lets try valid hostnames first. - tt_assert(string_is_valid_hostname("torproject.org")); - tt_assert(string_is_valid_hostname("ocw.mit.edu")); - tt_assert(string_is_valid_hostname("i.4cdn.org")); - tt_assert(string_is_valid_hostname("stanford.edu")); - tt_assert(string_is_valid_hostname("multiple-words-with-hypens.jp")); + tt_assert(string_is_valid_nonrfc_hostname("torproject.org")); + tt_assert(string_is_valid_nonrfc_hostname("ocw.mit.edu")); + tt_assert(string_is_valid_nonrfc_hostname("i.4cdn.org")); + tt_assert(string_is_valid_nonrfc_hostname("stanford.edu")); + tt_assert(string_is_valid_nonrfc_hostname("multiple-words-with-hypens.jp")); // Subdomain name cannot start with '-' or '_'. - tt_assert(!string_is_valid_hostname("-torproject.org")); - tt_assert(!string_is_valid_hostname("subdomain.-domain.org")); - tt_assert(!string_is_valid_hostname("-subdomain.domain.org")); - tt_assert(!string_is_valid_hostname("___abc.org")); + tt_assert(!string_is_valid_nonrfc_hostname("-torproject.org")); + tt_assert(!string_is_valid_nonrfc_hostname("subdomain.-domain.org")); + tt_assert(!string_is_valid_nonrfc_hostname("-subdomain.domain.org")); + tt_assert(!string_is_valid_nonrfc_hostname("___abc.org")); // Hostnames cannot contain non-alphanumeric characters. - tt_assert(!string_is_valid_hostname("%%domain.\\org.")); - tt_assert(!string_is_valid_hostname("***x.net")); - tt_assert(!string_is_valid_hostname("\xff\xffxyz.org")); - tt_assert(!string_is_valid_hostname("word1 word2.net")); + tt_assert(!string_is_valid_nonrfc_hostname("%%domain.\\org.")); + tt_assert(!string_is_valid_nonrfc_hostname("***x.net")); + tt_assert(!string_is_valid_nonrfc_hostname("\xff\xffxyz.org")); + tt_assert(!string_is_valid_nonrfc_hostname("word1 word2.net")); // Test workaround for nytimes.com stupidity, technically invalid, // but we allow it since they are big, even though they are failing to // comply with a ~30 year old standard. - tt_assert(string_is_valid_hostname("core3_euw1.fabrik.nytimes.com")); + tt_assert(string_is_valid_nonrfc_hostname("core3_euw1.fabrik.nytimes.com")); // Firefox passes FQDNs with trailing '.'s directly to the SOCKS proxy, // which is redundant since the spec states DOMAINNAME addresses are fully // qualified. While unusual, this should be tollerated. - tt_assert(string_is_valid_hostname("core9_euw1.fabrik.nytimes.com.")); - tt_assert(!string_is_valid_hostname("..washingtonpost.is.better.com")); - tt_assert(!string_is_valid_hostname("so.is..ft.com")); - tt_assert(!string_is_valid_hostname("...")); + tt_assert(string_is_valid_nonrfc_hostname("core9_euw1.fabrik.nytimes.com.")); + tt_assert(!string_is_valid_nonrfc_hostname( + "..washingtonpost.is.better.com")); + tt_assert(!string_is_valid_nonrfc_hostname("so.is..ft.com")); + tt_assert(!string_is_valid_nonrfc_hostname("...")); // XXX: do we allow single-label DNS names? // We shouldn't for SOCKS (spec says "contains a fully-qualified domain name" // but only test pathologically malformed traling '.' cases for now. - tt_assert(!string_is_valid_hostname(".")); - tt_assert(!string_is_valid_hostname("..")); + tt_assert(!string_is_valid_nonrfc_hostname(".")); + tt_assert(!string_is_valid_nonrfc_hostname("..")); // IP address strings are not hostnames. - tt_assert(!string_is_valid_hostname("8.8.8.8")); - tt_assert(!string_is_valid_hostname("[2a00:1450:401b:800::200e]")); - tt_assert(!string_is_valid_hostname("2a00:1450:401b:800::200e")); + tt_assert(!string_is_valid_nonrfc_hostname("8.8.8.8")); + tt_assert(!string_is_valid_nonrfc_hostname("[2a00:1450:401b:800::200e]")); + tt_assert(!string_is_valid_nonrfc_hostname("2a00:1450:401b:800::200e")); // We allow alphanumeric TLDs. For discussion, see ticket #25055. - tt_assert(string_is_valid_hostname("lucky.13")); - tt_assert(string_is_valid_hostname("luck.y13")); - tt_assert(string_is_valid_hostname("luck.y13.")); + tt_assert(string_is_valid_nonrfc_hostname("lucky.13")); + tt_assert(string_is_valid_nonrfc_hostname("luck.y13")); + tt_assert(string_is_valid_nonrfc_hostname("luck.y13.")); // We allow punycode TLDs. For examples, see // http://data.iana.org/TLD/tlds-alpha-by-domain.txt - tt_assert(string_is_valid_hostname("example.xn--l1acc")); + tt_assert(string_is_valid_nonrfc_hostname("example.xn--l1acc")); done: return;

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 28 Mar '18

28 Mar '18

commit 08cd7a1bf29596aa51290ed00cd21d9247daabef Merge: f2027d5bf d416e208e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 28 07:50:47 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bugs_25036_25055 | 7 +++++ src/common/util.c | 72 ++++++++++++++++++++++++++++++++++++++---------- src/common/util.h | 3 +- src/or/proto_socks.c | 4 +-- src/test/test_socks.c | 24 ++++++++++++++-- src/test/test_util.c | 68 +++++++++++++++++++++++++++++++-------------- 6 files changed, 138 insertions(+), 40 deletions(-)

1 0

[tor/release-0.3.3] Merge branch 'bugs25036_25055_clean_033' into maint-0.3.3
by nickm＠torproject.org 28 Mar '18

28 Mar '18

commit d416e208e4e94c2b4ccd4e11013151c72180faff Merge: ddee28a3c d4bf1f6c8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 28 07:49:34 2018 -0400 Merge branch 'bugs25036_25055_clean_033' into maint-0.3.3 changes/bugs_25036_25055 | 7 +++++ src/common/util.c | 72 ++++++++++++++++++++++++++++++++++++++---------- src/common/util.h | 3 +- src/or/proto_socks.c | 4 +-- src/test/test_socks.c | 24 ++++++++++++++-- src/test/test_util.c | 68 +++++++++++++++++++++++++++++++-------------- 6 files changed, 138 insertions(+), 40 deletions(-)

1 0

[translation/tails-greeter-2_completed] Update translations for tails-greeter-2_completed
by translation＠torproject.org 28 Mar '18

28 Mar '18

commit fdd7308d7eceb82678ca46bf58002f374bb346e6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 28 10:49:34 2018 +0000 Update translations for tails-greeter-2_completed --- it/it.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/it.po b/it/it.po index e59c81330..1c224209e 100644 --- a/it/it.po +++ b/it/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-22 14:15+0100\n" +"POT-Creation-Date: 2018-03-01 20:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Sebastiano Pistore <SebastianoPistore.info(a)protonmail.ch>, 2016\n" "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n"

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 28 Mar '18

28 Mar '18

commit 5431e3e41333a1fa0cc92ff07e7bd2cd5b11d132 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 28 10:49:27 2018 +0000 Update translations for tails-greeter-2 --- it/it.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/it/it.po b/it/it.po index e59c81330..1c224209e 100644 --- a/it/it.po +++ b/it/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-01-22 14:15+0100\n" +"POT-Creation-Date: 2018-03-01 20:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Sebastiano Pistore <SebastianoPistore.info(a)protonmail.ch>, 2016\n" "Language-Team: Italian (https://www.transifex.com/otf/teams/1519/it/)\n"

1 0

[tor/master] Merge remote-tracking branch 'catalyst-github/bug25629-033' into maint-0.3.3
by nickm＠torproject.org 27 Mar '18

27 Mar '18

commit ddee28a3c9b9dd256cd6560a4766f17a6c6fc13d Merge: da5173c83 471f28a2a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 27 18:25:41 2018 -0400 Merge remote-tracking branch 'catalyst-github/bug25629-033' into maint-0.3.3 changes/bug25629 | 3 +++ src/or/nodelist.c | 28 ++++++++++++++-------------- 2 files changed, 17 insertions(+), 14 deletions(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 27 Mar '18

27 Mar '18

commit cbea95ae6736e5ec62af6b7341245a84629e3a2c Merge: e9ec63d1a 5acfc3087 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 27 18:23:53 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug25629 | 3 +++ src/or/nodelist.c | 13 ++++++------- 2 files changed, 9 insertions(+), 7 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 27 Mar '18

27 Mar '18

commit 5e7d505850607a16f6051a19ff60c39ff4c8393e Merge: b5a6c0399 5acfc3087 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 27 18:24:37 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 "ours" merge to avoid earlier version of 25629 fix.

1 0

[tor/release-0.2.9] Fix CID 1430932
by nickm＠torproject.org 27 Mar '18

27 Mar '18

commit 4bb7d9fd1241a3c263636efa03ee8c62ab744515 Author: Taylor Yu <catalyst(a)torproject.org> Date: Mon Mar 26 17:51:50 2018 -0500 Fix CID 1430932 Coverity found a null pointer reference in nodelist_add_microdesc(). This is almost certainly impossible assuming that the routerstatus_t returned by router_get_consensus_status_by_descriptor_digest() always corresponds to an entry in the nodelist. Fixes bug 25629. --- changes/bug25629 | 3 +++ src/or/nodelist.c | 13 ++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/changes/bug25629 b/changes/bug25629 new file mode 100644 index 000000000..190928a94 --- /dev/null +++ b/changes/bug25629 @@ -0,0 +1,3 @@ + o Minor bugfixes (C correctness): + - Fix a very unlikely null pointer dereference. Fixes bug 25629; + bugfix on 0.2.9.15. Found by Coverity; this is CID 1430932. diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 5a02648c5..26f990b08 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -263,13 +263,12 @@ nodelist_add_microdesc(microdesc_t *md) if (rs == NULL) return NULL; node = node_get_mutable_by_id(rs->identity_digest); - if (node) { - if (node->md) - node->md->held_by_nodes--; - node->md = md; - md->held_by_nodes++; - } - + if (node == NULL) + return NULL; + if (node->md) + node->md->held_by_nodes--; + node->md = md; + md->held_by_nodes++; node_add_to_address_set(node); return node;

1 0

[tor/release-0.3.1] Fix CID 1430932
by nickm＠torproject.org 27 Mar '18

27 Mar '18

commit 4bb7d9fd1241a3c263636efa03ee8c62ab744515 Author: Taylor Yu <catalyst(a)torproject.org> Date: Mon Mar 26 17:51:50 2018 -0500 Fix CID 1430932 Coverity found a null pointer reference in nodelist_add_microdesc(). This is almost certainly impossible assuming that the routerstatus_t returned by router_get_consensus_status_by_descriptor_digest() always corresponds to an entry in the nodelist. Fixes bug 25629. --- changes/bug25629 | 3 +++ src/or/nodelist.c | 13 ++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/changes/bug25629 b/changes/bug25629 new file mode 100644 index 000000000..190928a94 --- /dev/null +++ b/changes/bug25629 @@ -0,0 +1,3 @@ + o Minor bugfixes (C correctness): + - Fix a very unlikely null pointer dereference. Fixes bug 25629; + bugfix on 0.2.9.15. Found by Coverity; this is CID 1430932. diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 5a02648c5..26f990b08 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -263,13 +263,12 @@ nodelist_add_microdesc(microdesc_t *md) if (rs == NULL) return NULL; node = node_get_mutable_by_id(rs->identity_digest); - if (node) { - if (node->md) - node->md->held_by_nodes--; - node->md = md; - md->held_by_nodes++; - } - + if (node == NULL) + return NULL; + if (node->md) + node->md->held_by_nodes--; + node->md = md; + md->held_by_nodes++; node_add_to_address_set(node); return node;

1 0