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

[tor/master] rust: Replace two `unwrap()`s in FFI code with `unwrap_or()`s.
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit 45c59eff6c0b261d1f868eb22e0bd36a39dfdbb3 Author: Isis Lovecruft <isis(a)torproject.org> Date: Sat Feb 10 01:21:31 2018 +0000 rust: Replace two `unwrap()`s in FFI code with `unwrap_or()`s. --- src/rust/protover/ffi.rs | 2 +- src/rust/protover/protover.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs index d724c102d..2ee0286ec 100644 --- a/src/rust/protover/ffi.rs +++ b/src/rust/protover/ffi.rs @@ -232,7 +232,7 @@ pub extern "C" fn protover_compute_for_old_tor(version: *const c_char) -> *const // we can see that the bytes we're passing into it 1) are valid UTF-8, // 2) have no intermediate NUL bytes, and 3) are terminated with a NUL // byte. - supported = CStr::from_bytes_with_nul(elder_protocols).unwrap(); + supported = CStr::from_bytes_with_nul(elder_protocols).unwrap_or(empty); supported.as_ptr() } diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 826f1b73f..25f776aed 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -110,7 +110,7 @@ pub fn get_supported_protocols() -> &'static str { // The `unwrap` is safe becauase we SUPPORTED_PROTOCOLS is under // our control. str::from_utf8(&SUPPORTED_PROTOCOLS[..SUPPORTED_PROTOCOLS.len() - 1]) - .unwrap() + .unwrap_or("") } pub struct SupportedProtocols(HashMap<Proto, Versions>);

1 0

[tor/master] Merge branch 'bug25120'
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit 627974b02ed9e5c286055272f34bd8c1ba268267 Merge: 1df701c08 14c47a0b5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 11 16:10:58 2018 -0500 Merge branch 'bug25120' src/common/crypto.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-)

1 0

[tor/master] Lower log-level in different error conditions in entropy selection.
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit 14c47a0b5c8965463957f8c8c9311bcb96885049 Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Feb 1 21:27:38 2018 +0100 Lower log-level in different error conditions in entropy selection. This patch lowers the log-level from warning to info in the cases where we are going to attempt another method as entropy source to hopefully make the user feel less concerned. See: https://bugs.torproject.org/25120 --- src/common/crypto.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 0dcffd2fb..f8da2fcf1 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1891,6 +1891,12 @@ crypto_strongest_rand_syscall(uint8_t *out, size_t out_len) { tor_assert(out_len <= MAX_STRONGEST_RAND_SIZE); + /* We only log at notice-level here because in the case that this function + * fails the crypto_strongest_rand_raw() caller will log with a warning-level + * message and let crypto_strongest_rand() error out and finally terminating + * Tor with an assertion error. + */ + #ifdef TOR_UNIT_TESTS if (break_strongest_rng_syscall) return -1; @@ -1903,13 +1909,13 @@ crypto_strongest_rand_syscall(uint8_t *out, size_t out_len) if (!provider_set) { if (!CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) { - log_warn(LD_CRYPTO, "Unable to set Windows CryptoAPI provider [1]."); + log_notice(LD_CRYPTO, "Unable to set Windows CryptoAPI provider [1]."); return -1; } provider_set = 1; } if (!CryptGenRandom(provider, out_len, out)) { - log_warn(LD_CRYPTO, "Unable get entropy from the Windows CryptoAPI."); + log_notice(LD_CRYPTO, "Unable get entropy from the Windows CryptoAPI."); return -1; } @@ -1951,14 +1957,14 @@ crypto_strongest_rand_syscall(uint8_t *out, size_t out_len) /* Useful log message for errno. */ if (errno == ENOSYS) { - log_warn(LD_CRYPTO, "Can't get entropy from getrandom()." - " You are running a version of Tor built to support" - " getrandom(), but the kernel doesn't implement this" - " function--probably because it is too old?" - " Trying fallback method instead."); + log_notice(LD_CRYPTO, "Can't get entropy from getrandom()." + " You are running a version of Tor built to support" + " getrandom(), but the kernel doesn't implement this" + " function--probably because it is too old?" + " Trying fallback method instead."); } else { - log_warn(LD_CRYPTO, "Can't get entropy from getrandom(): %s.", - " Trying fallback method instead." + log_notice(LD_CRYPTO, "Can't get entropy from getrandom(): %s.", + " Trying fallback method instead." strerror(errno)); } @@ -2020,10 +2026,10 @@ crypto_strongest_rand_fallback(uint8_t *out, size_t out_len) if (n != out_len) { /* LCOV_EXCL_START * We can't make /dev/foorandom actually fail. */ - log_warn(LD_CRYPTO, - "Error reading from entropy source %s (read only %lu bytes).", - filenames[i], - (unsigned long)n); + log_notice(LD_CRYPTO, + "Error reading from entropy source %s (read only %lu bytes).", + filenames[i], + (unsigned long)n); return -1; /* LCOV_EXCL_STOP */ }

