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

[tor/maint-0.3.5] Add a test for router_get_advertised_or_port_by_af().
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit 1ba79d4567c95f75daf171878faaa07b78d89130 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 19 09:36:47 2020 -0400 Add a test for router_get_advertised_or_port_by_af(). --- src/test/test_router.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/src/test/test_router.c b/src/test/test_router.c index 601881a124..5699d5472b 100644 --- a/src/test/test_router.c +++ b/src/test/test_router.c @@ -7,9 +7,12 @@ * \brief Unittests for code in router.c **/ +#define CONFIG_PRIVATE +#define CONNECTION_PRIVATE #include "core/or/or.h" #include "app/config/config.h" #include "core/mainloop/mainloop.h" +#include "core/mainloop/connection.h" #include "feature/hibernate/hibernate.h" #include "feature/nodelist/routerinfo_st.h" #include "feature/nodelist/routerlist.h" @@ -17,6 +20,9 @@ #include "feature/stats/rephist.h" #include "lib/crypt_ops/crypto_curve25519.h" #include "lib/crypt_ops/crypto_ed25519.h" +#include "lib/encoding/confline.h" + +#include "core/or/listener_connection_st.h" /* Test suite stuff */ #include "test/test.h" @@ -231,11 +237,59 @@ test_router_check_descriptor_bandwidth_changed(void *arg) UNMOCK(we_are_hibernating); } +static smartlist_t *fake_connection_array = NULL; +static smartlist_t * +mock_get_connection_array(void) +{ + return fake_connection_array; +} + +static void +test_router_get_advertised_or_port(void *arg) +{ + (void)arg; + // uint16_t port; + int r, w=0, n=0; + char *msg=NULL; + or_options_t *opts = options_new(); + listener_connection_t *listener = NULL; + + // Set up a couple of configured ports. + config_line_append(&opts->ORPort_lines, "ORPort", "[1234::5678]:9999"); + config_line_append(&opts->ORPort_lines, "ORPort", "5.6.7.8:auto"); + r = parse_ports(opts, 0, &msg, &n, &w); + tt_assert(r == 0); + + // There are no listeners, so the "auto" case will turn up no results. + tt_int_op(0, OP_EQ, router_get_advertised_or_port_by_af(opts, AF_INET)); + + // This will return the matching value from the configured port. + tt_int_op(9999, OP_EQ, router_get_advertised_or_port_by_af(opts, AF_INET6)); + + // Now set up a dummy listener. + MOCK(get_connection_array, mock_get_connection_array); + fake_connection_array = smartlist_new(); + listener = listener_connection_new(CONN_TYPE_OR_LISTENER, AF_INET); + TO_CONN(listener)->port = 54321; + smartlist_add(fake_connection_array, TO_CONN(listener)); + + // We should get a port this time. + tt_int_op(54321, OP_EQ, router_get_advertised_or_port_by_af(opts, AF_INET)); + + done: + or_options_free(opts); + config_free_all(); + smartlist_free(fake_connection_array); + connection_free_minimal(TO_CONN(listener)); + UNMOCK(get_connection_array); +} + #define ROUTER_TEST(name, flags) \ { #name, test_router_ ## name, flags, NULL, NULL } struct testcase_t router_tests[] = { ROUTER_TEST(check_descriptor_bandwidth_changed, TT_FORK), ROUTER_TEST(dump_router_to_string_no_bridge_distribution_method, TT_FORK), + ROUTER_TEST(get_advertised_or_port, TT_FORK), END_OF_TESTCASES };

1 0

[tor/maint-0.3.5] router: Refactor IPv6 ORPort function logic
by nickm＠torproject.org 07 Oct '20

07 Oct '20

