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

[tor/master] Merge remote-tracking branch 'asn/bug23670'
by nickm＠torproject.org 03 Oct '17

03 Oct '17

commit 783a44b2cd92fc98d9c2894945a5d11396e20e64 Merge: bc6769e0d f7306b16e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 3 09:05:16 2017 -0400 Merge remote-tracking branch 'asn/bug23670' changes/bug23670 | 3 +++ src/or/entrynodes.c | 41 ++++++++++++++++++++++++++++++----------- src/or/entrynodes.h | 8 +++++--- src/or/nodelist.c | 21 +++++++++++++-------- src/test/test_entrynodes.c | 21 +++++++++++++++++++++ 5 files changed, 72 insertions(+), 22 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'catalyst-oniongit/bug23739'
by nickm＠torproject.org 03 Oct '17

03 Oct '17

commit bc6769e0d4a089c9fb3aec4cb48ad7321c499ecf Merge: a6c62cbd1 6a2a49e66 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 3 09:04:21 2017 -0400 Merge remote-tracking branch 'catalyst-oniongit/bug23739' changes/bug23739 | 3 +++ doc/HACKING/HelpfulTools.md | 22 +++++++++++++++------- doc/HACKING/WritingTests.md | 6 +++++- 3 files changed, 23 insertions(+), 8 deletions(-)

1 0

[tor/master] Improve docs on using gcov
by nickm＠torproject.org 03 Oct '17

03 Oct '17