1 0

[tor/master] fix compilation.
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit 7aa94f744112d224dd7a5523faef7a9b858ad5b1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 11 16:16:58 2018 -0500 fix compilation. --- src/common/crypto.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 6dce7d5e8..d85aca400 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1963,9 +1963,9 @@ crypto_strongest_rand_syscall(uint8_t *out, size_t out_len) " function--probably because it is too old?" " Trying fallback method instead."); } else { - log_notice(LD_CRYPTO, "Can't get entropy from getrandom(): %s.", - " Trying fallback method instead." - strerror(errno)); + log_notice(LD_CRYPTO, "Can't get entropy from getrandom(): %s." + " Trying fallback method instead.", + strerror(errno)); } getrandom_works = 0; /* Don't bother trying again. */

1 0

[tor/master] Slightly different wording for error cases around entropy source selection.
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit a2990081d516873d94643853d1a98b9cc3da55c4 Author: Alexander Færøy <ahf(a)torproject.org> Date: Thu Feb 1 21:25:33 2018 +0100 Slightly different wording for error cases around entropy source selection. This patch makes the wording around error cases for selecting an entropy source in Tor slightly more verbose. We also let the user know when something goes wrong that we are trying out a fallback method instead. See: https://bugs.torproject.org/25120 --- src/common/crypto.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/common/crypto.c b/src/common/crypto.c index 2ecf64c39..0dcffd2fb 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1903,13 +1903,13 @@ crypto_strongest_rand_syscall(uint8_t *out, size_t out_len) if (!provider_set) { if (!CryptAcquireContext(&provider, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) { - log_warn(LD_CRYPTO, "Can't get CryptoAPI provider [1]"); + log_warn(LD_CRYPTO, "Unable to set Windows CryptoAPI provider [1]."); return -1; } provider_set = 1; } if (!CryptGenRandom(provider, out_len, out)) { - log_warn(LD_CRYPTO, "Can't get entropy from CryptoAPI."); + log_warn(LD_CRYPTO, "Unable get entropy from the Windows CryptoAPI."); return -1; } @@ -1954,9 +1954,11 @@ crypto_strongest_rand_syscall(uint8_t *out, size_t out_len) log_warn(LD_CRYPTO, "Can't get entropy from getrandom()." " You are running a version of Tor built to support" " getrandom(), but the kernel doesn't implement this" - " function--probably because it is too old?"); + " function--probably because it is too old?" + " Trying fallback method instead."); } else { log_warn(LD_CRYPTO, "Can't get entropy from getrandom(): %s.", + " Trying fallback method instead." strerror(errno)); } @@ -2009,7 +2011,7 @@ crypto_strongest_rand_fallback(uint8_t *out, size_t out_len) size_t n; for (i = 0; filenames[i]; ++i) { - log_debug(LD_FS, "Considering %s for entropy", filenames[i]); + log_debug(LD_FS, "Considering %s as entropy source", filenames[i]); fd = open(sandbox_intern_string(filenames[i]), O_RDONLY, 0); if (fd<0) continue; log_info(LD_CRYPTO, "Reading entropy from \"%s\"", filenames[i]); @@ -2019,7 +2021,8 @@ crypto_strongest_rand_fallback(uint8_t *out, size_t out_len) /* LCOV_EXCL_START * We can't make /dev/foorandom actually fail. */ log_warn(LD_CRYPTO, - "Error reading from entropy source (read only %lu bytes).", + "Error reading from entropy source %s (read only %lu bytes).", + filenames[i], (unsigned long)n); return -1; /* LCOV_EXCL_STOP */

1 0

[tor/master] chnages file for 25120
by nickm＠torproject.org 12 Feb '18

12 Feb '18

commit 3834441a72857fdc637f67d908acd3efd8ab0f12 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 11 16:14:19 2018 -0500 chnages file for 25120 --- changes/bug25120 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug25120 b/changes/bug25120 new file mode 100644 index 000000000..7215756ef --- /dev/null +++ b/changes/bug25120 @@ -0,0 +1,4 @@ + o Minor features (logging): + - Clarify the log messages produced when getrandom() or a related + entropy-generation mechanism gives an error. Closes ticket + 25120.

1 0

[doctor/master] Notify if flag count substantially differ
by atagar＠torproject.org 11 Feb '18

11 Feb '18

