September 2017 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'bug23533_031' into maint-0.3.1
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit 49b5ad6b75f5f9e223a92033d9b3930e3e1d132f Merge: b440560b8 e05414d24 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 15 14:39:23 2017 -0400 Merge branch 'bug23533_031' into maint-0.3.1 changes/bug23533 | 4 ++++ src/or/channel.c | 2 +- src/or/channeltls.c | 2 +- src/or/rephist.c | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.1] Merge branch 'bug23533_031' into maint-0.3.1
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit 49b5ad6b75f5f9e223a92033d9b3930e3e1d132f Merge: b440560b8 e05414d24 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 15 14:39:23 2017 -0400 Merge branch 'bug23533_031' into maint-0.3.1 changes/bug23533 | 4 ++++ src/or/channel.c | 2 +- src/or/channeltls.c | 2 +- src/or/rephist.c | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-)

1 0

[tor/release-0.3.1] Fix several places where md-using relays would get wrong behavior.
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit e05414d2411a5354dc43bde3a791938697a9799b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 6 16:26:47 2017 -0400 Fix several places where md-using relays would get wrong behavior. This patch replaces a few calls to router_get_by_id_digest ("do we have a routerinfo?") with connection_or_digest_is_known_relay ("do we know this relay to be in the consensus, or have been there some time recently?"). Found while doing the 21585 audit; fixes bug 23533. Bugfix on 0.3.0.1-alpha. --- changes/bug23533 | 4 ++++ src/or/channel.c | 2 +- src/or/channeltls.c | 2 +- src/or/rephist.c | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/changes/bug23533 b/changes/bug23533 new file mode 100644 index 000000000..b5bfdc0ce --- /dev/null +++ b/changes/bug23533 @@ -0,0 +1,4 @@ + o Minor bugfixes (relay): + - Inform the geoip and rephist modules about all requests, even + on relays that are only fetching microdescriptors. Fixes a bug related + to 21585; bugfix on 0.3.0.1-alpha. diff --git a/src/or/channel.c b/src/or/channel.c index 17b2191b7..2970b9679 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -2696,7 +2696,7 @@ channel_do_open_actions(channel_t *chan) router_set_status(chan->identity_digest, 1); } else { /* only report it to the geoip module if it's not a known router */ - if (!router_get_by_id_digest(chan->identity_digest)) { + if (!connection_or_digest_is_known_relay(chan->identity_digest)) { if (channel_get_addr_if_possible(chan, &remote_addr)) { char *transport_name = NULL; if (chan->get_transport_name(chan, &transport_name) < 0) diff --git a/src/or/channeltls.c b/src/or/channeltls.c index f44e4fc8e..c6a0bb21e 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1823,7 +1823,7 @@ channel_tls_process_netinfo_cell(cell_t *cell, channel_tls_t *chan) /** Warn when we get a netinfo skew with at least this value. */ #define NETINFO_NOTICE_SKEW 3600 if (labs(apparent_skew) > NETINFO_NOTICE_SKEW && - router_get_by_id_digest(chan->conn->identity_digest)) { + connection_or_digest_is_known_relay(chan->conn->identity_digest)) { int trusted = router_digest_is_trusted_dir(chan->conn->identity_digest); clock_skew_warning(TO_CONN(chan->conn), apparent_skew, trusted, LD_GENERAL, "NETINFO cell", "OR"); diff --git a/src/or/rephist.c b/src/or/rephist.c index 72a5cc5a9..6a589379b 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -947,9 +947,9 @@ rep_hist_record_mtbf_data(time_t now, int missing_means_down) base16_encode(dbuf, sizeof(dbuf), digest, DIGEST_LEN); if (missing_means_down && hist->start_of_run && - !router_get_by_id_digest(digest)) { + !connection_or_digest_is_known_relay(digest)) { /* We think this relay is running, but it's not listed in our - * routerlist. Somehow it fell out without telling us it went + * consensus. Somehow it fell out without telling us it went * down. Complain and also correct it. */ log_info(LD_HIST, "Relay '%s' is listed as up in rephist, but it's not in "

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit ee2e3e852adbfdd780a22f8b186f23ccd6c929e9 Merge: d7eef6114 49b5ad6b7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 15 14:40:57 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23533 | 4 ++++ src/or/channel.c | 2 +- src/or/channeltls.c | 2 +- src/or/rephist.c | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-)

1 0

[tor/master] kist: Cast, then do operations on int32.
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit a01e4a1a957bc6a500930bb1221adf3b916d65f9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 15 14:30:19 2017 -0400 kist: Cast, then do operations on int32. Otherwise integer overflows can happen. Remember, doing a i32xi32 multiply doesn't actually produce a 64-bit output. You need to do i64xi32 or i64xi64. Coverity found this as CID 1417753 --- src/or/scheduler_kist.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/scheduler_kist.c b/src/or/scheduler_kist.c index f119cd696..8595a340e 100644 --- a/src/or/scheduler_kist.c +++ b/src/or/scheduler_kist.c @@ -266,7 +266,7 @@ update_socket_info_impl, (socket_table_ent_t *ent)) /* Assuming all these values from the kernel are uint32_t still, they will * always fit into a int64_t tcp_space variable. */ - tcp_space = (ent->cwnd - ent->unacked) * ent->mss; + tcp_space = (ent->cwnd - ent->unacked) * (int64_t)ent->mss; if (tcp_space < 0) { tcp_space = 0; } @@ -277,7 +277,8 @@ update_socket_info_impl, (socket_table_ent_t *ent)) * we end up negative, but then we just set extra_space to 0 in the sanity * check.*/ extra_space = - clamp_double_to_int64((ent->cwnd * ent->mss) * sock_buf_size_factor) - + clamp_double_to_int64( + (ent->cwnd * (int64_t)ent->mss) * sock_buf_size_factor) - ent->notsent; if (extra_space < 0) { extra_space = 0;

1 0

[tor/master] Use different variable names for pw_uid usages
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit 75659fd548cbb6d597c9cf3fc6748f9771a746e9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 15 14:26:59 2017 -0400 Use different variable names for pw_uid usages Catalyst points out that using pw_uid for two different purposes here is likely to be confusing. --- src/common/util.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/common/util.c b/src/common/util.c index 40f05468d..6b1b4296b 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2323,21 +2323,27 @@ check_private_dir,(const char *dirname, cpd_check_t check, running_gid = getgid(); } if (st.st_uid != running_uid) { - const struct passwd *pw_uid = NULL; - char *process_ownername = NULL; + char *process_ownername = NULL, *file_ownername = NULL; - pw_uid = tor_getpwuid(running_uid); - process_ownername = pw_uid ? tor_strdup(pw_uid->pw_name) : - tor_strdup("<unknown>"); + { + const struct passwd *pw_running = tor_getpwuid(running_uid); + process_ownername = pw_running ? tor_strdup(pw_running->pw_name) : + tor_strdup("<unknown>"); + } - pw_uid = tor_getpwuid(st.st_uid); + { + const struct passwd *pw_stat = tor_getpwuid(st.st_uid); + file_ownername = pw_stat ? tor_strdup(pw_stat->pw_name) : + tor_strdup("<unknown>"); + } log_warn(LD_FS, "%s is not owned by this user (%s, %d) but by " "%s (%d). Perhaps you are running Tor as the wrong user?", dirname, process_ownername, (int)running_uid, - pw_uid ? pw_uid->pw_name : "<unknown>", (int)st.st_uid); + file_ownername, (int)st.st_uid); tor_free(process_ownername); + tor_free(file_ownername); close(fd); return -1; }

1 0

[tor/master] Log correctly on owner/user mismatch.
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit 7ee486c15f51177016baf85c1d21244b84667dc2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 12 17:37:25 2017 -0400 Log correctly on owner/user mismatch. Found with clang's scan-build while looking at dead assignments. Fixes bug 23487; bugfix on 1135405c8c6ea31 in 0.2.9.1-alpha --- changes/bug23487 | 5 +++++ src/common/util.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/changes/bug23487 b/changes/bug23487 new file mode 100644 index 000000000..89b55c243 --- /dev/null +++ b/changes/bug23487 @@ -0,0 +1,5 @@ + o Minor bugfixes (logging): + - When warning about a directory owned by the wrong user, log the actual + name of the user owning the directory. Previously, we'd log the name + of the process owner twice. Fixes bug 23487; bugfix on 0.2.9.1-alpha. + diff --git a/src/common/util.c b/src/common/util.c index d2cbacde3..40f05468d 100644 --- a/src/common/util.c +++ b/src/common/util.c @@ -2334,8 +2334,8 @@ check_private_dir,(const char *dirname, cpd_check_t check, log_warn(LD_FS, "%s is not owned by this user (%s, %d) but by " "%s (%d). Perhaps you are running Tor as the wrong user?", - dirname, process_ownername, (int)running_uid, - pw ? pw->pw_name : "<unknown>", (int)st.st_uid); + dirname, process_ownername, (int)running_uid, + pw_uid ? pw_uid->pw_name : "<unknown>", (int)st.st_uid); tor_free(process_ownername); close(fd);

1 0

[tor/master] Merge branch 'bug23487_029'
by nickm＠torproject.org 15 Sep '17

15 Sep '17

commit 9201e4c74b10c28b551e6ac4d4e1830f5386b481 Merge: 03e102c1b 75659fd54 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 15 14:27:58 2017 -0400 Merge branch 'bug23487_029' changes/bug23487 | 5 +++++ src/common/util.c | 22 ++++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-)

1 0

[stem/master] Ignore .travis.yml in test
by atagar＠torproject.org 15 Sep '17

15 Sep '17

commit 2a0403995c67e17c862d4eefd10141383742ae00 Author: Edmund Wong <ewongbb(a)pw-wspx.org> Date: Fri Sep 15 14:31:06 2017 +0800 Ignore .travis.yml in test --- test/integ/installation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integ/installation.py b/test/integ/installation.py index 04d8d1fd..0fe0351a 100644 --- a/test/integ/installation.py +++ b/test/integ/installation.py @@ -128,7 +128,7 @@ class TestInstallation(unittest.TestCase): issues = [] for path in git_contents: - if path not in tar_contents and path not in ['.gitignore']: + if path not in tar_contents and path not in ['.gitignore', '.travis.yml']: issues.append(' * %s is missing from our release tarball' % path) for path in tar_contents:

1 0

[stem/master] Ignore .travis.yml file in tests
by atagar＠torproject.org 15 Sep '17

15 Sep '17

commit ce15c3bd497e60949bf7f07fd8136f82c40e7735 Author: Edmund Wong <ewongbb(a)pw-wspx.org> Date: Fri Sep 15 14:27:22 2017 +0800 Ignore .travis.yml file in tests --- test/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/test/__init__.py b/test/__init__.py index 5a4c6e98..2b52beb2 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -73,6 +73,9 @@ with open(os.path.join(STEM_BASE, '.gitignore')) as ignore_file: if line.startswith('*.'): IGNORED_FILE_TYPES.append(line[2:].strip()) +if os.path.exists(os.path.join(STEM_BASE, '.travis.yml')): + IGNORED_FILE_TYPES.append('.travis.yml') + def get_new_capabilities(): """

1 0