commit 6a2a49e6616702c39e56c21091167316a82fcc85 Author: Taylor Yu <catalyst(a)torproject.org> Date: Mon Oct 2 14:51:48 2017 -0500 Improve docs on using gcov Add more explanation in doc/HACKING about how to read gcov output, including a reference to the gcov documentation in the GCC manual. Also add details about how our postprocessing scripts modify gcov output. --- changes/bug23739 | 3 +++ doc/HACKING/HelpfulTools.md | 22 +++++++++++++++------- doc/HACKING/WritingTests.md | 6 +++++- 3 files changed, 23 insertions(+), 8 deletions(-) diff --git a/changes/bug23739 b/changes/bug23739 new file mode 100644 index 000000000..3207b5eaf --- /dev/null +++ b/changes/bug23739 @@ -0,0 +1,3 @@ + o Minor bugfixes (documentation): + - Document better how to read gcov and what our postprocessing scripts do. + Fixes bug 23739; bugfix on 0.2.9.1-alpha. diff --git a/doc/HACKING/HelpfulTools.md b/doc/HACKING/HelpfulTools.md index b8ba2aa40..f919d08ec 100644 --- a/doc/HACKING/HelpfulTools.md +++ b/doc/HACKING/HelpfulTools.md @@ -111,15 +111,19 @@ Running gcov for unit test coverage (On OSX, you'll need to start with `--enable-coverage CC=clang`.) -Then, look at the .gcov files in `coverage-output`. '-' before a line means -that the compiler generated no code for that line. '######' means that the -line was never reached. Lines with numbers were called that number of times. - If that doesn't work: * Try configuring Tor with `--disable-gcc-hardening` * You might need to run `make clean` after you run `./configure`. +Then, look at the .gcov files in `coverage-output`. '-' before a line means +that the compiler generated no code for that line. '######' means that the +line was never reached. Lines with numbers were called that number of times. + +For more details about how to read gcov output, see the [Invoking +gcov](https://gcc.gnu.org/onlinedocs/gcc/Invoking-Gcov.html) chapter +of the GCC manual. + If you make changes to Tor and want to get another set of coverage results, you can run `make reset-gcov` to clear the intermediary gcov output. @@ -128,9 +132,13 @@ a meaningful diff between them, you can run: ./scripts/test/cov-diff coverage-output1 coverage-output2 | less -In this diff, any lines that were visited at least once will have coverage -"1". This lets you inspect what you (probably) really want to know: which -untested lines were changed? Are there any new untested lines? +In this diff, any lines that were visited at least once will have coverage "1", +and line numbers are deleted. This lets you inspect what you (probably) really +want to know: which untested lines were changed? Are there any new untested +lines? + +If you run ./scripts/test/cov-exclude, it marks excluded unreached +lines with 'x', and excluded reached lines with '!!!'. Running integration tests ------------------------- diff --git a/doc/HACKING/WritingTests.md b/doc/HACKING/WritingTests.md index 4dae41e92..cc393494e 100644 --- a/doc/HACKING/WritingTests.md +++ b/doc/HACKING/WritingTests.md @@ -91,6 +91,9 @@ coverage percentage. For a summary of the test coverage for each _function_, run `./scripts/test/cov-display -f ${TMPDIR}/*`. +For more details on using gcov, including the helper scripts in +scripts/test, see HelpfulTools.md. + ### Comparing test coverage Sometimes it's useful to compare test coverage for a branch you're writing to @@ -117,7 +120,8 @@ with LCOV_EXCL_START... LCOV_EXCL_STOP. Note that older versions of lcov don't understand these lines. You can post-process .gcov files to make these lines 'unreached' by -running ./scripts/test/cov-exclude on them. +running ./scripts/test/cov-exclude on them. It marks excluded +unreached lines with 'x', and excluded reached lines with '!!!'. Note: you should never do this unless the line is meant to 100% unreachable by actual code.

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 03 Oct '17

03 Oct '17

commit 4141a2f553b0b62eb5f226850afd0a682e0f9eb6 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 3 12:45:28 2017 +0000 Update translations for whisperback --- ga/ga.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ga/ga.po b/ga/ga.po index d4b334d10..a45ecfe05 100644 --- a/ga/ga.po +++ b/ga/ga.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-10-03 00:05+0000\n" +"PO-Revision-Date: 2017-10-03 12:37+0000\n" "Last-Translator: Kevin Scannell <kscanne(a)gmail.com>\n" "Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n" "MIME-Version: 1.0\n" @@ -119,7 +119,7 @@ msgid "" "As a work-around you can save the bug report as a file on a USB drive and try to send it to us at %s from your email account using another system. Note that your bug report will not be anonymous when doing so unless you take further steps yourself (e.g. using Tor with a throw-away email account).\n" "\n" "Do you want to save the bug report to a file?" -msgstr "Níorbh fhéidir linn an fabht a thuairisciú, is dócha mar gheall ar fhadhbanna líonra.\n\nMar sheift shealadach, is féidir leat an tuairisc a shábháil mar chomhad ar mhéaróg USB agus í a sheoladh chugainn ag %s ó do chuntas ríomhphoist ar ríomhaire eile. Tabhair faoi deara go mbeidh do chuid sonraí pearsanta ceangailte leis an tuairisc mura nglacann tú céimeanna breise (m.sh. Tor a úsáid le cuntas rphoist indiúscartha).\n\nAn bhfuil fonn ort an tuairisc a shábháil i gcomhad?" +msgstr "Níorbh fhéidir linn an tuairisc a sheoladh, is dócha mar gheall ar fhadhbanna líonra.\n\nMar sheift shealadach, is féidir leat an tuairisc a shábháil mar chomhad ar mhéaróg USB agus í a sheoladh chugainn ag %s ó do chuntas ríomhphoist ar ríomhaire eile. Tabhair faoi deara go mbeidh do chuid sonraí pearsanta ceangailte leis an tuairisc mura nglacann tú céimeanna breise (m.sh. Tor a úsáid le cuntas rphoist indiúscartha).\n\nAn bhfuil fonn ort an tuairisc a shábháil i gcomhad?" #: ../whisperBack/gui.py:383 ../data/whisperback.ui.h:21 msgid "WhisperBack" @@ -170,7 +170,7 @@ msgid "" "\n" "You should have received a copy of the GNU General Public License\n" "along with this program. If not, see <http://www.gnu.org/licenses/>.\n" -msgstr "WhisperBack - Seol aiseolas i dteachtaireacht chriptithe\nCóipcheart (C) 2009-2012 Forbróirí Tails <tails(a)boum.org>\n\nIs saorbhogearra é an ríomhchlár seo; tá cead agat é a scaipeadh agus/nó\na athrú de réir na gcoinníollacha sa GNU General Public License mar atá foilsithe\nag an Free Software Foundation; faoi leagan 3 den cheadúnas, nó\n(más mian leat) aon leagan níos déanaí.\n\nScaiptear an ríomhchlár seo le súil go mbeidh sé áisiúil, ach GAN AON BHARÁNTA; fiú gan barántas intuigthe INDÍOLTACHTA nó FEILIÚNACHTA D'FHEIDHM AR LEITH. Féach ar an GNU General Public License chun níos mó sonraí a fháil.\n\nBa chóir go mbeifeá tar éis cóip den GNU General Public License a fháil in éineacht leis an ríomhchlár seo; mura bhfuair, féach <http://www.gnu.org/licenses/>.\n" +msgstr "WhisperBack - Seol aiseolas i dteachtaireacht chriptithe\nCóipcheart (C) 2009-2012 Forbróirí Tails <tails(a)boum.org>\n\nIs saorbhogearra é an ríomhchlár seo; tá cead agat é a scaipeadh agus/nó\na athrú de réir na gcoinníollacha sa GNU General Public License mar atá foilsithe\nag an Free Software Foundation; faoi leagan 3 den cheadúnas, nó\n(más mian leat) aon leagan níos déanaí.\n\nScaiptear an ríomhchlár seo le súil go mbeidh sé áisiúil, ach GAN AON BHARÁNTA; fiú gan baránta intuigthe INDÍOLTACHTA nó FEILIÚNACHTA D'FHEIDHM AR LEITH. Féach ar an GNU General Public License chun níos mó sonraí a fháil.\n\nBa chóir go mbeifeá tar éis cóip den GNU General Public License a fháil in éineacht leis an ríomhchlár seo; mura bhfuair, féach <http://www.gnu.org/licenses/>.\n" #: ../data/whisperback.ui.h:20 msgid ""

1 0

[tor/master] Fix our "not an HTTP Proxy" message in light of HTTPTunnelPort
by nickm＠torproject.org 03 Oct '17

03 Oct '17

commit ad4dcd7d1ac55007768a37b532e98e3628bbef0f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 2 12:53:13 2017 -0400 Fix our "not an HTTP Proxy" message in light of HTTPTunnelPort When we added HTTPTunnelPort, the answer that we give when you try to use your SOCKSPort as an HTTP proxy became wrong. Now we explain that Tor sorta _is_ an HTTP proxy, but a SOCKSPort isn't. I have left the status line the same, in case anything is depending on it. I have removed the extra padding for Internet Explorer, since the message is well over 512 bytes without it. Fixes bug 23678; bugfix on 0.3.2.1-alpha. --- changes/bug23678 | 7 +++++++ src/or/proto_socks.c | 19 ++++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/changes/bug23678 b/changes/bug23678 new file mode 100644 index 000000000..8138ea71e --- /dev/null +++ b/changes/bug23678 @@ -0,0 +1,7 @@ + o Minor bugfixes (warnings): + - When we get an HTTP request on a SOCKS port, tell the user about + the new HTTPTunnelPort option. Previously, we would give a + "Tor is not an HTTP Proxy" message, which stopped being true when + HTTPTunnelPort was introduced. Fixes bug 23678; bugfix on + 0.3.2.1-alpha. + diff --git a/src/or/proto_socks.c b/src/or/proto_socks.c index 4189c0c66..7649fcc4b 100644 --- a/src/or/proto_socks.c +++ b/src/or/proto_socks.c @@ -160,23 +160,23 @@ static const char SOCKS_PROXY_IS_NOT_AN_HTTP_PROXY_MSG[] = "Content-Type: text/html; charset=iso-8859-1\r\n\r\n" "<html>\n" "<head>\n" - "<title>Tor is not an HTTP Proxy</title>\n" + "<title>This is a SOCKS Proxy, Not An HTTP Proxy</title>\n" "</head>\n" "<body>\n" - "<h1>Tor is not an HTTP Proxy</h1>\n" + "<h1>This is a SOCKs proxy, not an HTTP proxy.</h1>\n" "<p>\n" - "It appears you have configured your web browser to use Tor as " - "an HTTP proxy.\n\n" - "This is not correct: Tor is a SOCKS proxy, not an HTTP proxy.\n" + "It appears you have configured your web browser to use this Tor port as\n" + "an HTTP proxy.\n" + "</p><p>\n" + "This is not correct: This port is configured as a SOCKS proxy, not\n" + "an HTTP proxy. If you need an HTTP proxy tunnel, use the HTTPTunnelPort\n" + "configuration option in place of, or in addition to, SOCKSPort.\n" "Please configure your client accordingly.\n" "</p>\n" "<p>\n" "See <a href=\"https://www.torproject.org/documentation.html\">" "https://www.torproject.org/documentation.html</a> for more " "information.\n" - "\n" "</p>\n" "</body>\n" "</html>\n"; @@ -544,7 +544,8 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, /* fall through */ default: /* version is not socks4 or socks5 */ log_warn(LD_APP, - "Socks version %d not recognized. (Tor is not an http proxy.)", + "Socks version %d not recognized. (This port is not an " + "HTTP proxy; did you want to use HTTPTunnelPort?)", *(data)); { /* Tell the controller the first 8 bytes. */

1 0

[tor/master] Follow-up on 23678: fix socks/wrong_protocol test
by nickm＠torproject.org 03 Oct '17

03 Oct '17

commit f923aeee1b14c2f64a657049ba46e68d70f53a0f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 3 08:17:41 2017 -0400 Follow-up on 23678: fix socks/wrong_protocol test --- src/test/test_socks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_socks.c b/src/test/test_socks.c index 156845368..9ae7530e2 100644 --- a/src/test/test_socks.c +++ b/src/test/test_socks.c @@ -763,7 +763,7 @@ test_socks_wrong_protocol(void *ptr) tt_int_op(fetch_from_buf_socks(buf, socks, 1, 0), OP_EQ, -1); buf_clear(buf); expect_log_msg_containing("Socks version 71 not recognized. " - "(Tor is not an http proxy.)"); + "(This port is not an HTTP proxy;"); mock_clean_saved_logs(); socks_request_clear(socks);