commit 894501335535e04668fb63f3aadd5f25c7318ebe Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Feb 11 12:50:42 2018 -0800 Notify if flag count substantially differ Recently dannenberg stopped issuing the Exit flag. Check Requested by nusenu... https://lists.torproject.org/pipermail/tor-dev/2018-February/012918.html --- consensus_health_checker.py | 30 ++++++++++++++++++++++++++++++ data/consensus_health.cfg | 1 + 2 files changed, 31 insertions(+) diff --git a/consensus_health_checker.py b/consensus_health_checker.py index 23f3f9d..e91e292 100755 --- a/consensus_health_checker.py +++ b/consensus_health_checker.py @@ -321,6 +321,7 @@ def run_checks(consensuses, votes): voting_bandwidth_scanners, #unmeasured_relays, has_authority_flag, + has_similar_flag_counts, is_recommended_versions, bad_exits_in_sync, bandwidth_authorities_in_sync, @@ -612,6 +613,35 @@ def has_authority_flag(latest_consensus, consensuses, votes): return issues +def has_similar_flag_counts(latest_consensus, consensuses, votes): + "Checks that flags issued by authorities are similar." + + issues = [] + flag_count = {} # {flag => count} + + for desc in latest_consensus.routers.values(): + for flag in desc.flags: + flag_count[flag] = flag_count.setdefault(flag, 0) + 1 + + for authority, vote in votes.items(): + authority_flag_count = {} + + for desc in vote.routers.values(): + for flag in desc.flags: + authority_flag_count[flag] = authority_flag_count.setdefault(flag, 0) + 1 + + for flag, count in flag_count.items(): + if flag == 'BadExit': + continue + + vote_count = authority_flag_count.get(flag, 0) + + if vote_count > count * 1.5 or vote_count < count * 0.5: + issues.append(Issue(Runlevel.NOTICE, 'FLAG_COUNT_DIFFERS', authority = authority, flag = flag, consensus_count = count, vote_count = vote_count, to = [authority])) + + return issues + + def has_expected_fingerprints(latest_consensus, consensuses, votes): "Checks that the authorities have the fingerprints that we expect." diff --git a/data/consensus_health.cfg b/data/consensus_health.cfg index 423ab6d..326aa20 100644 --- a/data/consensus_health.cfg +++ b/data/consensus_health.cfg @@ -14,6 +14,7 @@ msg TOO_MANY_UNMEASURED_RELAYS => As a bandwidth authority {authority} lacked a msg MISSING_VOTES => The consensuses downloaded from the following authorities are missing votes that are contained in consensuses downloaded from other authorities: {authorities} msg MISSING_AUTHORITIES => The following authorities are missing from the consensus: {authorities} msg EXTRA_AUTHORITIES => The following authorities were not expected in the consensus: {authorities} +msg FLAG_COUNT_DIFFERS => {authority} had {vote_count} {flag} flags in its vote but the consensus had {consensus_count} msg FINGERPRINT_MISMATCH => {authority} had a different fingerprint than we expected (expected: {expected}, actual: {actual}) msg TOR_OUT_OF_DATE => The following authorities are an out of date version of tor: {authorities} msg BADEXIT_OUT_OF_SYNC => Authorities disagree about the BadExit flag for {fingerprint} ({counts})

1 0

[translation/liveusb-creator_completed] Update translations for liveusb-creator_completed
by translation＠torproject.org 11 Feb '18

11 Feb '18

commit 98b84846338054e03e8fcb7f1887fd1c371273ea Author: Translation commit bot <translation(a)torproject.org> Date: Sat Feb 10 21:15:59 2018 +0000 Update translations for liveusb-creator_completed --- sv/sv.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/sv.po b/sv/sv.po index bf39d6b33..73604d9bc 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-10 15:57+0100\n" -"PO-Revision-Date: 2018-02-10 20:44+0000\n" +"PO-Revision-Date: 2018-02-10 20:52+0000\n" "Last-Translator: Jacob Andersson <jacob.c.andersson(a)protonmail.com>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 11 Feb '18

11 Feb '18

commit c03b919235073897cef3e90cddad14267e5b291c Author: Translation commit bot <translation(a)torproject.org> Date: Sat Feb 10 21:15:53 2018 +0000 Update translations for liveusb-creator --- sv/sv.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sv/sv.po b/sv/sv.po index bf39d6b33..73604d9bc 100644 --- a/sv/sv.po +++ b/sv/sv.po @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-10 15:57+0100\n" -"PO-Revision-Date: 2018-02-10 20:44+0000\n" +"PO-Revision-Date: 2018-02-10 20:52+0000\n" "Last-Translator: Jacob Andersson <jacob.c.andersson(a)protonmail.com>\n" "Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n" "MIME-Version: 1.0\n"

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2
by nickm＠torproject.org 11 Feb '18

11 Feb '18

commit 4de20d175476ab684ca15ea794af729348297540 Merge: 84bc75b2e 86583ad78 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Feb 10 16:09:01 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24978 | 7 +++++++ src/common/ciphers.inc | 21 ++++++++++++++++++++- src/common/tortls.c | 28 +++++++++++++++++++++++++--- 3 files changed, 52 insertions(+), 4 deletions(-)

1 0