November 2016 - tor-commits - lists.torproject.org

[tor/master] hs: Remove pointless NULL check found by Coverity
by nickm＠torproject.org 18 Nov '16

18 Nov '16

commit c82881a235a686b84ad78d076826f832e3363184 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Nov 10 12:32:18 2016 -0500 hs: Remove pointless NULL check found by Coverity Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_descriptor.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/or/hs_descriptor.c b/src/or/hs_descriptor.c index 1517ccb..d381732 100644 --- a/src/or/hs_descriptor.c +++ b/src/or/hs_descriptor.c @@ -1394,15 +1394,10 @@ decode_intro_points(const hs_descriptor_t *desc, retval = 0; err: - if (chunked_desc) { - SMARTLIST_FOREACH(chunked_desc, char *, a, tor_free(a)); - smartlist_free(chunked_desc); - } - if (intro_points) { - SMARTLIST_FOREACH(intro_points, char *, a, tor_free(a)); - smartlist_free(intro_points); - } - + SMARTLIST_FOREACH(chunked_desc, char *, a, tor_free(a)); + smartlist_free(chunked_desc); + SMARTLIST_FOREACH(intro_points, char *, a, tor_free(a)); + smartlist_free(intro_points); return retval; } /* Return 1 iff the given base64 encoded signature in b64_sig from the encoded

1 0

[tor/master] Only check cert expiry vs TIME_MAX when time_t is less than 64-bit
by nickm＠torproject.org 18 Nov '16

18 Nov '16

commit 00bdd56b18e1441510e770b16bd869968839153b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 3 19:29:52 2016 -0400 Only check cert expiry vs TIME_MAX when time_t is less than 64-bit Fixes issue 20558 / CID 1375988. --- src/or/torcert.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/or/torcert.c b/src/or/torcert.c index 852def9..6bc880a 100644 --- a/src/or/torcert.c +++ b/src/or/torcert.c @@ -156,11 +156,12 @@ tor_cert_parse(const uint8_t *encoded, const size_t len) cert->encoded_len = len; memcpy(cert->signed_key.pubkey, parsed->certified_key, 32); - const int64_t valid_until_64 = ((int64_t)parsed->exp_field) * 3600; + int64_t valid_until_64 = ((int64_t)parsed->exp_field) * 3600; +#if SIZEOF_TIME_T < SIZEOF_INT64_T if (valid_until_64 > TIME_MAX) - cert->valid_until = TIME_MAX - 1; - else - cert->valid_until = (time_t) valid_until_64; + valid_until_64 = TIME_MAX - 1; +#endif + cert->valid_until = (time_t) valid_until_64; cert->cert_type = parsed->cert_type; for (unsigned i = 0; i < ed25519_cert_getlen_ext(parsed); ++i) {

1 0

[tor/master] Fix a "shouldn't have reached this" warning in connection_edge.c
by nickm＠torproject.org 18 Nov '16

18 Nov '16

commit 307d244640ff9ad829bfe0769ddb2f903ec80ea8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 14 09:16:57 2016 -0500 Fix a "shouldn't have reached this" warning in connection_edge.c This was bug 20630; bugfix on f3e158ed where I thought I was committing a documentation-only fix but instead messed up the control flow too. --- src/or/connection_edge.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 875c911..3874d52 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1627,11 +1627,9 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, } tor_assert(!automap); rep_hist_note_used_resolve(now); /* help predict this next time */ - } + } else if (socks->command == SOCKS_COMMAND_CONNECT) { + /* Now see if this is a connect request that we can reject immediately */ - /* Now see if this is a connect request that we can reject immediately */ - if (socks->command == SOCKS_COMMAND_CONNECT) { - /* Special handling for attempts to connect */ tor_assert(!automap); /* Don't allow connections to port 0. */ if (socks->port == 0) { @@ -1771,7 +1769,7 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn, rep_hist_note_used_resolve(now); /* help predict this next time */ /* no extra processing needed */ } else { - /* We should only be doing CONNECT or RESOLVE! */ + /* We should only be doing CONNECT, RESOLVE, or RESOLVE_PTR! */ tor_fragile_assert(); }

1 0

[tor/master] Add expect_log_msg_containing_either3() and expect_log_msg_containing_either4()
by nickm＠torproject.org 18 Nov '16

18 Nov '16

commit cccc08ad565f340bd4e6d19d0137bc45ced93107 Author: Neel Chauhan <neel(a)neelc.org> Date: Tue Nov 15 20:33:31 2016 -0500 Add expect_log_msg_containing_either3() and expect_log_msg_containing_either4() --- src/test/log_test_helpers.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h index 4c020c7..a8ad7e8 100644 --- a/src/test/log_test_helpers.h +++ b/src/test/log_test_helpers.h @@ -51,6 +51,21 @@ void mock_dump_saved_logs(void); mock_saved_log_has_message_containing(str2), \ "expected log to contain " # str1 " or " # str2); +#define expect_log_msg_containing_either3(str1, str2, str3) \ + assert_log_predicate3(mock_saved_log_has_message_containing(str1) || \ + (mock_saved_log_has_message_containing(str2) || \ + mock_saved_log_has_message_containing(str3), \ + "expected log to contain " # str1 " or " # str2 " or " # str3); + +#define expect_log_msg_containing_either4(str1, str2, str3, str4) \ + assert_log_predicate4(mock_saved_log_has_message_containing(str1) || \ + (mock_saved_log_has_message_containing(str2) || \ + (mock_saved_log_has_message_containing(str3) || \ + mock_saved_log_has_message_containing(str4), \ + "expected log to contain " # str1 " or " # str2 " or " # str3 " or " # str4); + + + #define expect_single_log_msg(str) \ do { \ \

1 0

[tor/master] Merge branch 'maint-0.2.9'
by nickm＠torproject.org 18 Nov '16

18 Nov '16

commit 427dcb29b573d839551e8e3982af6e40d7d42609 Merge: b7db39e 8a767ba Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 17 20:08:15 2016 -0500 Merge branch 'maint-0.2.9' changes/bug20634 | 3 +++ src/test/log_test_helpers.h | 17 ++++++++++++++++- src/test/test_address.c | 18 ++++++++++++++---- 3 files changed, 33 insertions(+), 5 deletions(-)

1 0

[tor/master] Fix and simplify error handling code in rend_service_parse_port_config()
by nickm＠torproject.org 18 Nov '16

18 Nov '16

commit fe711c29448a84d483818c95890de118f13b7e44 Author: Ivan Markin <twim(a)riseup.net> Date: Thu Nov 10 21:29:48 2016 +0000 Fix and simplify error handling code in rend_service_parse_port_config() --- src/or/rendservice.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 76447a4..8ffd0bc 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -371,14 +371,12 @@ rend_service_parse_port_config(const char *string, const char *sep, smartlist_split_string(sl, string, sep, SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 2); if (smartlist_len(sl) < 1 || BUG(smartlist_len(sl) > 2)) { - if (err_msg_out) - err_msg = tor_strdup("Bad syntax in hidden service port configuration."); + err_msg = tor_strdup("Bad syntax in hidden service port configuration."); goto err; } virtport = (int)tor_parse_long(smartlist_get(sl,0), 10, 1, 65535, NULL,NULL); if (!virtport) { - if (err_msg_out) - tor_asprintf(&err_msg, "Missing or invalid port %s in hidden service " + tor_asprintf(&err_msg, "Missing or invalid port %s in hidden service " "port configuration", escaped(smartlist_get(sl,0))); goto err; @@ -406,10 +404,8 @@ rend_service_parse_port_config(const char *string, const char *sep, } else if (strchr(addrport, ':') || strchr(addrport, '.')) { /* else try it as an IP:port pair if it has a : or . in it */ if (tor_addr_port_lookup(addrport, &addr, &p)<0) { - if (err_msg_out) - err_msg = tor_strdup("Unparseable address in hidden service port " - "configuration."); - + err_msg = tor_strdup("Unparseable address in hidden service port " + "configuration."); goto err; } realport = p?p:virtport; @@ -417,11 +413,9 @@ rend_service_parse_port_config(const char *string, const char *sep, /* No addr:port, no addr -- must be port. */ realport = (int)tor_parse_long(addrport, 10, 1, 65535, NULL, NULL); if (!realport) { - if (err_msg_out) - tor_asprintf(&err_msg, "Unparseable or out-of-range port %s in " - "hidden service port configuration.", - escaped(addrport)); - + tor_asprintf(&err_msg, "Unparseable or out-of-range port %s in " + "hidden service port configuration.", + escaped(addrport)); goto err; } tor_addr_from_ipv4h(&addr, 0x7F000001u); /* Default to 127.0.0.1 */ @@ -440,7 +434,11 @@ rend_service_parse_port_config(const char *string, const char *sep, err: tor_free(addrport); - if (err_msg_out) *err_msg_out = err_msg; + if (err_msg_out != NULL) { + *err_msg_out = err_msg; + } else { + tor_free(err_msg); + } SMARTLIST_FOREACH(sl, char *, c, tor_free(c)); smartlist_free(sl);

1 0

[tor/master] doc: Add change file for bug #20646
by nickm＠torproject.org 18 Nov '16

18 Nov '16

commit 6b13612eef50283af8c52b160553b192eec9ed6e Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 16 11:28:24 2016 -0500 doc: Add change file for bug #20646 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug20646 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug20646 b/changes/bug20646 new file mode 100644 index 0000000..42e319f --- /dev/null +++ b/changes/bug20646 @@ -0,0 +1,5 @@ + o Minor bugfix (util) + - When finishing writing a file to disk, if we were about to replace the + file with the temporary file created before and we fail to replace it, + remove the temporary file so it doesn't stay on disk. Closes #20646; + bugfix on tor-0.2.0.7-alpha; Patch by fk.

1 0

[tor/master] Merge remote-tracking branch 'teor/bug20634_029' into maint-0.2.9
by nickm＠torproject.org 18 Nov '16

18 Nov '16

commit 8a767ba7fbeedb3d8838ccfe57583203b783241d Merge: caf7422 44f3563 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 17 20:02:59 2016 -0500 Merge remote-tracking branch 'teor/bug20634_029' into maint-0.2.9 changes/bug20634 | 3 +++ src/test/log_test_helpers.h | 17 ++++++++++++++++- src/test/test_address.c | 18 ++++++++++++++---- 3 files changed, 33 insertions(+), 5 deletions(-)

1 0

[tor/release-0.2.9] Add expect_log_msg_containing_either3() and expect_log_msg_containing_either4()
by nickm＠torproject.org 18 Nov '16

18 Nov '16

commit cccc08ad565f340bd4e6d19d0137bc45ced93107 Author: Neel Chauhan <neel(a)neelc.org> Date: Tue Nov 15 20:33:31 2016 -0500 Add expect_log_msg_containing_either3() and expect_log_msg_containing_either4() --- src/test/log_test_helpers.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/test/log_test_helpers.h b/src/test/log_test_helpers.h index 4c020c7..a8ad7e8 100644 --- a/src/test/log_test_helpers.h +++ b/src/test/log_test_helpers.h @@ -51,6 +51,21 @@ void mock_dump_saved_logs(void); mock_saved_log_has_message_containing(str2), \ "expected log to contain " # str1 " or " # str2); +#define expect_log_msg_containing_either3(str1, str2, str3) \ + assert_log_predicate3(mock_saved_log_has_message_containing(str1) || \ + (mock_saved_log_has_message_containing(str2) || \ + mock_saved_log_has_message_containing(str3), \ + "expected log to contain " # str1 " or " # str2 " or " # str3); + +#define expect_log_msg_containing_either4(str1, str2, str3, str4) \ + assert_log_predicate4(mock_saved_log_has_message_containing(str1) || \ + (mock_saved_log_has_message_containing(str2) || \ + (mock_saved_log_has_message_containing(str3) || \ + mock_saved_log_has_message_containing(str4), \ + "expected log to contain " # str1 " or " # str2 " or " # str3 " or " # str4); + + + #define expect_single_log_msg(str) \ do { \ \

1 0

[tor/master] Fix comment for rend_service_parse_port_config()
by nickm＠torproject.org 18 Nov '16

18 Nov '16

commit a847e16cbb4cac45439ea02221751de2bc3dc380 Author: Ivan Markin <twim(a)riseup.net> Date: Thu Nov 10 22:10:31 2016 +0000 Fix comment for rend_service_parse_port_config() --- src/or/rendservice.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 0819d8a..76447a4 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -344,9 +344,9 @@ rend_service_port_config_new(const char *socket_path) return conf; } -/** Parses a real-port to virtual-port mapping separated by the provided - * separator and returns a new rend_service_port_config_t, or NULL and an - * optional error string on failure. +/** Parses a virtual-port to real-port/socket mapping separated by + * the provided separator and returns a new rend_service_port_config_t, + * or NULL and an optional error string on failure. * * The format is: VirtualPort SEP (IP|RealPort|IP:RealPort|'socket':path)? *

1 0