1 0

[tor/master] Merge branch 'bug23678_032'
by nickm＠torproject.org 03 Oct '17

03 Oct '17

commit a6c62cbd13750bf12d72a07e9552ea0e8de0b2b7 Merge: f2e820c45 f923aeee1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 3 08:18:08 2017 -0400 Merge branch 'bug23678_032' changes/bug23678 | 7 +++++++ src/or/proto_socks.c | 19 ++++++++++--------- src/test/test_socks.c | 2 +- 3 files changed, 18 insertions(+), 10 deletions(-)

1 0

[tor/master] torcert.c: mark some lines unreachable by tests
by nickm＠torproject.org 03 Oct '17

03 Oct '17

commit f2e820c45ff298eee56478ebb0921aecc55cc39a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 2 14:25:25 2017 -0400 torcert.c: mark some lines unreachable by tests These are related to handling of failures on functions which can't fail. --- src/or/torcert.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/or/torcert.c b/src/or/torcert.c index 05a0a518e..befb39d6e 100644 --- a/src/or/torcert.c +++ b/src/or/torcert.c @@ -76,29 +76,38 @@ tor_cert_sign_impl(const ed25519_keypair_t *signing_key, ed25519_signature_t signature; if (ed25519_sign(&signature, encoded, real_len-ED25519_SIG_LEN, signing_key)<0) { + /* LCOV_EXCL_START */ log_warn(LD_BUG, "Can't sign certificate"); goto err; + /* LCOV_EXCL_STOP */ } memcpy(sig, signature.sig, ED25519_SIG_LEN); torcert = tor_cert_parse(encoded, real_len); if (! torcert) { + /* LCOV_EXCL_START */ log_warn(LD_BUG, "Generated a certificate we cannot parse"); goto err; + /* LCOV_EXCL_STOP */ } if (tor_cert_checksig(torcert, &signing_key->pubkey, now) < 0) { + /* LCOV_EXCL_START */ log_warn(LD_BUG, "Generated a certificate whose signature we can't check"); goto err; + /* LCOV_EXCL_STOP */ } tor_free(encoded); goto done; + /* LCOV_EXCL_START */ err: tor_cert_free(torcert); torcert = NULL; + /* LCOV_EXCL_STOP */ + done: ed25519_cert_free(cert); tor_free(encoded); @@ -675,8 +684,10 @@ tor_cert_encode_ed22519(const tor_cert_t *cert, char **cert_str_out) if (base64_encode(ed_cert_b64, ed_cert_b64_len, (const char *) cert->encoded, cert->encoded_len, BASE64_ENCODE_MULTILINE) < 0) { + /* LCOV_EXCL_START */ log_err(LD_BUG, "Couldn't base64-encode ed22519 cert!"); goto err; + /* LCOV_EXCL_STOP */ } /* Put everything together in a NUL terminated string. */

