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

[tor/master] Add libtor-buf-testing to build.rs
by nickm＠torproject.org 05 Dec '18

05 Dec '18

commit 6ca29ea4094c7cb5696cd41d3994dd2fb230fe9a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 7 12:14:24 2018 -0500 Add libtor-buf-testing to build.rs --- src/rust/build.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/rust/build.rs b/src/rust/build.rs index bf566c56b..5626b35f7 100644 --- a/src/rust/build.rs +++ b/src/rust/build.rs @@ -149,8 +149,9 @@ pub fn main() { cfg.component("tor-sandbox-testing"); cfg.component("tor-encoding-testing"); cfg.component("tor-fs-testing"); - cfg.component("tor-time-testing"); cfg.component("tor-net-testing"); + cfg.component("tor-buf-testing"); + cfg.component("tor-time-testing"); cfg.component("tor-thread-testing"); cfg.component("tor-memarea-testing"); cfg.component("tor-log-testing");

1 0

[tor/master] Update the check-includes script to enforce some naming and no-circularity rules
by nickm＠torproject.org 05 Dec '18

05 Dec '18

commit c3c8c926bfc8e44e28f3a404e3452f014f6bcbaa Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 7 10:30:46 2018 -0500 Update the check-includes script to enforce some naming and no-circularity rules --- scripts/maint/checkIncludes.py | 64 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/scripts/maint/checkIncludes.py b/scripts/maint/checkIncludes.py index 46a3f3963..ecda3fc56 100755 --- a/scripts/maint/checkIncludes.py +++ b/scripts/maint/checkIncludes.py @@ -33,6 +33,9 @@ else: def open_file(fname): return open(fname, 'r', encoding='utf-8') +def warn(msg): + print(msg, file=sys.stderr) + def err(msg): """ Declare that an error has happened, and remember that there has been an error. """ @@ -48,14 +51,34 @@ def fname_is_c(fname): INCLUDE_PATTERN = re.compile(r'\s*#\s*include\s+"([^"]*)"') RULES_FNAME = ".may_include" +ALLOWED_PATTERNS = [ + re.compile(r'^.*\*\.(h|inc)$'), + re.compile(r'^.*/.*\.h$'), + re.compile(r'^ext/.*\.c$'), + re.compile(r'^orconfig.h$'), + re.compile(r'^micro-revision.i$'), +] + +def pattern_is_normal(s): + for p in ALLOWED_PATTERNS: + if p.match(s): + return True + return False + class Rules(object): """ A 'Rules' object is the parsed version of a .may_include file. """ def __init__(self, dirpath): self.dirpath = dirpath + if dirpath.startswith("src/"): + self.incpath = dirpath[4:] + else: + self.incpath = dirpath self.patterns = [] self.usedPatterns = set() def addPattern(self, pattern): + if not pattern_is_normal(pattern): + warn("Unusual pattern {} in {}".format(pattern, self.dirpath)) self.patterns.append(pattern) def includeOk(self, path): @@ -86,6 +109,20 @@ class Rules(object): if p not in self.usedPatterns: print("Pattern {} in {} was never used.".format(p, self.dirpath)) + def getAllowedDirectories(self): + allowed = [] + for p in self.patterns: + m = re.match(r'^(.*)/\*\.(h|inc)$', p) + if m: + allowed.append(m.group(1)) + continue + m = re.match(r'^(.*)/[^/]*$', p) + if m: + allowed.append(m.group(1)) + continue + + return allowed + def load_include_rules(fname): """ Read a rules file from 'fname', and return it as a Rules object. """ result = Rules(os.path.split(fname)[0]) @@ -99,6 +136,8 @@ def load_include_rules(fname): list_unused = False +uses_dirs = { } + for dirpath, dirnames, fnames in os.walk("src"): if ".may_include" in fnames: rules = load_include_rules(os.path.join(dirpath, RULES_FNAME)) @@ -108,8 +147,33 @@ for dirpath, dirnames, fnames in os.walk("src"): if list_unused: rules.noteUnusedRules() + uses_dirs[rules.incpath] = rules.getAllowedDirectories() + if trouble: err( """To change which includes are allowed in a C file, edit the {} files in its enclosing directory.""".format(RULES_FNAME)) sys.exit(1) + +all_levels = [] + +n = 0 +while uses_dirs: + n += 0 + cur_level = [] + for k in list(uses_dirs): + uses_dirs[k] = [ d for d in uses_dirs[k] + if (d in uses_dirs and d != k)] + if uses_dirs[k] == []: + cur_level.append(k) + for k in cur_level: + del uses_dirs[k] + n += 1 + if cur_level: + print(n, cur_level) + if n > 100: + break + +if uses_dirs: + print("Circular dependencies in here somewhere:", uses_dirs) + sys.exit(1)

1 0

[tor/master] changes file for no-circular-dependencies stuff (28362)
by nickm＠torproject.org 05 Dec '18

05 Dec '18

commit 5090fecaca61c87d52559342d6488ee8bb8fd20b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 7 11:02:03 2018 -0500 changes file for no-circular-dependencies stuff (28362) --- changes/ticket28362 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changes/ticket28362 b/changes/ticket28362 new file mode 100644 index 000000000..4ac22d50f --- /dev/null +++ b/changes/ticket28362 @@ -0,0 +1,6 @@ + o Code simplification and refactoring: + - The .may_include files that we use to describe our + directory-by-directory dependency structure now describe a noncircular + dependency graph over the directories that they cover. + Our checkIncludes.py tool now enforces this. + Closes ticket 28362.

1 0

[tor/master] Add an include to main.c
by nickm＠torproject.org 05 Dec '18

05 Dec '18

commit e420154ce77d9169bc72c373bfc7e29cb7245723 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 7 14:39:20 2018 -0500 Add an include to main.c --- src/app/main/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/main/main.c b/src/app/main/main.c index ec86c4639..59ab4ce40 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -71,6 +71,7 @@ #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_s2k.h" #include "lib/geoip/geoip.h" +#include "lib/net/resolve.h" #include "lib/process/waitpid.h"

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/508'
by nickm＠torproject.org 05 Dec '18

05 Dec '18

commit ca4b86f90a73532032a573ebc903155a32d0f36b Merge: c01507a5f eaff47352 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 5 08:19:02 2018 -0500 Merge remote-tracking branch 'tor-github/pr/508' .gitignore | 2 ++ Makefile.am | 2 ++ changes/ticket28362 | 6 ++++ scripts/maint/checkIncludes.py | 66 ++++++++++++++++++++++++++++++++++++ src/app/main/main.c | 4 ++- src/core/mainloop/connection.c | 2 +- src/core/mainloop/mainloop.c | 2 +- src/core/or/circuitlist.c | 2 +- src/core/or/connection_edge.c | 2 +- src/core/or/connection_or.c | 2 +- src/core/or/or.h | 2 +- src/core/or/relay.c | 2 +- src/core/or/scheduler.c | 2 +- src/core/or/scheduler_kist.c | 2 +- src/core/proto/proto_cell.c | 2 +- src/core/proto/proto_control0.c | 2 +- src/core/proto/proto_ext_or.c | 2 +- src/core/proto/proto_http.c | 2 +- src/core/proto/proto_socks.c | 2 +- src/ext/.may_include | 10 ++++++ src/ext/csiphash.c | 10 +++--- src/ext/readpassphrase.c | 2 +- src/ext/timeouts/.may_include | 6 ++++ src/ext/timeouts/timeout.c | 5 ++- src/ext/timeouts/timeout.h | 4 +-- src/feature/control/control.c | 2 +- src/feature/stats/geoip_stats.c | 2 +- src/include.am | 1 + src/lib/buf/.may_include | 10 ++++++ src/lib/{container => buf}/buffers.c | 2 +- src/lib/{container => buf}/buffers.h | 0 src/lib/buf/include.am | 17 ++++++++++ src/lib/compress/.may_include | 1 + src/lib/compress/compress_buf.c | 2 +- src/lib/container/.may_include | 9 ++--- src/lib/container/bloomfilt.c | 2 +- src/lib/container/include.am | 2 -- src/lib/container/map.c | 2 +- src/lib/container/map.h | 2 +- src/lib/crypt_ops/.may_include | 4 +-- src/lib/crypt_ops/crypto_init.c | 2 +- src/lib/crypt_ops/digestset.c | 2 +- src/lib/evloop/.may_include | 4 +-- src/lib/evloop/timers.c | 3 +- src/lib/evloop/workqueue.c | 2 +- src/lib/fs/.may_include | 2 +- src/lib/malloc/.may_include | 2 +- src/lib/memarea/.may_include | 2 +- src/lib/memarea/memarea.c | 3 +- src/lib/net/.may_include | 5 +-- src/lib/net/address.c | 2 +- src/lib/net/buffers_net.c | 2 +- src/lib/net/resolve.c | 13 +++++-- src/lib/net/resolve.h | 2 +- src/lib/process/.may_include | 2 +- src/lib/process/waitpid.c | 2 +- src/lib/sandbox/.may_include | 7 ++-- src/lib/sandbox/sandbox.c | 13 ++----- src/lib/smartlist_core/.may_include | 2 +- src/lib/string/.may_include | 4 +-- src/lib/string/compat_string.c | 4 +-- src/lib/term/.may_include | 3 +- src/lib/term/getpass.c | 2 +- src/lib/tls/.may_include | 6 ++-- src/lib/tls/buffers_tls.c | 2 +- src/lib/tls/tortls_openssl.c | 2 +- src/rust/build.rs | 3 +- src/test/fuzz/fuzz_http.c | 2 +- src/test/fuzz/fuzz_http_connect.c | 2 +- src/test/fuzz/fuzz_socks.c | 2 +- src/test/test.c | 2 +- src/test/test_buffers.c | 2 +- src/test/test_channelpadding.c | 2 +- src/test/test_channeltls.c | 2 +- src/test/test_extorport.c | 2 +- src/test/test_helpers.c | 2 +- src/test/test_oom.c | 2 +- src/test/test_proto_http.c | 2 +- src/test/test_proto_misc.c | 2 +- src/test/test_routerlist.c | 2 +- src/test/test_socks.c | 2 +- src/test/test_util.c | 2 +- 82 files changed, 226 insertions(+), 105 deletions(-)

1 0

[tor/master] Make sure sandbox-related getaddrinfo() functions always exist.
by nickm＠torproject.org 05 Dec '18

05 Dec '18

commit eaff47352a1ef607f6d97e9b35bd6d5eefdfcb26 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 13 17:02:15 2018 -0500 Make sure sandbox-related getaddrinfo() functions always exist. --- src/lib/net/resolve.c | 9 +++++++++ src/lib/net/resolve.h | 2 +- src/lib/sandbox/sandbox.c | 5 ----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/lib/net/resolve.c b/src/lib/net/resolve.c index 01f788296..95c1b171b 100644 --- a/src/lib/net/resolve.c +++ b/src/lib/net/resolve.c @@ -421,4 +421,13 @@ tor_make_getaddrinfo_cache_active(void) { sandbox_getaddrinfo_is_active = 1; } +#else +void +sandbox_disable_getaddrinfo_cache(void) +{ +} +void +tor_make_getaddrinfo_cache_active(void) +{ +} #endif diff --git a/src/lib/net/resolve.h b/src/lib/net/resolve.h index bf870c44c..39157aaa6 100644 --- a/src/lib/net/resolve.h +++ b/src/lib/net/resolve.h @@ -42,7 +42,6 @@ int tor_getaddrinfo(const char *name, const char *servname, struct addrinfo **res); void tor_freeaddrinfo(struct addrinfo *addrinfo); void tor_free_getaddrinfo_cache(void); -void tor_make_getaddrinfo_cache_active(void); #else /* !(defined(USE_SANDBOX_GETADDRINFO)) */ #define tor_getaddrinfo(name, servname, hints, res) \ getaddrinfo((name),(servname), (hints),(res)) @@ -54,5 +53,6 @@ void tor_make_getaddrinfo_cache_active(void); #endif /* defined(USE_SANDBOX_GETADDRINFO) */ void sandbox_disable_getaddrinfo_cache(void); +void tor_make_getaddrinfo_cache_active(void); #endif diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c index 947781855..ea738b273 100644 --- a/src/lib/sandbox/sandbox.c +++ b/src/lib/sandbox/sandbox.c @@ -1798,9 +1798,4 @@ sandbox_is_active(void) return 0; } -void -sandbox_disable_getaddrinfo_cache(void) -{ -} - #endif /* !defined(USE_LIBSECCOMP) */

1 0

[tor/master] Check that new listener connection is actually listening
by nickm＠torproject.org 05 Dec '18

05 Dec '18

commit 9369152aae9527cc3764cac8688f258b11bd503d Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Dec 3 14:28:32 2018 +0200 Check that new listener connection is actually listening --- src/core/mainloop/connection.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index eaad45c81..66a8b5147 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -1460,6 +1460,19 @@ connection_listener_new(const struct sockaddr *listensockaddr, tor_socket_strerror(tor_socket_errno(s))); goto err; } + +#ifndef __APPLE__ + int value; + socklen_t len = sizeof(value); + + if (!getsockopt(s, SOL_SOCKET, SO_ACCEPTCONN, &value, &len)) { + if (value == 0) { + log_err(LD_NET, "Could not listen on %s - " + "getsockopt(.,SO_ACCEPTCONN,.) yields 0.", address); + goto err; + } + } +#endif /* __APPLE__ */ #endif /* defined(HAVE_SYS_UN_H) */ } else { log_err(LD_BUG, "Got unexpected address family %d.",

