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

[tor/master] changes: file for 32451
by nickm＠torproject.org 14 Nov '19

14 Nov '19

commit 9f37c0f4f2cde6b0f5be04f50edcfb23ce999830 Author: teor <teor(a)torproject.org> Date: Thu Nov 14 13:12:42 2019 +1000 changes: file for 32451 --- changes/ticket32451 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/ticket32451 b/changes/ticket32451 new file mode 100644 index 000000000..dcca851e5 --- /dev/null +++ b/changes/ticket32451 @@ -0,0 +1,5 @@ + o Minor features (testing): + - Allow test_parseconf.sh to test expected log outputs for successful + configs, as well as failed configs. Closes ticket 32451. + - Add common failure cases for test_parseconf.sh in + src/test/conf_failures. Closes ticket 32451.

1 0

[tor/master] test/parseconf: Stop adding newlines to *_printf
by nickm＠torproject.org 14 Nov '19

14 Nov '19

commit 51a6c0c8fd147a852a9567f1b1987b686bcc1800 Author: teor <teor(a)torproject.org> Date: Thu Nov 14 10:54:42 2019 +1000 test/parseconf: Stop adding newlines to *_printf Cleanup after 32451. --- src/test/test_parseconf.sh | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/test/test_parseconf.sh b/src/test/test_parseconf.sh index 2156077d7..2298f0234 100755 --- a/src/test/test_parseconf.sh +++ b/src/test/test_parseconf.sh @@ -167,7 +167,6 @@ fail_printf() # The first argument is a printf string, so this warning is spurious # shellcheck disable=SC2059 printf "$@" >&2 - printf "\\n" >&2 NEXT_TEST="yes" FINAL_EXIT=$EXITCODE } @@ -180,7 +179,6 @@ die_printf() # The first argument is a printf string, so this warning is spurious # shellcheck disable=SC2059 printf "$@" >&2 - printf "\\n" >&2 exit $EXITCODE } @@ -191,11 +189,11 @@ else fi EMPTY="${DATA_DIR}/EMPTY" -touch "$EMPTY" || die_printf "Couldn't create empty file '%s'." \ +touch "$EMPTY" || die_printf "Couldn't create empty file '%s'.\\n" \ "$EMPTY" NON_EMPTY="${DATA_DIR}/NON_EMPTY" echo "This pattern should not match any log messages" \ - > "$NON_EMPTY" || die_printf "Couldn't create non-empty file '%s'." \ + > "$NON_EMPTY" || die_printf "Couldn't create non-empty file '%s'.\\n" \ "$NON_EMPTY" STANDARD_LIBS="libevent\\|openssl\\|zlib" @@ -216,7 +214,7 @@ TOR_LIBS_ENABLED=${TOR_LIBS_ENABLED%_} TOR_LIBS_ENABLED_COUNT="$(echo "$TOR_LIBS_ENABLED_SEARCH" \ | tr ' ' '\n' | wc -l)" if test "$TOR_LIBS_ENABLED_COUNT" -gt 3; then - die_printf "Can not handle more than 3 optional libraries" + die_printf "Can not handle more than 3 optional libraries.\\n" fi # Brute-force the combinations of libraries TOR_LIBS_ENABLED_SEARCH_3="$(echo "$TOR_LIBS_ENABLED" \ @@ -301,7 +299,7 @@ dump_config() --defaults-torrc "$2" \ $3 \ > "$4"; then - fail_printf "'%s': Tor --dump-config reported an error%s:\\n%s" \ + fail_printf "'%s': Tor --dump-config reported an error%s:\\n%s\\n" \ "$5" \ "$CONTEXT" \ "$FULL_TOR_CMD" @@ -325,7 +323,7 @@ filter() "$FILTER" "$1" \ > "$2" \ - || fail_printf "'%s': Filter '%s' reported an error%s." \ + || fail_printf "'%s': Filter '%s' reported an error%s.\\n" \ "$3" \ "$FILTER" \ "$CONTEXT" @@ -352,7 +350,7 @@ check_diff() if cmp "$1" "$2" > /dev/null; then return "$TRUE" else - fail_printf "'%s': Tor --dump-config said%s:\\n%s" \ + fail_printf "'%s': Tor --dump-config said%s:\\n%s\\n" \ "$1" \ "$CONTEXT" \ "$7" @@ -417,7 +415,7 @@ check_dump_config() check_empty_pattern() { if ! test -s "$1"; then - fail_printf "%s file '%s' is empty, and will match any output." \ + fail_printf "%s file '%s' is empty, and will match any output.\\n" \ "$2" \ "$1" return "$TRUE" @@ -455,7 +453,7 @@ verify_config() # Convert the actual and expected results to boolean, and compare if test $((! (! RESULT))) -ne $((! (! $5))); then - fail_printf "'%s': Tor --verify-config did not %s:\\n%s" \ + fail_printf "'%s': Tor --verify-config did not %s:\\n%s\\n" \ "$6" \ "$7" \ "$FULL_TOR_CMD" @@ -476,7 +474,7 @@ check_pattern() { expect_log="$(cat "$1")" if ! grep "$expect_log" "$2" > /dev/null; then - fail_printf "Expected %s '%s':\\n%s" \ + fail_printf "Expected %s '%s':\\n%s\\n" \ "$3" \ "$1" \ "$expect_log" @@ -566,7 +564,7 @@ for dir in "${EXAMPLEDIR}"/*; do # Check for broken configs if test -f "./error${suffix}"; then - fail_printf "Found both '%s' and '%s'.%s" \ + fail_printf "Found both '%s' and '%s'.%s\\n" \ "${dir}/expected${suffix}" \ "${dir}/error${suffix}" \ "(Only one of these files should exist.)" @@ -637,7 +635,7 @@ for dir in "${EXAMPLEDIR}"/*; do else # This case is not actually configured with a success or a failure. # call that an error. - fail_printf "Did not find ${dir}/*expected or ${dir}/*error." + fail_printf "Did not find ${dir}/*expected or ${dir}/*error.\\n" fi if test -z "$NEXT_TEST"; then

1 0

[tor/master] test/parseconf: Add failure cases in conf_failures/
by nickm＠torproject.org 14 Nov '19

14 Nov '19

commit c7838c71fb3d023c8e255896118c59ed8af688eb Author: teor <teor(a)torproject.org> Date: Thu Nov 14 10:59:15 2019 +1000 test/parseconf: Add failure cases in conf_failures/ These failure cases can be used to test the failure behaviour and failure logs of test_parseconf.sh. See the README for details. Part of 32451. --- src/test/conf_failures/README | 5 +++++ src/test/conf_failures/fail-error-success/error | 1 + src/test/conf_failures/fail-error-success/torrc | 0 src/test/conf_failures/fail-error/error | 1 + src/test/conf_failures/fail-error/torrc | 1 + src/test/conf_failures/fail-expected-error/expected | 0 src/test/conf_failures/fail-expected-error/torrc | 1 + src/test/conf_failures/fail-expected-log/expected | 0 src/test/conf_failures/fail-expected-log/expected_log | 1 + src/test/conf_failures/fail-expected-log/torrc | 0 src/test/conf_failures/fail-expected/expected | 1 + src/test/conf_failures/fail-expected/torrc | 0 12 files changed, 11 insertions(+) diff --git a/src/test/conf_failures/README b/src/test/conf_failures/README new file mode 100644 index 000000000..0da470eeb --- /dev/null +++ b/src/test/conf_failures/README @@ -0,0 +1,5 @@ +This directory contains typical test_parseconf.sh failure cases. + +If these directories are copied into conf_examples, test_parseconf.sh will +fail. Use these failure cases to make sure test_parseconf.sh handles failures +correctly, and produces useful output. diff --git a/src/test/conf_failures/fail-error-success/error b/src/test/conf_failures/fail-error-success/error new file mode 100644 index 000000000..569a631e8 --- /dev/null +++ b/src/test/conf_failures/fail-error-success/error @@ -0,0 +1 @@ +Tor diff --git a/src/test/conf_failures/fail-error-success/torrc b/src/test/conf_failures/fail-error-success/torrc new file mode 100644 index 000000000..e69de29bb diff --git a/src/test/conf_failures/fail-error/error b/src/test/conf_failures/fail-error/error new file mode 100644 index 000000000..4c0be9783 --- /dev/null +++ b/src/test/conf_failures/fail-error/error @@ -0,0 +1 @@ +no match diff --git a/src/test/conf_failures/fail-error/torrc b/src/test/conf_failures/fail-error/torrc new file mode 100644 index 000000000..bb6fe186a --- /dev/null +++ b/src/test/conf_failures/fail-error/torrc @@ -0,0 +1 @@ +bad bad bad diff --git a/src/test/conf_failures/fail-expected-error/expected b/src/test/conf_failures/fail-expected-error/expected new file mode 100644 index 000000000..e69de29bb diff --git a/src/test/conf_failures/fail-expected-error/torrc b/src/test/conf_failures/fail-expected-error/torrc new file mode 100644 index 000000000..bb6fe186a --- /dev/null +++ b/src/test/conf_failures/fail-expected-error/torrc @@ -0,0 +1 @@ +bad bad bad diff --git a/src/test/conf_failures/fail-expected-log/expected b/src/test/conf_failures/fail-expected-log/expected new file mode 100644 index 000000000..e69de29bb diff --git a/src/test/conf_failures/fail-expected-log/expected_log b/src/test/conf_failures/fail-expected-log/expected_log new file mode 100644 index 000000000..bb6fe186a --- /dev/null +++ b/src/test/conf_failures/fail-expected-log/expected_log @@ -0,0 +1 @@ +bad bad bad diff --git a/src/test/conf_failures/fail-expected-log/torrc b/src/test/conf_failures/fail-expected-log/torrc new file mode 100644 index 000000000..e69de29bb diff --git a/src/test/conf_failures/fail-expected/expected b/src/test/conf_failures/fail-expected/expected new file mode 100644 index 000000000..67be85f12 --- /dev/null +++ b/src/test/conf_failures/fail-expected/expected @@ -0,0 +1 @@ +bad diff --git a/src/test/conf_failures/fail-expected/torrc b/src/test/conf_failures/fail-expected/torrc new file mode 100644 index 000000000..e69de29bb