1 0

[tor/master] Make the fp_pair_map tests cover {get, set}_by_digests
by nickm＠torproject.org 03 Oct '17

03 Oct '17

commit bb7288b2c31c8a73654408a421681fd19778b835 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 2 13:59:08 2017 -0400 Make the fp_pair_map tests cover {get,set}_by_digests --- src/test/test_containers.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/test_containers.c b/src/test/test_containers.c index 279d69754..c4dba7375 100644 --- a/src/test/test_containers.c +++ b/src/test/test_containers.c @@ -1106,7 +1106,7 @@ test_container_fp_pair_map(void *arg) tt_int_op(fp_pair_map_size(map),OP_EQ, 4); fp_pair_map_assert_ok(map); fp_pair_map_set(map, &fp5, v104); - fp_pair_map_set(map, &fp6, v105); + fp_pair_map_set_by_digests(map, fp6.first, fp6.second, v105); fp_pair_map_assert_ok(map); /* Test iterator. */ @@ -1124,7 +1124,8 @@ test_container_fp_pair_map(void *arg) /* Make sure we removed fp2, but not the others. */ tt_ptr_op(fp_pair_map_get(map, &fp2),OP_EQ, NULL); - tt_ptr_op(fp_pair_map_get(map, &fp5),OP_EQ, v104); + tt_ptr_op(fp_pair_map_get_by_digests(map, fp5.first, fp5.second), + OP_EQ, v104); fp_pair_map_assert_ok(map); /* Clean up after ourselves. */