1 0

[tor/master] More logging for #28229
by nickm＠torproject.org 05 Dec '18

05 Dec '18

commit 25f3b8244582c49db71c618c3859d7e7a89cd762 Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Mon Dec 3 14:40:37 2018 +0200 More logging for #28229 --- src/core/mainloop/connection.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 66a8b5147..9d5bad7d8 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -2907,6 +2907,10 @@ retry_all_listeners(smartlist_t *new_conns, int close_all_noncontrol) retval = -1; #ifdef ENABLE_LISTENER_REBIND + if (smartlist_len(replacements)) + log_debug(LD_NET, "%d replacements - starting rebinding loop.", + smartlist_len(replacements)); + SMARTLIST_FOREACH_BEGIN(replacements, listener_replacement_t *, r) { int addr_in_use = 0; int skip = 0; @@ -2918,8 +2922,11 @@ retry_all_listeners(smartlist_t *new_conns, int close_all_noncontrol) connection_listener_new_for_port(r->new_port, &skip, &addr_in_use); connection_t *old_conn = r->old_conn; - if (skip) + if (skip) { + log_debug(LD_NET, "Skipping creating new listener for %s:%d", + old_conn->address, old_conn->port); continue; + } connection_close_immediate(old_conn); connection_mark_for_close(old_conn);

1 0

[tor/master] remember why we are doing getsockopt()
by nickm＠torproject.org 05 Dec '18

05 Dec '18

commit c01507a5fe73d0e49902a8abaa1f73112ae1fefa Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 5 08:14:21 2018 -0500 remember why we are doing getsockopt() --- src/core/mainloop/connection.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 9d5bad7d8..55a1dd361 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -1462,6 +1462,7 @@ connection_listener_new(const struct sockaddr *listensockaddr, } #ifndef __APPLE__ + /* This code was introduced to help debug #28229. */ int value; socklen_t len = sizeof(value);

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/560'
by nickm＠torproject.org 05 Dec '18

05 Dec '18

commit 4c81ab5914c9ffa65bbc2668550a39164fd89284 Merge: df70bc3a8 db9ab3754 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 5 08:13:02 2018 -0500 Merge remote-tracking branch 'tor-github/pr/560' src/core/mainloop/connection.c | 22 +++++++++++++++++++++- src/test/test_rebind.py | 5 +++-- 2 files changed, 24 insertions(+), 3 deletions(-)

1 0