commit bac8bc0ff11d5b4502f2e71138d23f71fc25e72a Author: teor <teor(a)torproject.org> Date: Wed Jan 8 17:34:37 2020 +1000 router: Refactor IPv6 ORPort function logic Return early when there is no suitable IPv6 ORPort. Show the address and port on error, using a convenience function. Code simplification and refactoring. Cleanup after 32588. --- src/feature/relay/router.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 760daa249e..283f7c326b 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -1460,20 +1460,21 @@ router_get_advertised_ipv6_or_ap(const or_options_t *options, return; } - /* Like IPv4, if the relay is configured using the default - * authorities, disallow internal IPs. Otherwise, allow them. */ + /* If the relay is configured using the default authorities, disallow + * internal IPs. Otherwise, allow them. For IPv4 ORPorts and DirPorts, + * this check is done in resolve_my_address(). See #33681. */ const int default_auth = using_default_dir_authorities(options); - if (! tor_addr_is_internal(addr, 0) || ! default_auth) { - tor_addr_copy(&ipv6_ap_out->addr, addr); - ipv6_ap_out->port = port; - } else { - char addrbuf[TOR_ADDR_BUF_LEN]; + if (tor_addr_is_internal(addr, 0) && default_auth) { log_warn(LD_CONFIG, - "Unable to use configured IPv6 address \"%s\" in a " + "Unable to use configured IPv6 ORPort \"%s\" in a " "descriptor. Skipping it. " "Try specifying a globally reachable address explicitly.", - tor_addr_to_str(addrbuf, addr, sizeof(addrbuf), 1)); + fmt_addrport(addr, port)); + return; } + + tor_addr_copy(&ipv6_ap_out->addr, addr); + ipv6_ap_out->port = port; } /** Return the port that we should advertise as our DirPort;

1 0

[tor/master] Merge branch 'tor-gitlab/mr/159'
by dgoulet＠torproject.org 07 Oct '20

07 Oct '20

commit 17e9d40c16892f7a7c278926dd9f7ba0c175f42a Merge: 95a5186463 9ad525604e Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Oct 7 09:00:10 2020 -0400 Merge branch 'tor-gitlab/mr/159' changes/ticket40138 | 6 ++++++ configure.ac | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 63 insertions(+), 3 deletions(-)

1 0

[tor/master] Use AC_RUN_IFELSE, not AC_TRY_RUN.
by dgoulet＠torproject.org 07 Oct '20

07 Oct '20

commit 59c36b9b58010f658e022cf19e20e2c74103f258 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 23 10:29:31 2020 -0400 Use AC_RUN_IFELSE, not AC_TRY_RUN. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 4cbb43794d..a14b6d6e21 100644 --- a/configure.ac +++ b/configure.ac @@ -1094,7 +1094,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ dnl Let's see if we have a version mismatch between includes and libs. AC_MSG_CHECKING([for significant mismatch between openssl headers and libraries]) ac_retval=foo -AC_TRY_RUN(AC_LANG_PROGRAM([[ +AC_RUN_IFELSE(AC_LANG_PROGRAM([[ #include <openssl/opensslv.h> #include <openssl/crypto.h> ]], [[

1 0

[tor/master] Use AC_LANG_SOURCE
by dgoulet＠torproject.org 07 Oct '20

07 Oct '20

commit 9ad525604e274b4bc5264db37b1049da3d39ddac Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 23 10:53:09 2020 -0400 Use AC_LANG_SOURCE --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index a14b6d6e21..9b65a869f1 100644 --- a/configure.ac +++ b/configure.ac @@ -1094,7 +1094,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ dnl Let's see if we have a version mismatch between includes and libs. AC_MSG_CHECKING([for significant mismatch between openssl headers and libraries]) ac_retval=foo -AC_RUN_IFELSE(AC_LANG_PROGRAM([[ +AC_RUN_IFELSE([AC_LANG_SOURCE([AC_LANG_PROGRAM([[ #include <openssl/opensslv.h> #include <openssl/crypto.h> ]], [[ @@ -1103,7 +1103,7 @@ AC_RUN_IFELSE(AC_LANG_PROGRAM([[ unsigned long linking = OpenSSL_version_num() & mask; unsigned long running = OPENSSL_VERSION_NUMBER & mask; return !(linking==running); -]]), [openssl_ver_mismatch=no], [ +]])])], [openssl_ver_mismatch=no], [ # This is a kludge to figure out whether compilation failed, or whether # running the program failed. if test "$ac_retval" == "1"; then

1 0

[tor/master] configure.ac: Summarize how many times we warned.
by dgoulet＠torproject.org 07 Oct '20

07 Oct '20

commit ec9ac0756d5af93c6b5f7095f4b138240b4cf0f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 23 10:11:36 2020 -0400 configure.ac: Summarize how many times we warned. It's way too easy to have a warning in the middle of the configure process that the user never notices. --- configure.ac | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/configure.ac b/configure.ac index 6e6405a31e..4cbb43794d 100644 --- a/configure.ac +++ b/configure.ac @@ -24,6 +24,11 @@ AC_DEFINE(APPROX_RELEASE_DATE, ["2020-06-09"], # for 0.4.5.0-alpha-dev # "subdir-objects" means put .o files in the same directory as the .c files AM_INIT_AUTOMAKE([foreign 1.11 subdir-objects -Wall -Werror]) +tor_ac_n_warnings=0 +tor_incr_n_warnings() { + tor_ac_n_warnings=`expr $tor_ac_n_warnings + 1` +} + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_HEADERS([orconfig.h]) @@ -432,6 +437,7 @@ AC_SUBST([PYTHON], [$tor_cv_PYTHON]) PYTHON="$tor_cv_PYTHON" if test "x$PYTHON" = "x"; then + tor_incr_n_warnings AC_MSG_WARN([Python 3 unavailable; some tests will not be run.]) fi @@ -1229,6 +1235,7 @@ else have_lzma=no) if test "x$have_lzma" = "xno" ; then + tor_incr_n_warnings AC_MSG_WARN([Unable to find liblzma, $pkg_config_user_action, or set LZMA_CFLAGS and LZMA_LIBS.]) fi fi @@ -1261,6 +1268,7 @@ else have_zstd=no) if test "x$have_zstd" = "xno" ; then + tor_incr_n_warnings AC_MSG_WARN([Unable to find libzstd, $pkg_config_user_action, or set ZSTD_CFLAGS and ZSTD_LIBS.]) fi fi @@ -1365,6 +1373,7 @@ fi if test "$fragile_hardening" = "yes"; then TOR_TRY_COMPILE_WITH_CFLAGS(-ftrapv, also_link, CFLAGS_FTRAPV="-ftrapv", true) if test "$tor_cv_cflags__ftrapv" = "yes" && test "$tor_can_link__ftrapv" != "yes"; then + tor_incr_n_warnings AC_MSG_WARN([The compiler supports -ftrapv, but for some reason I was not able to link with -ftrapv. Are you missing run-time support? Run-time hardening will not work as well as it should.]) fi @@ -1905,6 +1914,7 @@ void try_atomic_init(struct x *xx) if test "$tor_cv_stdatomic_works" = "yes"; then AC_DEFINE(STDATOMIC_WORKS, 1, [Set to 1 if we can compile a simple stdatomic example.]) elif test "$ac_cv_header_stdatomic_h" = "yes"; then + tor_incr_n_warnings AC_MSG_WARN([Your compiler provides the stdatomic.h header, but it doesn't seem to work. I'll pretend it isn't there. If you are using Clang on Debian, maybe this is because of https://bugs.debian.org/903709 ]) fi @@ -2088,6 +2098,7 @@ AS_CASE([$malloc], ], [openbsd], [ + tor_incr_n_warnings AC_MSG_WARN([The openbsd malloc port is deprecated in Tor 0.3.5 and will be removed in a future version.]) enable_openbsd_malloc=yes ], @@ -2616,6 +2627,7 @@ TOR_TRY_COMPILE_WITH_CFLAGS([@warning_flags], [], if test "$enable_coverage" = "yes" && test "$have_clang" = "no"; then case "$host_os" in darwin*) + tor_incr_n_warnings AC_MSG_WARN([Tried to enable coverage on OSX without using the clang compiler. This might not work! If coverage fails, use CC=clang when configuring with --enable-coverage.]) esac fi @@ -2653,6 +2665,7 @@ if test "x$asciidoc" = "xtrue" && test "$ASCIIDOC" = "none"; then fi if test "$fragile_hardening" = "yes"; then + tor_incr_n_warnings AC_MSG_WARN([ ============ @@ -2670,6 +2683,7 @@ fi AC_OUTPUT if test "$openssl_ver_mismatch" = "yes"; then + tor_incr_n_warnings AC_MSG_WARN([ ============ Warning! The version OpenSSL headers we get from compiling with @@ -2831,3 +2845,10 @@ PPRINT_PROP_STRING([Man Pages], [$report_mandir]) AS_ECHO AS_ECHO(["Configure Line: ./configure $configure_flags"]) + +if test "$tor_ac_n_warnings" != "0"; then + AS_ECHO + PPRINT_WARN([ +Encountered $tor_ac_n_warnings warning(s). See messages above for more info. + ]) +fi

1 0

[tor/master] configure.ac: Give a warning if openssl headers don't match library.
by dgoulet＠torproject.org 07 Oct '20

07 Oct '20

commit ff300b384f55e9c0a47f6613eadd5ab93ca6d923 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 23 09:52:43 2020 -0400 configure.ac: Give a warning if openssl headers don't match library. We don't look at the patchlevel, since that tends not to have any API changes, and sometimes gets out of sync when distributors are careless. We only give the warning when the test program compiles but gives a nonzero exit status: sadly, autoconf doesn't give us an easy way to distinguish these. Fixes #40138 --- configure.ac | 39 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 41c23e964c..6e6405a31e 100644 --- a/configure.ac +++ b/configure.ac @@ -1044,8 +1044,6 @@ TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI $TOR_LIB_WS [if (getenv("THIS_SHOULDNT_BE_SET_X201803")) SSL_CIPHER_get_id((void *)0);], [], [/usr/local/opt/openssl /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /opt/openssl]) -dnl XXXX check for OPENSSL_VERSION_NUMBER == SSLeay() - if test "$enable_static_openssl" = "yes"; then if test "$tor_cv_library_openssl_dir" = "(system)"; then AC_MSG_ERROR("You must specify an explicit --with-openssl-dir=x option when using --enable-static-openssl") @@ -1057,7 +1055,7 @@ else fi AC_SUBST(TOR_OPENSSL_LIBS) -dnl Now check for particular openssl functions. +dnl Now validate openssl, and check for particular openssl functions. save_LIBS="$LIBS" save_LDFLAGS="$LDFLAGS" save_CPPFLAGS="$CPPFLAGS" @@ -1087,6 +1085,28 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ [ : ], [ AC_MSG_ERROR([OpenSSL is built without full ECC support, including curves P256 and P224. You can specify a path to one with ECC support with --with-openssl-dir.]) ]) +dnl Let's see if we have a version mismatch between includes and libs. +AC_MSG_CHECKING([for significant mismatch between openssl headers and libraries]) +ac_retval=foo +AC_TRY_RUN(AC_LANG_PROGRAM([[ + #include <openssl/opensslv.h> + #include <openssl/crypto.h> +]], [[ + /* Include major, minor, and fix, but not patch or status. */ + unsigned long mask = 0xfffff000; + unsigned long linking = OpenSSL_version_num() & mask; + unsigned long running = OPENSSL_VERSION_NUMBER & mask; + return !(linking==running); +]]), [openssl_ver_mismatch=no], [ + # This is a kludge to figure out whether compilation failed, or whether + # running the program failed. + if test "$ac_retval" == "1"; then + openssl_ver_mismatch=inconclusive + else + openssl_ver_mismatch=yes + fi], [openssl_ver_mismatch=cross]) +AC_MSG_RESULT([$openssl_ver_mismatch]) + AC_CHECK_MEMBERS([struct ssl_method_st.get_cipher_by_char], , , [#include <openssl/ssl.h> ]) @@ -2649,6 +2669,19 @@ fi AC_OUTPUT +if test "$openssl_ver_mismatch" = "yes"; then + AC_MSG_WARN([ +============ +Warning! The version OpenSSL headers we get from compiling with + "${TOR_CPPFLAGS_OPENSSL:-(no extra options)}" +do not match version of the OpenSSL library we get when linking with + "$TOR_LDFLAGS_OPENSSL $TOR_OPENSSL_LIBS". +This might cause compilation to fail. Try using --with-openssl-dir to specify +the exact OpenSSL path you want. +============ +]) +fi + # # Mini-report on what will be built. #

1 0

[tor/master] Changes file for autoconf improvements in 40138
by dgoulet＠torproject.org 07 Oct '20

07 Oct '20

commit de03f7a13d3b5bd60de1b1e1fc22ce2266002bf2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 23 10:13:43 2020 -0400 Changes file for autoconf improvements in 40138 --- changes/ticket40138 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changes/ticket40138 b/changes/ticket40138 new file mode 100644 index 0000000000..6facbb819f --- /dev/null +++ b/changes/ticket40138 @@ -0,0 +1,6 @@ + o Minor features (build): + - When running the configure script, try to detect version mismatches + between the openssl headers and libraries, and suggest that the + user should try "--with-openssl-dir". Closes 40138. + - If the configure script has given any warnings, remind the user about + them at the end of the script. Related to 40138.

1 0

[translation/whisperback] https://gitweb.torproject.org/translation.git/commit/?h=whisperback
by translation＠torproject.org 07 Oct '20

07 Oct '20

commit 2ec64db7f7b1129ebc44a1c8ee26c36cd1f2adae Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 12:48:45 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=whisperback --- sw/sw.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sw/sw.po b/sw/sw.po index 1191666ccb..ce2f7e2259 100644 --- a/sw/sw.po +++ b/sw/sw.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-29 12:08+0200\n" -"PO-Revision-Date: 2020-10-07 12:15+0000\n" +"PO-Revision-Date: 2020-10-07 12:28+0000\n" "Last-Translator: Zaituni Njovu <zaituni(a)zainafoundationtz.org>\n" "Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n" "MIME-Version: 1.0\n" @@ -38,7 +38,7 @@ msgstr "Namba sio sahihi, fungua PGP kizuizi cha uma." msgid "" "The %s variable was not found in any of the configuration files " "/etc/whisperback/config.py, ~/.whisperback/config.py, or ./config.py" -msgstr "" +msgstr "%sHaikuwepo katika faili ya kusanidisha/etc/whisperback/config.py," #: ../whisperBack/gui.py:114 msgid "Name of the affected software" @@ -46,11 +46,11 @@ msgstr "Majina yalio athiriwa na softi wea" #: ../whisperBack/gui.py:116 msgid "Exact steps to reproduce the error" -msgstr "" +msgstr "Hatua iliyo thibitika kuzalisha makosa" #: ../whisperBack/gui.py:118 msgid "Actual result and description of the error" -msgstr "" +msgstr "Maelezo halisi ya makosa" #: ../whisperBack/gui.py:120 msgid "Desired result"

1 0

[translation/torbutton-browseronboardingproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseronboardingproperties
by translation＠torproject.org 07 Oct '20

07 Oct '20

commit 28f2ef3b625b3b587a0dcfedff2470f2aa3ccbaa Author: Translation commit bot <translation(a)torproject.org> Date: Wed Oct 7 12:48:07 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseron… --- sw/browserOnboarding.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sw/browserOnboarding.properties b/sw/browserOnboarding.properties index 49a4448be4..88d6ebb29f 100644 --- a/sw/browserOnboarding.properties +++ b/sw/browserOnboarding.properties @@ -40,11 +40,11 @@ onboarding.tour-tor-expect-differences.next-button=nenda kwenye huduma za onion onboarding.tour-tor-onion-services=Huduma za Onion onboarding.tour-tor-onion-services.title=Kuwa na ulinzi zaidi. -onboarding.tour-tor-onion-services.description=Onion services are sites that end with a .onion that provide extra protections to publishers and visitors, including added safeguards against censorship. Onion services allow anyone to provide content and services anonymously. Click below to visit the DuckDuckGo onion site. -onboarding.tour-tor-onion-services.button=Visit an Onion +onboarding.tour-tor-onion-services.description=huduma za onion ni tovuti zinazoishia na a. onion zinazotoa ulinzi wa ziada kwa wachapishaji na wageni ikihusisha ongezeko la kulinda kinyume na udhibiti. huduma za onion zinaruhusu kila mmoja kutoa dhumuni na huduma bila kujulikana. bofya chini kutembelea tovuti ya onion ya DuckDuckGo +onboarding.tour-tor-onion-services.button=tembelea onion onboarding.tour-tor-onion-services.next-button=Imefanywa -onboarding.overlay-icon-tooltip-updated2=See what's new\nin %S +onboarding.overlay-icon-tooltip-updated2=tazama kilicho kipya katika\nkwenye%S onboarding.tour-tor-update.prefix-new=New onboarding.tour-tor-update.prefix-updated=Updated

1 0