1 0

[tor/master] test/parseconf: Warn when the expected_log* file is missing
by nickm＠torproject.org 14 Nov '19

14 Nov '19

commit aa3e2bbd4bb52f0e8fc550841ffdcf2da3fa2fa7 Author: teor <teor(a)torproject.org> Date: Thu Nov 14 12:57:59 2019 +1000 test/parseconf: Warn when the expected_log* file is missing Part of 32451. --- src/test/test_parseconf.sh | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/test/test_parseconf.sh b/src/test/test_parseconf.sh index 2298f0234..4fe27d9f5 100755 --- a/src/test/test_parseconf.sh +++ b/src/test/test_parseconf.sh @@ -614,12 +614,18 @@ for dir in "${EXAMPLEDIR}"/*; do # This case should succeed: run verify-config and see if it does. check_verify_config "./torrc" \ - "$DEFAULTS" \ - "$CMDLINE" \ - "${DATA_DIR}/output_log.${testname}" \ - "$TRUE" \ - "$EXPECTED_LOG" \ - "log success" + "$DEFAULTS" \ + "$CMDLINE" \ + "${DATA_DIR}/output_log.${testname}" \ + "$TRUE" \ + "$EXPECTED_LOG" \ + "log success" + else + printf "\\nNOTICE: Missing '%s_log' file:\\n" \ + "$EXPECTED" >&2 + log_verify_config "./torrc" \ + "$DEFAULTS" \ + "$CMDLINE" fi elif test -f "$ERROR"; then

1 0

[tor/master] test/parseconf: Update conf_examples to use expected_log
by nickm＠torproject.org 14 Nov '19

14 Nov '19

commit ced434c5869da6d6c7ac4c11a934a4d58a730afe Author: teor <teor(a)torproject.org> Date: Tue Nov 12 15:10:07 2019 +1000 test/parseconf: Update conf_examples to use expected_log Part of 32451. --- .../badnick_1/expected_log_no_dirauth_relay | 1 + .../badnick_2/expected_log_no_dirauth_relay | 1 + src/test/conf_examples/bridgeauth_1/expected_log | 1 + .../expected_log_no_dirauth_relay | 1 + src/test/conf_examples/crypto_accel/expected_log | 1 + .../error_nss => crypto_accel/expected_log_nss} | 0 src/test/conf_examples/crypto_accel/expected_nss | 2 + .../crypto_accel_req/expected_log_nss | 1 + src/test/conf_examples/dirauth_1/expected_log | 1 + src/test/conf_examples/empty_1/expected_log | 1 + src/test/conf_examples/empty_2/expected_log | 1 + src/test/conf_examples/empty_3/expected_log | 1 + src/test/conf_examples/example_1/expected_log | 1 + src/test/conf_examples/example_3/expected_log | 1 + src/test/conf_examples/include_1/expected_log | 1 + .../conf_examples/include_bug_31408/expected_log | 1 + src/test/conf_examples/large_1/expected_log | 1 + src/test/conf_examples/lzma_zstd_1/expected | 0 .../lzma_zstd_1/{error => expected_log} | 0 .../lzma_zstd_1/{error_lzma => expected_log_lzma} | 0 .../{error_lzma_zstd => expected_log_lzma_zstd} | 0 .../lzma_zstd_1/{error_zstd => expected_log_zstd} | 0 src/test/conf_examples/lzma_zstd_1/expected_lzma | 0 .../conf_examples/lzma_zstd_1/expected_lzma_zstd | 0 src/test/conf_examples/lzma_zstd_1/expected_zstd | 0 src/test/conf_examples/lzma_zstd_1/torrc | 5 +- src/test/conf_examples/nss_1/expected | 0 .../conf_examples/nss_1/{error => expected_log} | 0 src/test/conf_examples/nss_1/expected_log_nss | 1 + src/test/conf_examples/nss_1/expected_nss | 0 src/test/conf_examples/nss_1/torrc | 5 +- src/test/conf_examples/obsolete_1/expected_log | 1 + src/test/conf_examples/obsolete_1/torrc | 136 +++++++++++---------- src/test/conf_examples/obsolete_2/expected_log | 1 + src/test/conf_examples/obsolete_2/torrc | 3 + src/test/conf_examples/obsolete_3/expected | 0 src/test/conf_examples/obsolete_3/expected_log | 1 + src/test/conf_examples/obsolete_3/torrc | 4 + src/test/conf_examples/ops_1/expected_log | 1 + src/test/conf_examples/ops_2/expected_log | 1 + src/test/conf_examples/ops_3/expected_log | 1 + src/test/conf_examples/ops_4/expected_log | 1 + src/test/conf_examples/ops_5/expected_log | 1 + src/test/conf_examples/ops_6/expected_log | 1 + src/test/conf_examples/pt_01/expected_log | 1 + .../pt_02/expected_log_no_dirauth_relay | 1 + src/test/conf_examples/pt_03/expected_log | 1 + .../pt_03/expected_log_no_dirauth_relay | 1 + .../conf_examples/pt_03/expected_no_dirauth_relay | 1 + src/test/conf_examples/pt_04/expected_log | 1 + .../pt_04/expected_log_no_dirauth_relay | 1 + .../conf_examples/pt_04/expected_no_dirauth_relay | 3 + src/test/conf_examples/pt_05/expected_log | 1 + src/test/conf_examples/pt_06/expected_log | 1 + .../pt_06/expected_log_no_dirauth_relay | 1 + .../conf_examples/pt_06/expected_no_dirauth_relay | 6 + src/test/conf_examples/pt_07/expected_log | 1 + .../pt_08/expected_log_no_dirauth_relay | 1 + src/test/conf_examples/relay_01/expected_log | 1 + src/test/conf_examples/relay_03/expected_log | 1 + src/test/conf_examples/relay_04/expected_log | 1 + src/test/conf_examples/relay_05/expected_log | 1 + src/test/conf_examples/relay_06/expected_log | 1 + src/test/conf_examples/relay_07/expected_log | 1 + src/test/conf_examples/relay_08/expected_log | 1 + src/test/conf_examples/relay_09/expected_log | 1 + src/test/conf_examples/relay_10/expected_log | 1 + src/test/conf_examples/relay_14/expected_log | 1 + src/test/conf_examples/relay_17/expected_log | 1 + src/test/conf_examples/relay_19/expected_log | 1 + src/test/conf_examples/relay_21/expected_log | 1 + src/test/conf_examples/relay_29/expected_log | 1 + 72 files changed, 140 insertions(+), 75 deletions(-) diff --git a/src/test/conf_examples/badnick_1/expected_log_no_dirauth_relay b/src/test/conf_examples/badnick_1/expected_log_no_dirauth_relay new file mode 100644 index 000000000..9190a3326 --- /dev/null +++ b/src/test/conf_examples/badnick_1/expected_log_no_dirauth_relay @@ -0,0 +1 @@ +Read configuration file .*badnick_1[./]*torrc diff --git a/src/test/conf_examples/badnick_2/expected_log_no_dirauth_relay b/src/test/conf_examples/badnick_2/expected_log_no_dirauth_relay new file mode 100644 index 000000000..a15c7b02c --- /dev/null +++ b/src/test/conf_examples/badnick_2/expected_log_no_dirauth_relay @@ -0,0 +1 @@ +Read configuration file .*badnick_2[./]*torrc diff --git a/src/test/conf_examples/bridgeauth_1/expected_log b/src/test/conf_examples/bridgeauth_1/expected_log new file mode 100644 index 000000000..cabe9d3f8 --- /dev/null +++ b/src/test/conf_examples/bridgeauth_1/expected_log @@ -0,0 +1 @@ +Read configuration file .*bridgeauth_1[./]*torrc diff --git a/src/test/conf_examples/contactinfo_notutf8/expected_log_no_dirauth_relay b/src/test/conf_examples/contactinfo_notutf8/expected_log_no_dirauth_relay new file mode 100644 index 000000000..caa07aca4 --- /dev/null +++ b/src/test/conf_examples/contactinfo_notutf8/expected_log_no_dirauth_relay @@ -0,0 +1 @@ +Read configuration file .*contactinfo_notutf8[./]*torrc diff --git a/src/test/conf_examples/crypto_accel/expected_log b/src/test/conf_examples/crypto_accel/expected_log new file mode 100644 index 000000000..7fab0c8da --- /dev/null +++ b/src/test/conf_examples/crypto_accel/expected_log @@ -0,0 +1 @@ +Unable to load dynamic OpenSSL engine "nonexistent_chartreuse_accelerator" diff --git a/src/test/conf_examples/nss_1/error_nss b/src/test/conf_examples/crypto_accel/expected_log_nss similarity index 100% rename from src/test/conf_examples/nss_1/error_nss rename to src/test/conf_examples/crypto_accel/expected_log_nss diff --git a/src/test/conf_examples/crypto_accel/expected_nss b/src/test/conf_examples/crypto_accel/expected_nss new file mode 100644 index 000000000..ea80ca19d --- /dev/null +++ b/src/test/conf_examples/crypto_accel/expected_nss @@ -0,0 +1,2 @@ +AccelName nonexistent_chartreuse_accelerator +HardwareAccel 1 diff --git a/src/test/conf_examples/crypto_accel_req/expected_log_nss b/src/test/conf_examples/crypto_accel_req/expected_log_nss new file mode 100644 index 000000000..c0fe7b003 --- /dev/null +++ b/src/test/conf_examples/crypto_accel_req/expected_log_nss @@ -0,0 +1 @@ +Tor 0.* running on .* with Libevent .*, NSS .*, Zlib .*, Liblzma .*, and Libzstd .* diff --git a/src/test/conf_examples/dirauth_1/expected_log b/src/test/conf_examples/dirauth_1/expected_log new file mode 100644 index 000000000..b788be2e3 --- /dev/null +++ b/src/test/conf_examples/dirauth_1/expected_log @@ -0,0 +1 @@ +Read configuration file .*dirauth_1[./]*torrc diff --git a/src/test/conf_examples/empty_1/expected_log b/src/test/conf_examples/empty_1/expected_log new file mode 100644 index 000000000..4c6b00069 --- /dev/null +++ b/src/test/conf_examples/empty_1/expected_log @@ -0,0 +1 @@ +Read configuration file .*empty_1[./]*torrc diff --git a/src/test/conf_examples/empty_2/expected_log b/src/test/conf_examples/empty_2/expected_log new file mode 100644 index 000000000..9c846a03f --- /dev/null +++ b/src/test/conf_examples/empty_2/expected_log @@ -0,0 +1 @@ +Read configuration file .*empty_2[./]*torrc\.defaults diff --git a/src/test/conf_examples/empty_3/expected_log b/src/test/conf_examples/empty_3/expected_log new file mode 100644 index 000000000..a42514f37 --- /dev/null +++ b/src/test/conf_examples/empty_3/expected_log @@ -0,0 +1 @@ +Included configuration .*directory at recursion level 1.*included diff --git a/src/test/conf_examples/example_1/expected_log b/src/test/conf_examples/example_1/expected_log new file mode 100644 index 000000000..8f83eec98 --- /dev/null +++ b/src/test/conf_examples/example_1/expected_log @@ -0,0 +1 @@ +Read configuration file .*example_1[./]*torrc diff --git a/src/test/conf_examples/example_3/expected_log b/src/test/conf_examples/example_3/expected_log new file mode 100644 index 000000000..807f9c2fc --- /dev/null +++ b/src/test/conf_examples/example_3/expected_log @@ -0,0 +1 @@ +Read configuration file .*example_3[./]*torrc diff --git a/src/test/conf_examples/include_1/expected_log b/src/test/conf_examples/include_1/expected_log new file mode 100644 index 000000000..f95cad040 --- /dev/null +++ b/src/test/conf_examples/include_1/expected_log @@ -0,0 +1 @@ +Included configuration file .*at recursion level 2.*nested\.inc diff --git a/src/test/conf_examples/include_bug_31408/expected_log b/src/test/conf_examples/include_bug_31408/expected_log new file mode 100644 index 000000000..a42514f37 --- /dev/null +++ b/src/test/conf_examples/include_bug_31408/expected_log @@ -0,0 +1 @@ +Included configuration .*directory at recursion level 1.*included diff --git a/src/test/conf_examples/large_1/expected_log b/src/test/conf_examples/large_1/expected_log new file mode 100644 index 000000000..21248bb5e --- /dev/null +++ b/src/test/conf_examples/large_1/expected_log @@ -0,0 +1 @@ +Your log may contain sensitive information diff --git a/src/test/conf_examples/lzma_zstd_1/expected b/src/test/conf_examples/lzma_zstd_1/expected new file mode 100644 index 000000000..e69de29bb diff --git a/src/test/conf_examples/lzma_zstd_1/error b/src/test/conf_examples/lzma_zstd_1/expected_log similarity index 100% rename from src/test/conf_examples/lzma_zstd_1/error rename to src/test/conf_examples/lzma_zstd_1/expected_log diff --git a/src/test/conf_examples/lzma_zstd_1/error_lzma b/src/test/conf_examples/lzma_zstd_1/expected_log_lzma similarity index 100% rename from src/test/conf_examples/lzma_zstd_1/error_lzma rename to src/test/conf_examples/lzma_zstd_1/expected_log_lzma diff --git a/src/test/conf_examples/lzma_zstd_1/error_lzma_zstd b/src/test/conf_examples/lzma_zstd_1/expected_log_lzma_zstd similarity index 100% rename from src/test/conf_examples/lzma_zstd_1/error_lzma_zstd rename to src/test/conf_examples/lzma_zstd_1/expected_log_lzma_zstd diff --git a/src/test/conf_examples/lzma_zstd_1/error_zstd b/src/test/conf_examples/lzma_zstd_1/expected_log_zstd similarity index 100% rename from src/test/conf_examples/lzma_zstd_1/error_zstd rename to src/test/conf_examples/lzma_zstd_1/expected_log_zstd diff --git a/src/test/conf_examples/lzma_zstd_1/expected_lzma b/src/test/conf_examples/lzma_zstd_1/expected_lzma new file mode 100644 index 000000000..e69de29bb diff --git a/src/test/conf_examples/lzma_zstd_1/expected_lzma_zstd b/src/test/conf_examples/lzma_zstd_1/expected_lzma_zstd new file mode 100644 index 000000000..e69de29bb diff --git a/src/test/conf_examples/lzma_zstd_1/expected_zstd b/src/test/conf_examples/lzma_zstd_1/expected_zstd new file mode 100644 index 000000000..e69de29bb diff --git a/src/test/conf_examples/lzma_zstd_1/torrc b/src/test/conf_examples/lzma_zstd_1/torrc index 91a4656b7..f873d7902 100644 --- a/src/test/conf_examples/lzma_zstd_1/torrc +++ b/src/test/conf_examples/lzma_zstd_1/torrc @@ -1,4 +1 @@ -# Deliberately bad options, to cause an error message -# But this test actually checks for the optional library list in tor's logs, -# not the error message -bad bad bad \ No newline at end of file +# This test checks for the optional library list in tor's logs diff --git a/src/test/conf_examples/nss_1/expected b/src/test/conf_examples/nss_1/expected new file mode 100644 index 000000000..e69de29bb diff --git a/src/test/conf_examples/nss_1/error b/src/test/conf_examples/nss_1/expected_log similarity index 100% rename from src/test/conf_examples/nss_1/error rename to src/test/conf_examples/nss_1/expected_log diff --git a/src/test/conf_examples/nss_1/expected_log_nss b/src/test/conf_examples/nss_1/expected_log_nss new file mode 100644 index 000000000..c0fe7b003 --- /dev/null +++ b/src/test/conf_examples/nss_1/expected_log_nss @@ -0,0 +1 @@ +Tor 0.* running on .* with Libevent .*, NSS .*, Zlib .*, Liblzma .*, and Libzstd .* diff --git a/src/test/conf_examples/nss_1/expected_nss b/src/test/conf_examples/nss_1/expected_nss new file mode 100644 index 000000000..e69de29bb diff --git a/src/test/conf_examples/nss_1/torrc b/src/test/conf_examples/nss_1/torrc index 91a4656b7..f873d7902 100644 --- a/src/test/conf_examples/nss_1/torrc +++ b/src/test/conf_examples/nss_1/torrc @@ -1,4 +1 @@ -# Deliberately bad options, to cause an error message -# But this test actually checks for the optional library list in tor's logs, -# not the error message -bad bad bad \ No newline at end of file +# This test checks for the optional library list in tor's logs diff --git a/src/test/conf_examples/obsolete_1/expected_log b/src/test/conf_examples/obsolete_1/expected_log new file mode 100644 index 000000000..52f6f70a2 --- /dev/null +++ b/src/test/conf_examples/obsolete_1/expected_log @@ -0,0 +1 @@ +Skipping obsolete configuration option diff --git a/src/test/conf_examples/obsolete_1/torrc b/src/test/conf_examples/obsolete_1/torrc index 3cd9a6d77..e711fe406 100644 --- a/src/test/conf_examples/obsolete_1/torrc +++ b/src/test/conf_examples/obsolete_1/torrc @@ -1,68 +1,70 @@ # These options are obsolete as of 0.4.2 -AllowDotExit -AllowInvalidNodes -AllowSingleHopCircuits -AllowSingleHopExits -AlternateHSAuthority -AuthDirBadDir -AuthDirBadDirCCs -AuthDirRejectUnlisted -AuthDirListBadDirs -AuthDirMaxServersPerAuthAddr -CircuitIdleTimeout -ControlListenAddress -DirListenAddress -DisableIOCP -DisableV2DirectoryInfo_ -DynamicDHGroups -DNSListenAddress -TestingEnableTbEmptyEvent -ExcludeSingleHopRelays -FallbackNetworkstatusFile -FastFirstHopPK -FetchV2Networkstatus -Group -HidServDirectoryV2 -CloseHSClientCircuitsImmediatelyOnTimeout -CloseHSServiceRendCircuitsImmediatelyOnTimeout -MaxOnionsPending -NamingAuthoritativeDirectory -NATDListenAddress -PredictedPortsRelevanceTime -WarnUnsafeSocks -ORListenAddress -PathBiasDisableRate -PathBiasScaleFactor -PathBiasMultFactor -PathBiasUseCloseCounts -PortForwarding -PortForwardingHelper -PreferTunneledDirConns -RecommendedPackages -RunTesting -SchedulerLowWaterMark__ -SchedulerHighWaterMark__ -SchedulerMaxFlushCells__ -SocksListenAddress -StrictEntryNodes -StrictExitNodes -Support022HiddenServices -Tor2webMode -Tor2webRendezvousPoints -TLSECGroup -TransListenAddress -TunnelDirConns -UseEntryGuardsAsDirGuards -UseNTorHandshake -UserspaceIOCPBuffers -V1AuthoritativeDirectory -V2AuthoritativeDirectory -VoteOnHidServDirectoriesV2 -UseFilteringSSLBufferevents -__UseFilteringSSLBufferevents -TestingConsensusMaxDownloadTries -ClientBootstrapConsensusMaxDownloadTries -ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries -TestingDescriptorMaxDownloadTries -TestingMicrodescMaxDownloadTries -TestingCertMaxDownloadTries +# Obsolete options without arguments, or with an empty argument, +# are silently ignored. So we give each one of these options an argument. +AllowDotExit 1 +AllowInvalidNodes 1 +AllowSingleHopCircuits 1 +AllowSingleHopExits 1 +AlternateHSAuthority 1 +AuthDirBadDir 1 +AuthDirBadDirCCs 1 +AuthDirRejectUnlisted 1 +AuthDirListBadDirs 1 +AuthDirMaxServersPerAuthAddr 1 +CircuitIdleTimeout 1 +ControlListenAddress 1 +DirListenAddress 1 +DisableIOCP 1 +DisableV2DirectoryInfo_ 1 +DynamicDHGroups 1 +DNSListenAddress 1 +TestingEnableTbEmptyEvent 1 +ExcludeSingleHopRelays 1 +FallbackNetworkstatusFile 1 +FastFirstHopPK 1 +FetchV2Networkstatus 1 +Group 1 +HidServDirectoryV2 1 +CloseHSClientCircuitsImmediatelyOnTimeout 1 +CloseHSServiceRendCircuitsImmediatelyOnTimeout 1 +MaxOnionsPending 1 +NamingAuthoritativeDirectory 1 +NATDListenAddress 1 +PredictedPortsRelevanceTime 1 +WarnUnsafeSocks 1 +ORListenAddress 1 +PathBiasDisableRate 1 +PathBiasScaleFactor 1 +PathBiasMultFactor 1 +PathBiasUseCloseCounts 1 +PortForwarding 1 +PortForwardingHelper 1 +PreferTunneledDirConns 1 +RecommendedPackages 1 +RunTesting 1 +SchedulerLowWaterMark__ 1 +SchedulerHighWaterMark__ 1 +SchedulerMaxFlushCells__ 1 +SocksListenAddress 1 +StrictEntryNodes 1 +StrictExitNodes 1 +Support022HiddenServices 1 +Tor2webMode 1 +Tor2webRendezvousPoints 1 +TLSECGroup 1 +TransListenAddress 1 +TunnelDirConns 1 +UseEntryGuardsAsDirGuards 1 +UseNTorHandshake 1 +UserspaceIOCPBuffers 1 +V1AuthoritativeDirectory 1 +V2AuthoritativeDirectory 1 +VoteOnHidServDirectoriesV2 1 +UseFilteringSSLBufferevents 1 +__UseFilteringSSLBufferevents 1 +TestingConsensusMaxDownloadTries 1 +ClientBootstrapConsensusMaxDownloadTries 1 +ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries 1 +TestingDescriptorMaxDownloadTries 1 +TestingMicrodescMaxDownloadTries 1 +TestingCertMaxDownloadTries 1 diff --git a/src/test/conf_examples/obsolete_2/expected_log b/src/test/conf_examples/obsolete_2/expected_log new file mode 100644 index 000000000..2160355ee --- /dev/null +++ b/src/test/conf_examples/obsolete_2/expected_log @@ -0,0 +1 @@ +Read configuration file .*obsolete_2[./]*torrc diff --git a/src/test/conf_examples/obsolete_2/torrc b/src/test/conf_examples/obsolete_2/torrc index 4f78d4762..b83e7a736 100644 --- a/src/test/conf_examples/obsolete_2/torrc +++ b/src/test/conf_examples/obsolete_2/torrc @@ -1,2 +1,5 @@ # This option has been obsolete for some time +# Obsolete options without arguments, or with an empty argument, +# are silently ignored. AllowDotExit +AllowInvalidNodes "" diff --git a/src/test/conf_examples/obsolete_3/expected b/src/test/conf_examples/obsolete_3/expected new file mode 100644 index 000000000..e69de29bb diff --git a/src/test/conf_examples/obsolete_3/expected_log b/src/test/conf_examples/obsolete_3/expected_log new file mode 100644 index 000000000..82d76ec81 --- /dev/null +++ b/src/test/conf_examples/obsolete_3/expected_log @@ -0,0 +1 @@ +Skipping obsolete configuration option "AllowDotExit" diff --git a/src/test/conf_examples/obsolete_3/torrc b/src/test/conf_examples/obsolete_3/torrc new file mode 100644 index 000000000..e0efe752b --- /dev/null +++ b/src/test/conf_examples/obsolete_3/torrc @@ -0,0 +1,4 @@ +# This option has been obsolete for some time +# Obsolete options without arguments, or with an empty argument, +# are silently ignored. So we give this option an argument. +AllowDotExit 1 diff --git a/src/test/conf_examples/ops_1/expected_log b/src/test/conf_examples/ops_1/expected_log new file mode 100644 index 000000000..b785d7fb5 --- /dev/null +++ b/src/test/conf_examples/ops_1/expected_log @@ -0,0 +1 @@ +Read configuration file .*ops_1[./]*torrc diff --git a/src/test/conf_examples/ops_2/expected_log b/src/test/conf_examples/ops_2/expected_log new file mode 100644 index 000000000..17fbc3ffb --- /dev/null +++ b/src/test/conf_examples/ops_2/expected_log @@ -0,0 +1 @@ +Read configuration file .*ops_2[./]*torrc diff --git a/src/test/conf_examples/ops_3/expected_log b/src/test/conf_examples/ops_3/expected_log new file mode 100644 index 000000000..151498f0d --- /dev/null +++ b/src/test/conf_examples/ops_3/expected_log @@ -0,0 +1 @@ +Read configuration file .*ops_3[./]*torrc diff --git a/src/test/conf_examples/ops_4/expected_log b/src/test/conf_examples/ops_4/expected_log new file mode 100644 index 000000000..7632b2290 --- /dev/null +++ b/src/test/conf_examples/ops_4/expected_log @@ -0,0 +1 @@ +Read configuration file .*ops_4[./]*torrc\.defaults diff --git a/src/test/conf_examples/ops_5/expected_log b/src/test/conf_examples/ops_5/expected_log new file mode 100644 index 000000000..ec63cb063 --- /dev/null +++ b/src/test/conf_examples/ops_5/expected_log @@ -0,0 +1 @@ +Read configuration file .*ops_5[./]*torrc\.defaults diff --git a/src/test/conf_examples/ops_6/expected_log b/src/test/conf_examples/ops_6/expected_log new file mode 100644 index 000000000..f9b1ca041 --- /dev/null +++ b/src/test/conf_examples/ops_6/expected_log @@ -0,0 +1 @@ +Read configuration file .*ops_6[./]*torrc\.defaults diff --git a/src/test/conf_examples/pt_01/expected_log b/src/test/conf_examples/pt_01/expected_log new file mode 100644 index 000000000..65bfa7a7b --- /dev/null +++ b/src/test/conf_examples/pt_01/expected_log @@ -0,0 +1 @@ +Linelist option 'ExtORPort' has no value\. Skipping diff --git a/src/test/conf_examples/pt_02/expected_log_no_dirauth_relay b/src/test/conf_examples/pt_02/expected_log_no_dirauth_relay new file mode 100644 index 000000000..0e48dca7f --- /dev/null +++ b/src/test/conf_examples/pt_02/expected_log_no_dirauth_relay @@ -0,0 +1 @@ +Read configuration file .*pt_02[./]*torrc diff --git a/src/test/conf_examples/pt_03/expected_log b/src/test/conf_examples/pt_03/expected_log new file mode 100644 index 000000000..285a189c2 --- /dev/null +++ b/src/test/conf_examples/pt_03/expected_log @@ -0,0 +1 @@ +We use pluggable transports but the Extended ORPort is disabled diff --git a/src/test/conf_examples/pt_03/expected_log_no_dirauth_relay b/src/test/conf_examples/pt_03/expected_log_no_dirauth_relay new file mode 100644 index 000000000..88f4e5bdf --- /dev/null +++ b/src/test/conf_examples/pt_03/expected_log_no_dirauth_relay @@ -0,0 +1 @@ +Read configuration file .*pt_03[./]*torrc diff --git a/src/test/conf_examples/pt_03/expected_no_dirauth_relay b/src/test/conf_examples/pt_03/expected_no_dirauth_relay new file mode 100644 index 000000000..f849f2a78 --- /dev/null +++ b/src/test/conf_examples/pt_03/expected_no_dirauth_relay @@ -0,0 +1 @@ +ServerTransportPlugin bad3 exec / diff --git a/src/test/conf_examples/pt_04/expected_log b/src/test/conf_examples/pt_04/expected_log new file mode 100644 index 000000000..5b3ab51d2 --- /dev/null +++ b/src/test/conf_examples/pt_04/expected_log @@ -0,0 +1 @@ +Tor is not configured as a relay but you specified a ServerTransportPlugin line.*The ServerTransportPlugin line will be ignored diff --git a/src/test/conf_examples/pt_04/expected_log_no_dirauth_relay b/src/test/conf_examples/pt_04/expected_log_no_dirauth_relay new file mode 100644 index 000000000..2b989bf32 --- /dev/null +++ b/src/test/conf_examples/pt_04/expected_log_no_dirauth_relay @@ -0,0 +1 @@ +Read configuration file .*pt_04[./]*torrc diff --git a/src/test/conf_examples/pt_04/expected_no_dirauth_relay b/src/test/conf_examples/pt_04/expected_no_dirauth_relay new file mode 100644 index 000000000..9087f600e --- /dev/null +++ b/src/test/conf_examples/pt_04/expected_no_dirauth_relay @@ -0,0 +1,3 @@ +ExtORPortCookieAuthFile / +ExtORPort 1 +ServerTransportPlugin bad3 exec / diff --git a/src/test/conf_examples/pt_05/expected_log b/src/test/conf_examples/pt_05/expected_log new file mode 100644 index 000000000..c05a0931d --- /dev/null +++ b/src/test/conf_examples/pt_05/expected_log @@ -0,0 +1 @@ +Your ContactInfo config option is not set diff --git a/src/test/conf_examples/pt_06/expected_log b/src/test/conf_examples/pt_06/expected_log new file mode 100644 index 000000000..5b3ab51d2 --- /dev/null +++ b/src/test/conf_examples/pt_06/expected_log @@ -0,0 +1 @@ +Tor is not configured as a relay but you specified a ServerTransportPlugin line.*The ServerTransportPlugin line will be ignored diff --git a/src/test/conf_examples/pt_06/expected_log_no_dirauth_relay b/src/test/conf_examples/pt_06/expected_log_no_dirauth_relay new file mode 100644 index 000000000..f35a380c9 --- /dev/null +++ b/src/test/conf_examples/pt_06/expected_log_no_dirauth_relay @@ -0,0 +1 @@ +Read configuration file .*pt_06[./]*torrc diff --git a/src/test/conf_examples/pt_06/expected_no_dirauth_relay b/src/test/conf_examples/pt_06/expected_no_dirauth_relay new file mode 100644 index 000000000..d5788b92c --- /dev/null +++ b/src/test/conf_examples/pt_06/expected_no_dirauth_relay @@ -0,0 +1,6 @@ +ExtORPortCookieAuthFile / +ExtORPortCookieAuthFileGroupReadable 1 +ExtORPort 1 +ServerTransportListenAddr bad3 127.0.0.1:2 +ServerTransportOptions bad3 a=b +ServerTransportPlugin bad3 exec / diff --git a/src/test/conf_examples/pt_07/expected_log b/src/test/conf_examples/pt_07/expected_log new file mode 100644 index 000000000..5afaf02ba --- /dev/null +++ b/src/test/conf_examples/pt_07/expected_log @@ -0,0 +1 @@ +You specified a public address .* for ExtORPort diff --git a/src/test/conf_examples/pt_08/expected_log_no_dirauth_relay b/src/test/conf_examples/pt_08/expected_log_no_dirauth_relay new file mode 100644 index 000000000..79dcbc10c --- /dev/null +++ b/src/test/conf_examples/pt_08/expected_log_no_dirauth_relay @@ -0,0 +1 @@ +Read configuration file .*pt_08[./]*torrc diff --git a/src/test/conf_examples/relay_01/expected_log b/src/test/conf_examples/relay_01/expected_log new file mode 100644 index 000000000..32e8c99d2 --- /dev/null +++ b/src/test/conf_examples/relay_01/expected_log @@ -0,0 +1 @@ +Linelist option 'ORPort' has no value\. Skipping diff --git a/src/test/conf_examples/relay_03/expected_log b/src/test/conf_examples/relay_03/expected_log new file mode 100644 index 000000000..46ab723e4 --- /dev/null +++ b/src/test/conf_examples/relay_03/expected_log @@ -0,0 +1 @@ +Read configuration file .*relay_03[./]*torrc diff --git a/src/test/conf_examples/relay_04/expected_log b/src/test/conf_examples/relay_04/expected_log new file mode 100644 index 000000000..c05a0931d --- /dev/null +++ b/src/test/conf_examples/relay_04/expected_log @@ -0,0 +1 @@ +Your ContactInfo config option is not set diff --git a/src/test/conf_examples/relay_05/expected_log b/src/test/conf_examples/relay_05/expected_log new file mode 100644 index 000000000..483c2e2aa --- /dev/null +++ b/src/test/conf_examples/relay_05/expected_log @@ -0,0 +1 @@ +Read configuration file .*relay_05[./]*torrc diff --git a/src/test/conf_examples/relay_06/expected_log b/src/test/conf_examples/relay_06/expected_log new file mode 100644 index 000000000..70eb18df1 --- /dev/null +++ b/src/test/conf_examples/relay_06/expected_log @@ -0,0 +1 @@ +Read configuration file .*relay_06[./]*torrc diff --git a/src/test/conf_examples/relay_07/expected_log b/src/test/conf_examples/relay_07/expected_log new file mode 100644 index 000000000..14729a7ab --- /dev/null +++ b/src/test/conf_examples/relay_07/expected_log @@ -0,0 +1 @@ +DirCache is disabled and we are configured as a relay diff --git a/src/test/conf_examples/relay_08/expected_log b/src/test/conf_examples/relay_08/expected_log new file mode 100644 index 000000000..b0168c803 --- /dev/null +++ b/src/test/conf_examples/relay_08/expected_log @@ -0,0 +1 @@ +Read configuration file .*relay_08[./]*torrc diff --git a/src/test/conf_examples/relay_09/expected_log b/src/test/conf_examples/relay_09/expected_log new file mode 100644 index 000000000..d3ab4f659 --- /dev/null +++ b/src/test/conf_examples/relay_09/expected_log @@ -0,0 +1 @@ +By default, Tor does not run as an exit relay diff --git a/src/test/conf_examples/relay_10/expected_log b/src/test/conf_examples/relay_10/expected_log new file mode 100644 index 000000000..5b81a904e --- /dev/null +++ b/src/test/conf_examples/relay_10/expected_log @@ -0,0 +1 @@ +Can't set a DirPort on a bridge relay diff --git a/src/test/conf_examples/relay_14/expected_log b/src/test/conf_examples/relay_14/expected_log new file mode 100644 index 000000000..9b0c82021 --- /dev/null +++ b/src/test/conf_examples/relay_14/expected_log @@ -0,0 +1 @@ +Read configuration file .*relay_14[./]*torrc diff --git a/src/test/conf_examples/relay_17/expected_log b/src/test/conf_examples/relay_17/expected_log new file mode 100644 index 000000000..7711f9017 --- /dev/null +++ b/src/test/conf_examples/relay_17/expected_log @@ -0,0 +1 @@ +You have set AccountingMax to use hibernation diff --git a/src/test/conf_examples/relay_19/expected_log b/src/test/conf_examples/relay_19/expected_log new file mode 100644 index 000000000..17656ba2c --- /dev/null +++ b/src/test/conf_examples/relay_19/expected_log @@ -0,0 +1 @@ +Read configuration file .*relay_19[./]*torrc diff --git a/src/test/conf_examples/relay_21/expected_log b/src/test/conf_examples/relay_21/expected_log new file mode 100644 index 000000000..ba0d56fb1 --- /dev/null +++ b/src/test/conf_examples/relay_21/expected_log @@ -0,0 +1 @@ +PublishServerDescriptor v1 has no effect diff --git a/src/test/conf_examples/relay_29/expected_log b/src/test/conf_examples/relay_29/expected_log new file mode 100644 index 000000000..f46c609c0 --- /dev/null +++ b/src/test/conf_examples/relay_29/expected_log @@ -0,0 +1 @@ +Linelist option 'MyFamily' has no value\. Skipping

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1531'
by nickm＠torproject.org 14 Nov '19

14 Nov '19

commit a76b7cd8b5da9951e5e446846ef4e3d9ec6b1453 Merge: 3b4a360ed 9f37c0f4f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 14 09:58:37 2019 -0500 Merge remote-tracking branch 'tor-github/pr/1531' changes/bug32468 | 3 + changes/ticket32451 | 5 + .../badnick_1/expected_log_no_dirauth_relay | 1 + .../badnick_2/expected_log_no_dirauth_relay | 1 + src/test/conf_examples/bridgeauth_1/expected_log | 1 + .../expected_log_no_dirauth_relay | 1 + src/test/conf_examples/crypto_accel/expected_log | 1 + .../error_nss => crypto_accel/expected_log_nss} | 0 src/test/conf_examples/crypto_accel/expected_nss | 2 + .../crypto_accel_req/expected_log_nss | 1 + src/test/conf_examples/dirauth_1/expected_log | 1 + src/test/conf_examples/empty_1/expected_log | 1 + src/test/conf_examples/empty_2/expected_log | 1 + src/test/conf_examples/empty_3/expected_log | 1 + src/test/conf_examples/example_1/expected_log | 1 + src/test/conf_examples/example_3/expected_log | 1 + src/test/conf_examples/include_1/expected_log | 1 + .../conf_examples/include_bug_31408/expected_log | 1 + src/test/conf_examples/large_1/expected_log | 1 + .../conf_examples/{pt_02 => lzma_zstd_1}/expected | 0 .../lzma_zstd_1/{error => expected_log} | 0 .../lzma_zstd_1/{error_lzma => expected_log_lzma} | 0 .../{error_lzma_zstd => expected_log_lzma_zstd} | 0 .../lzma_zstd_1/{error_zstd => expected_log_zstd} | 0 .../{pt_09/expected => lzma_zstd_1/expected_lzma} | 0 .../expected => lzma_zstd_1/expected_lzma_zstd} | 0 src/test/conf_examples/lzma_zstd_1/expected_zstd | 0 src/test/conf_examples/lzma_zstd_1/torrc | 5 +- src/test/conf_examples/nss_1/expected | 0 .../conf_examples/nss_1/{error => expected_log} | 0 src/test/conf_examples/nss_1/expected_log_nss | 1 + src/test/conf_examples/nss_1/expected_nss | 0 src/test/conf_examples/nss_1/torrc | 5 +- src/test/conf_examples/obsolete_1/expected_log | 1 + src/test/conf_examples/obsolete_1/torrc | 136 +++--- src/test/conf_examples/obsolete_2/expected_log | 1 + src/test/conf_examples/obsolete_2/torrc | 3 + src/test/conf_examples/obsolete_3/expected | 0 src/test/conf_examples/obsolete_3/expected_log | 1 + src/test/conf_examples/obsolete_3/torrc | 4 + src/test/conf_examples/ops_1/expected_log | 1 + src/test/conf_examples/ops_2/expected_log | 1 + src/test/conf_examples/ops_3/expected_log | 1 + src/test/conf_examples/ops_4/expected_log | 1 + src/test/conf_examples/ops_5/expected_log | 1 + src/test/conf_examples/ops_6/expected_log | 1 + src/test/conf_examples/pt_01/expected_log | 1 + src/test/conf_examples/pt_02/error | 1 + .../pt_02/expected_log_no_dirauth_relay | 1 + src/test/conf_examples/pt_03/expected_log | 1 + .../pt_03/expected_log_no_dirauth_relay | 1 + .../conf_examples/pt_03/expected_no_dirauth_relay | 1 + src/test/conf_examples/pt_04/expected_log | 1 + .../pt_04/expected_log_no_dirauth_relay | 1 + .../conf_examples/pt_04/expected_no_dirauth_relay | 3 + src/test/conf_examples/pt_05/expected_log | 1 + src/test/conf_examples/pt_06/expected_log | 1 + .../pt_06/expected_log_no_dirauth_relay | 1 + .../conf_examples/pt_06/expected_no_dirauth_relay | 6 + src/test/conf_examples/pt_07/expected_log | 1 + .../pt_08/expected_log_no_dirauth_relay | 1 + src/test/conf_examples/pt_09/error | 1 + src/test/conf_examples/relay_01/expected_log | 1 + src/test/conf_examples/relay_02/error | 1 + src/test/conf_examples/relay_03/expected_log | 1 + src/test/conf_examples/relay_04/expected_log | 1 + src/test/conf_examples/relay_05/expected_log | 1 + src/test/conf_examples/relay_06/expected_log | 1 + src/test/conf_examples/relay_07/expected_log | 1 + src/test/conf_examples/relay_08/expected_log | 1 + src/test/conf_examples/relay_09/expected_log | 1 + src/test/conf_examples/relay_10/expected_log | 1 + src/test/conf_examples/relay_14/expected_log | 1 + src/test/conf_examples/relay_17/expected_log | 1 + src/test/conf_examples/relay_19/expected_log | 1 + src/test/conf_examples/relay_21/expected_log | 1 + src/test/conf_examples/relay_29/expected_log | 1 + src/test/conf_failures/README | 5 + src/test/conf_failures/fail-error-success/error | 1 + src/test/conf_failures/fail-error-success/torrc | 0 src/test/conf_failures/fail-error/error | 1 + src/test/conf_failures/fail-error/torrc | 1 + .../conf_failures/fail-expected-error/expected | 0 src/test/conf_failures/fail-expected-error/torrc | 1 + src/test/conf_failures/fail-expected-log/expected | 0 .../conf_failures/fail-expected-log/expected_log | 1 + src/test/conf_failures/fail-expected-log/torrc | 0 src/test/conf_failures/fail-expected/expected | 1 + src/test/conf_failures/fail-expected/torrc | 0 src/test/test_parseconf.sh | 508 +++++++++++++++++---- 90 files changed, 573 insertions(+), 172 deletions(-)

1 0

[tor/master] test/parseconf: Rewrite the included files section
by nickm＠torproject.org 14 Nov '19

14 Nov '19

commit 4cf5d4cb3c6d725c7615b664b2f3ba116f36b150 Author: teor <teor(a)torproject.org> Date: Tue Nov 12 15:06:15 2019 +1000 test/parseconf: Rewrite the included files section Part of 32451. --- src/test/test_parseconf.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/test_parseconf.sh b/src/test/test_parseconf.sh index 83631cb4c..2f1f1ed35 100755 --- a/src/test/test_parseconf.sh +++ b/src/test/test_parseconf.sh @@ -30,10 +30,10 @@ # cmdline -- Optional. If present, it contains command-line arguments that # will be passed to Tor. # -# (included torrc files or directories) -- Optional. If present, and -# configured in the torrc* or cmdline, these files or directories are -# included. Include paths should be specified relative to the test case -# directory. +# (included torrc files or directories) -- Optional. Additional files can be +# included in configuration, using the "%include" directive. Files or +# directories can be included in any of the config files listed above. +# Include paths should be specified relative to the test case directory. # # Result Files #

1 0

[tor/master] test/parseconf: Split the file list into sections
by nickm＠torproject.org 14 Nov '19

14 Nov '19

commit 735d5f5b7eaed14b2242d1685e0ffa92f746c70c Author: teor <teor(a)torproject.org> Date: Tue Nov 12 15:03:47 2019 +1000 test/parseconf: Split the file list into sections There are lots of different files now, so having Config and Result sections is helpful. Part of 32451. --- src/test/test_parseconf.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/test_parseconf.sh b/src/test/test_parseconf.sh index 8d41438b2..83631cb4c 100755 --- a/src/test/test_parseconf.sh +++ b/src/test/test_parseconf.sh @@ -17,6 +17,8 @@ # This script looks for its test cases as individual directories in # src/test/conf_examples/. Each test may have these files: # +# Configuration Files +# # torrc -- Usually needed. This file is passed to Tor on the command line # with the "-f" flag. (If you omit it, you'll test Tor's behavior when # it receives a nonexistent configuration file.) @@ -33,6 +35,8 @@ # included. Include paths should be specified relative to the test case # directory. # +# Result Files +# # expected -- If this file is present, then it should be the expected result # of "--dump-config short" for this test case. Exactly one of # "expected" or "error" must be present, or the test will fail.

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 14 Nov '19

14 Nov '19

commit 8d600516215b2ee78d3dd383ecf325b5c1a809cc Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 14 14:15:40 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/fr/LC_MESSAGES/messages.po | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po index 0f8b17102..49e865fda 100644 --- a/locale/fr/LC_MESSAGES/messages.po +++ b/locale/fr/LC_MESSAGES/messages.po @@ -542,6 +542,8 @@ msgid "" "Get this year's Take Back the Internet With Tor t-shirt and the Tor: " "Strength in Numbers t-shirt." msgstr "" +"Obtenez notre tee-shirt de l’année « Take Back the Internet With Tort » et " +"notre tee-shirt « Tor: Strength in Numbers »." #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:277 msgid "sweatshirt" @@ -721,7 +723,7 @@ msgstr "par mois" #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:563 msgid "Gift selected" -msgstr "" +msgstr "Cadeau sélectionné " #: tmp/cache_locale/a1/a1384b9a21e3d43e946972b01389567dff845ee982dcf05228aa3e5096a74210.php:59 msgid "Estimated Donation Date:" @@ -1956,6 +1958,10 @@ msgid "" "to make a hardware donation that you think might be especially useful for " "us, please mail giving(at)torproject.org." msgstr "" +"Habituellement non, nous n’encourageons pas les gens à nous faire don de " +"matériel. Mais si vous souhaitez faire un don de matériel qui pourrait nous " +"être particulièrement utile d’après vous, veuillez nous contacter par " +"courriel à l’adresse giving(at)torproject.org." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:597 msgid "" @@ -1963,6 +1969,10 @@ msgid "" "at helping the Tor project develop software design to protect people's " "anonymity. It does not, in itself, run the Tor network." msgstr "" +"Le projet Tor gère de nombreuses machines en divers lieux, dont le but de " +"toutes est d’aider le projet Tor à développer des logiciels conçus pour " +"protéger l’anonymat des gens. En tant que tel, il ne fait pas fonctionner le" +" réseau Tor." #: tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:601 msgid ""

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 14 Nov '19

14 Nov '19

commit 54a2248a5351cfc740edb5ade7923aa76cabb812 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 14 13:53:15 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+de.po | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/contents+de.po b/contents+de.po index aa62bd1ea..61dc451ff 100644 --- a/contents+de.po +++ b/contents+de.po @@ -6116,6 +6116,8 @@ msgid "" "A web application (web app), is an application that the [client](#client) " "runs in a [web browser](#web-browser)." msgstr "" +"Eine Web-Applikation (Web-App) ist eine Anwendung, die der [client](#client)" +" in einem [web browser](#web-browser) ausführt." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6184,6 +6186,8 @@ msgid "" "[Pluggable transports](#pluggable-transports) are a type of bridge that " "helps disguise the fact that you are using Tor." msgstr "" +"[Pluggable-Transporte](#pluggable-transports) sind eine Art von Brücke, die " +"helfen, die Tatsache zu verschleiern, dass du Tor benutzt." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6275,6 +6279,10 @@ msgid "" "hard time determining whether or not those requests are coming from humans " "or bots." msgstr "" +"[Tor](#tor-/-tor-network/-core-tor) Benutzer werden oft mit Captchas " +"versorgt, weil Tor[relays](#relay) so viele Anfragen stellen, dass es " +"Webseiten manchmal schwer fällt festzustellen, ob diese Anfragen von " +"Menschen oder von Bots kommen oder nicht." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6288,6 +6296,9 @@ msgid "" "software without errors, the given checksum and the checksum of your " "downloaded file will be identical." msgstr "" +"Prüfsummen sind [hash](#hash)-Werte von Dateien. Wenn du die Software " +"fehlerfrei heruntergeladen hast, sind die angegebene Prüfsumme und die " +"Prüfsumme deiner heruntergeladenen Datei identisch." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6537,6 +6548,11 @@ msgid "" "running on a given IP address on a given date. This service is often useful" " when dealing with law enforcement." msgstr "" +"Der ExoneraTor-Dienst verwaltet eine Datenbank mit [relay](#relay)[IP-" +"Adressen](#ip-address), die Teil des Tor-Netzwerks waren. Es beantwortet die" +" Frage, ob es zu einem bestimmten Zeitpunkt ein [Tor](#tor-/-tor-network" +"/-core-tor) Relais gab, das unter einer bestimmten IP-Adresse lief. Dieser " +"Service ist oft nützlich, wenn es um die Strafverfolgung geht." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6595,6 +6611,15 @@ msgid "" "network/-core-tor) because their firewall blocks Tor connections. You can " "reconfigure or disable your firewall and restart Tor to test this." msgstr "" +"Eine Firewall ist ein Netzwerksicherheitssystem, das das ein- und ausgehende" +" Netzwerk [traffic](#traffic) überwacht und kontrolliert. Dieser Traffic-" +"Filter basiert auf vorgegebenen Regeln. Eine Firewall stellt typischerweise " +"eine Barriere zwischen einem vertrauenswürdigen, sicheren internen Netzwerk " +"und einem anderen externen Netzwerk dar, kann aber auch als Inhaltsfilter im" +" Sinne von [Zensur](#Netzwerk-Zensur) verwendet werden. Manchmal haben Leute" +" Schwierigkeiten, sich mit [Tor](#tor-/-tor-network/-core-tor) zu verbinden," +" weil ihre Firewall Torverbindungen blockiert. Du kannst deine Firewall neu " +"konfigurieren oder deaktivieren und Tor neu starten, um dies zu testen." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6610,6 +6635,11 @@ msgid "" "services that use Flash also offer an HTML5 alternative, which should work " "in the Tor Browser." msgstr "" +"Flash Player ist ein [Browser-Plugin](#add-on-extension-or-plugin) für " +"Internet [applications](#app), um Audio- und Videoinhalte anzusehen. Du " +"solltest Flash niemals in [Tor Browser](#tor-browser) ausführen lassen, da " +"es unsicher ist. Viele Dienste, die Flash verwenden, bieten auch eine " +"HTML5-Alternative, die im Tor-Browser funktionieren sollte." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -7139,6 +7169,9 @@ msgid "" "A standardized internet domain name used by onion services that end in " ".onion and is designed to be [self-authenticating](#self-authenticating)." msgstr "" +"Ein standardisierter Internet-Domainname, der von Onion-Diensten verwendet " +"wird und mit .onion endet und als " +"[selbstauthentifizierend](#selbstauthentifizierend) konzipiert ist." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -7153,6 +7186,10 @@ msgid "" "detecting [censorship](#network-censorship), surveillance and " "[traffic](#traffic) manipulation on the internet." msgstr "" +"OONI steht für \"[Open Observatory of Network " +"Interference](https://ooni.io/)\", es ist ein globales Beobachtungsnetzwerk " +"zur Erkennung von [Zensur](#Netzwerk-Zensur), Überwachung und " +"[Verkehr](#Verkehr) Manipulation im Internet." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -7302,6 +7339,12 @@ msgid "" "[traffic](#traffic) and hide it by bouncing through a series of computers " "around the world." msgstr "" +"[Orbot](https://play.google.com/store/apps/details?id=org.torproject.android)" +" ist eine kostenlose [app](#app) aus dem The Guardian Project, die es " +"anderen Anwendungen auf deinem Gerät ermöglicht, das Internet sicherer zu " +"nutzen. Orbot verwendet [Tor](#tor-/-tor-network/-core-tor), um deinen " +"Internetverkehr zu verschlüsseln und ihn zu verstecken, indem er durch eine " +"Reihe von Computern auf der ganzen Welt springt." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -7458,6 +7501,9 @@ msgid "" "](#cryptographic-signature) to prove the identity of the creator of a " "message or other files." msgstr "" +"Zusätzlich kann der private Schlüssel verwendet werden, um eine " +"[Signatur](#kryptographische Signatur) zu erstellen, um die Identität des " +"Erstellers einer Nachricht oder anderer Dateien nachzuweisen." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -7786,6 +7832,10 @@ msgid "" ")](#internet-service-provider-isp) and anyone watching your connection " "locally." msgstr "" +"Deine Internetaktivitäten, einschließlich der Namen und Adressen der von dir" +" besuchten Websites, werden vor deinem [Internet Service Provider (ISP" +")](#internet-service-provider-isp) und vor allen, die deine Verbindung lokal" +" überwachen, verborgen." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -8281,6 +8331,11 @@ msgid "" "easier, and second because it could act as an identifier if only a small " "number of users have the same path length as you." msgstr "" +"Pfade länger als 3 können auch deine Anonymität gefährden, zum einen weil es" +" <a href=\"https://www.freehaven.net/anonbib/#ccs07-doa\">denial of " +"security</a>-Angriffe einfacher macht, und zum anderen ist es dadurch" +" möglich, einen kleinen Teil der Nutzer*innen zu identifizieren, welche die " +"gleiche Pfadlänge haben wie du." #: https//support.torproject.org/misc/misc-12/ #: (content/misc/misc-12/contents+en.lrquestion.title) @@ -8293,6 +8348,9 @@ msgid "" "For sharing files over Tor, [OnionShare](https://onionshare.org/) is a good " "option." msgstr "" +"Um Dateien über Tor zu teilen, ist <a " +"href=\"https://onionshare.org/\">OnionShare</a> eine gute " +"Möglichkeit." #: https//support.torproject.org/misc/misc-12/ #: (content/misc/misc-12/contents+en.lrquestion.description) @@ -8355,6 +8413,8 @@ msgid "" "BitTorrent in particular is [not anonymous over " "Tor](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)." msgstr "" +"BitTorrent im Besonderen ist <a href=\"https://blog.torproject.org" +"/bittorrent-over-tor-isnt-good-idea\">nicht anonym über Tor</a>." #: https//support.torproject.org/misc/misc-14/ #: (content/misc/misc-14/contents+en.lrquestion.title) @@ -8384,6 +8444,8 @@ msgid "" "You can find more information about donating on our [donor " "FAQ](https://donate.torproject.org/donor-faq)." msgstr "" +"Weitere Information über Spenden finden sich in unserer <a " +"href=\"https://donate.torproject.org/donor-faq\">Spenden-FAQ</a>." #: https//support.torproject.org/misc/misc-2/ #: (content/misc/misc-2/contents+en.lrquestion.title) @@ -8447,6 +8509,11 @@ msgid "" "posts](https://blog.torproject.org/category/tags/form-990) on our financial " "reports." msgstr "" +"Siehe die <a " +"href=\"https://www.torproject.org/de/about/sponsors\">Liste unserer " +"Sponsor*innen</a> und eine Serie von <a " +"href=\"https://blog.torproject.org/category/tags/form-990\">Blogeinträgen</a>" +" mit finanziellen Berichten." #: https//support.torproject.org/misc/misc-3/ #: (content/misc/misc-3/contents+en.lrquestion.description) @@ -8483,6 +8550,9 @@ msgid "" "For further details, please see our [blog post on the " "subject](https://blog.torproject.org/bittorrent-over-tor-isnt-good-idea)." msgstr "" +"Für weitere Details siehe unseren <a " +"href=\"https://blog.torproject.org/bittorrent-over-tor-isnt-good-" +"idea\">Blogbeitrag darüber</a>." #: https//support.torproject.org/misc/misc-5/ #: (content/misc/misc-5/contents+en.lrquestion.title) @@ -8561,6 +8631,9 @@ msgid "" "We do take some safe measurements of how the network functions, which you " "can check out at [Tor Metrics](https://metrics.torproject.org/)." msgstr "" +"Wie erfassen einige Daten darüber, wie gut das Tor-Netzwerk funktioniert, " +"siehe unsere Seite <a href=\"https://metrics.torproject.org/\">Tor " +"Metrics</a>." #: https//support.torproject.org/misc/misc-7/ #: (content/misc/misc-7/contents+en.lrquestion.title) @@ -8582,6 +8655,8 @@ msgid "" "A list of all of our software projects can be found on our [projects " "page](https://www.torproject.org/projects/projects.html.en)." msgstr "" +"Eine List all unserer Software-Projekte gibt es auf unserer <a " +"href=\"https://www.torproject.org/projects/projects.html.en\">Projektseite</a>." #: https//support.torproject.org/misc/misc-8/ #: (content/misc/misc-8/contents+en.lrquestion.title) @@ -8594,6 +8669,9 @@ msgid "" "You can read all about that on our [Trademark faq " "page](https://www.torproject.org/about/trademark/)." msgstr "" +"Du kannst alles darüber auf unserer <a " +"href=\"https://www.torproject.org/docs/trademark-faq.html\">Trademark-FAQ-" +"Seite</a> nachlesen." #: https//support.torproject.org/misc/misc-9/ #: (content/misc/misc-9/contents+en.lrquestion.title)

1 0