1 0

[tor/master] Don't move gcov output to root directory
by nickm＠torproject.org 03 Oct '17

03 Oct '17

commit e31ffb274132662e2ce13439a52554022154773c Author: Taylor Yu <catalyst(a)torproject.org> Date: Mon Oct 2 16:09:28 2017 -0500 Don't move gcov output to root directory In scripts/test/coverage, avoid attempting to move gcov output files to the root directory when given no arguments. Fixes bug 23741. --- changes/bug23741 | 4 ++++ scripts/test/coverage | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug23741 b/changes/bug23741 new file mode 100644 index 000000000..92f06f527 --- /dev/null +++ b/changes/bug23741 @@ -0,0 +1,4 @@ + o Minor bugfixes (testing): + - Prevent scripts/test/coverage from attempting to move gcov + output to the root directory. Fixes bug 23741; bugfix on + 0.2.5.1-alpha. diff --git a/scripts/test/coverage b/scripts/test/coverage index f4ae47582..f10c5afaa 100755 --- a/scripts/test/coverage +++ b/scripts/test/coverage @@ -29,7 +29,7 @@ for fn in src/or/*.c src/common/*.c; do gcov -o $on $fn if [ -e $GC ] then - if [ -n $dst ] + if [ -d "$dst" ] then mv $GC $dst/$GC fi

1 0