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

[tor/master] Remove some dead checks
by nickm＠torproject.org 17 Jan '20

17 Jan '20

commit 6d2b9c963100dab56f61786b65d8629faaada7ad Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 17 08:31:18 2020 -0500 Remove some dead checks The only code that could set these options to be negative was in the unit tests. --- src/feature/dirauth/dirauth_config.c | 10 +--------- src/test/test_options.c | 20 -------------------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/src/feature/dirauth/dirauth_config.c b/src/feature/dirauth/dirauth_config.c index 4a3f56996..7895e3817 100644 --- a/src/feature/dirauth/dirauth_config.c +++ b/src/feature/dirauth/dirauth_config.c @@ -403,12 +403,6 @@ dirauth_options_pre_normalize(void *arg, char **msg_out) "AuthDirGuardBWGuarantee", msg_out) < 0) return -1; - if (options->MinUptimeHidServDirectoryV2 < 0) { - log_warn(LD_CONFIG, "MinUptimeHidServDirectoryV2 option must be at " - "least 0 seconds. Changing to 0."); - options->MinUptimeHidServDirectoryV2 = 0; - } - return 0; } @@ -437,9 +431,7 @@ dirauth_options_validate(const void *arg, char **msg) t = format_recommended_version_list(options->RecommendedServerVersions, 1); tor_free(t); - if (options->TestingAuthDirTimeToLearnReachability < 0) { - REJECT("TestingAuthDirTimeToLearnReachability must be non-negative."); - } else if (options->TestingAuthDirTimeToLearnReachability > 2*60*60) { + if (options->TestingAuthDirTimeToLearnReachability > 2*60*60) { COMPLAIN("TestingAuthDirTimeToLearnReachability is insanely high."); } diff --git a/src/test/test_options.c b/src/test/test_options.c index bdcdba802..119b2a54a 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -991,19 +991,6 @@ test_options_validate__authdir(void *ignored) "but ClientOnly also set."); tor_free(msg); - free_options_test_data(tdata); - tdata = get_options_test_data(ENABLE_AUTHORITY_V3); - /* We have to set this value manually, because it won't parse */ - get_dirauth_options(tdata->opt)->MinUptimeHidServDirectoryV2 = -1; - mock_clean_saved_logs(); - ret = options_validate(NULL, tdata->opt, &msg); - tt_int_op(ret, OP_EQ, 0); - expect_log_msg("MinUptimeHidServDirectoryV2 " - "option must be at least 0 seconds. Changing to 0.\n"); - tt_int_op(get_dirauth_options(tdata->opt)->MinUptimeHidServDirectoryV2, - OP_EQ, 0); - tor_free(msg); - done: teardown_capture_of_logs(); // sandbox_free_getaddrinfo_cache(); @@ -3879,13 +3866,6 @@ test_options_validate__testing_options(void *ignored) tor_free(msg); \ STMT_END - TEST_TESTING_OPTION(TestingAuthDirTimeToLearnReachability, - get_dirauth_options, -1, 8000, - "must be non-negative.", ENABLE_AUTHORITY_V3); - TEST_TESTING_OPTION(TestingAuthDirTimeToLearnReachability, - get_dirauth_options, -1, 8000, - "must be non-negative.", ENABLE_AUTHORITY_BRIDGE); - TEST_TESTING_OPTION(TestingEstimatedDescriptorPropagationTime, , -1, 3601, "must be non-negative.", ""); TEST_TESTING_OPTION(TestingClientMaxIntervalWithoutRequest, , -1, 3601,

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 17 Jan '20

17 Jan '20

commit 7830c365c6c257831a52efdd57f136ce2595c4a7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 17 13:24:08 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fa.po | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/contents+fa.po b/contents+fa.po index 2550f51acd..a259e67498 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -5935,7 +5935,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## C" -msgstr "" +msgstr "## C" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6005,7 +6005,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Compass" -msgstr "" +msgstr "### Compass" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6086,7 +6086,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## D" -msgstr "" +msgstr "## D" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6116,7 +6116,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## E" -msgstr "" +msgstr "## E" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6177,7 +6177,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## F" -msgstr "" +msgstr "## F" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6243,7 +6243,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### fte" -msgstr "" +msgstr "### fte" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6255,7 +6255,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## G" -msgstr "" +msgstr "## G" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6273,7 +6273,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### GSoC" -msgstr "" +msgstr "### GSoC" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6310,7 +6310,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## H" -msgstr "" +msgstr "## H" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6656,7 +6656,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "Obfs3 is not supported anymore." -msgstr "" +msgstr "obfs3 دیگر پشتیبانی نمی شود." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6716,6 +6716,8 @@ msgid "" "[Learn more about Onion Browser](https://blog.torproject.org/tor-heart-" "onion-browser-and-more-ios-tor)" msgstr "" +"[درباره Onion Browser بیشتر یاد بگیرید](https://blog.torproject.org/tor-" +"heart-onion-browser-and-more-ios-tor)" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -6815,7 +6817,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Orbot" -msgstr "" +msgstr "### Orbot" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -7072,7 +7074,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### single onion service" -msgstr "" +msgstr "### سرویس تک پیازی" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -7086,7 +7088,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### Stem" -msgstr "" +msgstr "### Stem" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -7112,7 +7114,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "## T" -msgstr "" +msgstr "## T" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -7343,7 +7345,7 @@ msgstr "" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### TorBirdy" -msgstr "" +msgstr "### TorBirdy" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 17 Jan '20

17 Jan '20

commit d241cb521fa937f3fd3d66cdb0fee89b9f25ba7a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jan 17 12:53:46 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fa.po | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/contents+fa.po b/contents+fa.po index d67f553085..2550f51acd 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -966,7 +966,7 @@ msgstr "چرا نام آن تور می باشد؟" #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) msgid "Tor is the onion routing network." -msgstr "" +msgstr "تور شبکه مسیریابی پیازی می باشد." #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) @@ -1125,6 +1125,8 @@ msgid "" "If you are using macOS, you can [install " "GPGTools](https://www.gpgtools.org)." msgstr "" +"اگر در حال استفاده از مک هستید، می توانید [GPGTools را نصب " +"کنید](https://www.gpgtools.org)." #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -1481,7 +1483,7 @@ msgstr "obfs4proxy.exe ( اگر شما از پل استفاده می‌کنید) #: https//support.torproject.org/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) msgid "* For macOS" -msgstr "" +msgstr "* برای مک" #: https//support.torproject.org/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) @@ -2592,7 +2594,7 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-45/ #: (content/tbb/tbb-45/contents+en.lrquestion.title) msgid "Gmail warns me that my account may have been compromised" -msgstr "" +msgstr "Gmail به من می گوید که حساب کاربری من در معرض خطر قرار گرفته است" #: https//support.torproject.org/tbb/tbb-45/ #: (content/tbb/tbb-45/contents+en.lrquestion.description) @@ -2683,6 +2685,8 @@ msgid "" "Please see the [Installation](https://tb-" "manual.torproject.org/installation/) section in the Tor Browser Manual." msgstr "" +"لطفا بخش [نصب](https://tb-manual.torproject.org/installation/) را در راهنما " +"مرورگر تور ببینید." #: https//support.torproject.org/tbb/tbb-47/ #: (content/tbb/tbb-47/contents+en.lrquestion.title)

1 0

[tor/master] Merge branch 'ticket32487_squashed_and_merged'
by nickm＠torproject.org 17 Jan '20

17 Jan '20

commit abd9ae48ac2306dc2784d9af2b34b883d83534f4 Merge: 01fdc3240 3c89622e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 17 07:50:50 2020 -0500 Merge branch 'ticket32487_squashed_and_merged' changes/feature32487 | 3 + configure.ac | 10 +- doc/HACKING/Module.md | 12 ++- src/app/config/config.c | 13 ++- src/core/include.am | 2 +- src/core/mainloop/connection.c | 6 +- src/core/mainloop/mainloop.c | 8 +- src/feature/control/control_getinfo.c | 83 ++++++++++++++- src/feature/dircache/dircache_stub.c | 78 ++++++++++++++ src/feature/dircache/dirserv.c | 175 ++++++-------------------------- src/feature/dircache/dirserv.h | 39 +++++-- src/feature/dircache/include.am | 8 +- src/feature/dirclient/dirclient.c | 23 ++--- src/feature/dirclient/dirclient.h | 2 - src/feature/dirclient/dirclient_modes.c | 95 +++++++++++++++++ src/feature/dirclient/dirclient_modes.h | 24 +++++ src/feature/dirclient/include.am | 2 + src/feature/dircommon/directory.c | 31 ------ src/feature/dircommon/directory.h | 6 -- src/feature/nodelist/microdesc.c | 3 +- src/feature/nodelist/networkstatus.c | 7 +- src/feature/nodelist/node_select.c | 5 +- src/feature/nodelist/nodelist.c | 4 +- src/feature/nodelist/routerlist.c | 7 +- src/test/test_config.c | 27 ++--- 25 files changed, 422 insertions(+), 251 deletions(-)

1 0

[tor/master] Merge branch 'ticket32487_squashed' into ticket32487_squashed_and_merged
by nickm＠torproject.org 17 Jan '20

17 Jan '20

commit 3c89622e39d964b731a40c6a705327d5caa07be4 Merge: 5e70c27e8 efb301c86 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 16 07:57:37 2020 -0500 Merge branch 'ticket32487_squashed' into ticket32487_squashed_and_merged Resolved conflicts in src/core/include.am changes/feature32487 | 3 + configure.ac | 10 +- doc/HACKING/Module.md | 12 ++- src/app/config/config.c | 13 ++- src/core/include.am | 2 +- src/core/mainloop/connection.c | 6 +- src/core/mainloop/mainloop.c | 8 +- src/feature/control/control_getinfo.c | 83 ++++++++++++++- src/feature/dircache/dircache_stub.c | 78 ++++++++++++++ src/feature/dircache/dirserv.c | 175 ++++++-------------------------- src/feature/dircache/dirserv.h | 39 +++++-- src/feature/dircache/include.am | 8 +- src/feature/dirclient/dirclient.c | 23 ++--- src/feature/dirclient/dirclient.h | 2 - src/feature/dirclient/dirclient_modes.c | 95 +++++++++++++++++ src/feature/dirclient/dirclient_modes.h | 24 +++++ src/feature/dirclient/include.am | 2 + src/feature/dircommon/directory.c | 31 ------ src/feature/dircommon/directory.h | 6 -- src/feature/nodelist/microdesc.c | 3 +- src/feature/nodelist/networkstatus.c | 7 +- src/feature/nodelist/node_select.c | 5 +- src/feature/nodelist/nodelist.c | 4 +- src/feature/nodelist/routerlist.c | 7 +- src/test/test_config.c | 27 ++--- 25 files changed, 422 insertions(+), 251 deletions(-) diff --cc src/core/include.am index 41347ed64,f332b3758..7752a7974 --- a/src/core/include.am +++ b/src/core/include.am @@@ -7,7 -172,59 +7,6 @@@ # LIBTOR_APP_TESTING_A_SOURCES = $(LIBTOR_APP_A_SOURCES) -# The Relay module. -MODULE_RELAY_SOURCES = \ - src/feature/relay/routermode.c \ - src/feature/relay/relay_config.c \ - src/feature/relay/relay_periodic.c \ - src/feature/relay/relay_sys.c \ - src/feature/relay/transport_config.c - -# The Directory Cache module. -MODULE_DIRCACHE_SOURCES = \ - src/feature/dircache/conscache.c \ - src/feature/dircache/consdiffmgr.c \ - src/feature/dircache/dircache.c \ - src/feature/dircache/dirserv.c - -# The Directory Authority module. -MODULE_DIRAUTH_SOURCES = \ - src/feature/dirauth/authmode.c \ - src/feature/dirauth/bridgeauth.c \ - src/feature/dirauth/bwauth.c \ - src/feature/dirauth/dirauth_config.c \ - src/feature/dirauth/dirauth_periodic.c \ - src/feature/dirauth/dirauth_sys.c \ - src/feature/dirauth/dircollate.c \ - src/feature/dirauth/dirvote.c \ - src/feature/dirauth/dsigs_parse.c \ - src/feature/dirauth/guardfraction.c \ - src/feature/dirauth/keypin.c \ - src/feature/dirauth/process_descs.c \ - src/feature/dirauth/reachability.c \ - src/feature/dirauth/recommend_pkg.c \ - src/feature/dirauth/shared_random.c \ - src/feature/dirauth/shared_random_state.c \ - src/feature/dirauth/voteflags.c - -if BUILD_MODULE_RELAY -LIBTOR_APP_A_SOURCES += $(MODULE_RELAY_SOURCES) -else -LIBTOR_APP_A_STUB_SOURCES += src/feature/relay/relay_stub.c -endif - -if BUILD_MODULE_DIRCACHE -LIBTOR_APP_A_SOURCES += $(MODULE_DIRCACHE_SOURCES) -else -LIBTOR_APP_A_STUB_SOURCES += src/feature/dircache/dircache_stub.c -endif - -if BUILD_MODULE_DIRAUTH -LIBTOR_APP_A_SOURCES += $(MODULE_DIRAUTH_SOURCES) -else -LIBTOR_APP_A_STUB_SOURCES += src/feature/dirauth/dirauth_stub.c -endif -- src_core_libtor_app_a_SOURCES = \ $(LIBTOR_APP_A_SOURCES) \ $(LIBTOR_APP_A_STUB_SOURCES) diff --cc src/feature/dircache/include.am index 3ff54ad64,000000000..ab162565f mode 100644,000000..100644 --- a/src/feature/dircache/include.am +++ b/src/feature/dircache/include.am @@@ -1,15 -1,0 +1,21 @@@ + +# ADD_C_FILE: INSERT SOURCES HERE. - LIBTOR_APP_A_SOURCES += \ ++MODULE_DIRCACHE_SOURCES = \ + src/feature/dircache/conscache.c \ + src/feature/dircache/consdiffmgr.c \ + src/feature/dircache/dircache.c \ + src/feature/dircache/dirserv.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/feature/dircache/cached_dir_st.h \ + src/feature/dircache/conscache.h \ + src/feature/dircache/consdiffmgr.h \ + src/feature/dircache/dircache.h \ + src/feature/dircache/dirserv.h ++ ++if BUILD_MODULE_DIRCACHE ++LIBTOR_APP_A_SOURCES += $(MODULE_DIRCACHE_SOURCES) ++else ++LIBTOR_APP_A_STUB_SOURCES += src/feature/dircache/dircache_stub.c ++endif diff --cc src/feature/dirclient/include.am index 7e7259bc5,000000000..24cae9eed mode 100644,000000..100644 --- a/src/feature/dirclient/include.am +++ b/src/feature/dirclient/include.am @@@ -1,12 -1,0 +1,14 @@@ + +# ADD_C_FILE: INSERT SOURCES HERE. +LIBTOR_APP_A_SOURCES += \ + src/feature/dirclient/dirclient.c \ ++ src/feature/dirclient/dirclient_modes.c \ + src/feature/dirclient/dlstatus.c + +# ADD_C_FILE: INSERT HEADERS HERE. +noinst_HEADERS += \ + src/feature/dirclient/dir_server_st.h \ + src/feature/dirclient/dirclient.h \ ++ src/feature/dirclient/dirclient_modes.h \ + src/feature/dirclient/dlstatus.h \ + src/feature/dirclient/download_status_st.h

1 0

[tor/master] Define a "dircache" module.
by nickm＠torproject.org 17 Jan '20

17 Jan '20

commit 888a0be0b913bea33d9b2ba635b7f27db5fc1b95 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 8 21:03:20 2020 -0500 Define a "dircache" module. For now, this module is enabled whenever the relay module is enabled, and disabled whenever the relay module is disabled. Though they are logically separate, the use cases for running one without the other are rare enough that we don't really want to support compiling them independently. --- configure.ac | 10 +++++++++- doc/HACKING/Module.md | 12 +++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 894ca2b0f..85ffc1c75 100644 --- a/configure.ac +++ b/configure.ac @@ -278,7 +278,7 @@ dnl Tor modules options. These options are namespaced with --disable-module-XXX dnl --- dnl All our modules. -m4_define(MODULES, relay dirauth) +m4_define(MODULES, relay dirauth dircache) dnl Relay module. AC_ARG_ENABLE([module-relay], @@ -289,6 +289,14 @@ AM_COND_IF(BUILD_MODULE_RELAY, AC_DEFINE([HAVE_MODULE_RELAY], [1], [Compile with Relay feature support])) +dnl Dircache module. (This cannot be enabled or disabled independently of +dnl the relay module.) +AM_CONDITIONAL(BUILD_MODULE_DIRCACHE, + [test "x$enable_module_relay" != "xno"]) +AM_COND_IF(BUILD_MODULE_DIRCACHE, + AC_DEFINE([HAVE_MODULE_DIRCACHE], [1], + [Compile with directory cache support])) + dnl Directory Authority module. AC_ARG_ENABLE([module-dirauth], AS_HELP_STRING([--disable-module-dirauth], diff --git a/doc/HACKING/Module.md b/doc/HACKING/Module.md index 3a07d0c63..781bb978f 100644 --- a/doc/HACKING/Module.md +++ b/doc/HACKING/Module.md @@ -11,12 +11,18 @@ selectively enable or disable, at `configure` time. Currently, tor has these modules: - Relay subsystem (relay) + - Directory cache system (dircache). - Directory Authority subsystem (dirauth) -dirauth is located in its own directory in `src/feature/dirauth/`. +The dirauth code is located in its own directory in `src/feature/dirauth/`. -Relay is located in directories named `src/*/*relay` and `src/*/*dircache`, -which are being progressively refactored and disabled. +The relay code is located in a directory named `src/*/*relay`, which is +being progressively refactored and disabled. + +The dircache code is located in `src/*/*dircache`. Right now, it is +disabled if and only if the relay module is disabled. (We are treating +them as separate modules because they are logically independent, not +because you would actually want to run one without the other.) To disable a module, pass `--disable-module-{dirauth,relay}` at configure time. All modules are currently enabled by default.

1 0

[tor/master] Move dir_split_resource_into_spoolable() to dircache module.
by nickm＠torproject.org 17 Jan '20

17 Jan '20

commit 4cf15ee015b8e4228a8d817cb54067853bf38378 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 8 21:24:26 2020 -0500 Move dir_split_resource_into_spoolable() to dircache module. Only directory caches actually need to spool things. --- src/feature/dircache/dirserv.c | 31 +++++++++++++++++++++++++++++++ src/feature/dircache/dirserv.h | 7 +++++++ src/feature/dircommon/directory.c | 31 ------------------------------- src/feature/dircommon/directory.h | 6 ------ 4 files changed, 38 insertions(+), 37 deletions(-) diff --git a/src/feature/dircache/dirserv.c b/src/feature/dircache/dirserv.c index 5d38d1b8a..738b1928a 100644 --- a/src/feature/dircache/dirserv.c +++ b/src/feature/dircache/dirserv.c @@ -266,6 +266,37 @@ dirserv_get_consensus,(const char *flavor_name)) return strmap_get(cached_consensuses, flavor_name); } +/** As dir_split_resource_into_fingerprints, but instead fills + * spool_out with a list of spoolable_resource_t for the resource + * identified through source. */ +int +dir_split_resource_into_spoolable(const char *resource, + dir_spool_source_t source, + smartlist_t *spool_out, + int *compressed_out, + int flags) +{ + smartlist_t *fingerprints = smartlist_new(); + + tor_assert(flags & (DSR_HEX|DSR_BASE64)); + const size_t digest_len = + (flags & DSR_DIGEST256) ? DIGEST256_LEN : DIGEST_LEN; + + int r = dir_split_resource_into_fingerprints(resource, fingerprints, + compressed_out, flags); + /* This is not a very efficient implementation XXXX */ + SMARTLIST_FOREACH_BEGIN(fingerprints, uint8_t *, digest) { + spooled_resource_t *spooled = + spooled_resource_new(source, digest, digest_len); + if (spooled) + smartlist_add(spool_out, spooled); + tor_free(digest); + } SMARTLIST_FOREACH_END(digest); + + smartlist_free(fingerprints); + return r; +} + /** As dirserv_get_routerdescs(), but instead of getting signed_descriptor_t * pointers, adds copies of digests to fps_out, and doesn't use the * /tor/server/ prefix. For a /d/ request, adds descriptor digests; for other diff --git a/src/feature/dircache/dirserv.h b/src/feature/dircache/dirserv.h index cec17121e..a4e10dd16 100644 --- a/src/feature/dircache/dirserv.h +++ b/src/feature/dircache/dirserv.h @@ -73,6 +73,13 @@ typedef struct spooled_resource_t { int connection_dirserv_flushed_some(dir_connection_t *conn); +enum dir_spool_source_t; +int dir_split_resource_into_spoolable(const char *resource, + enum dir_spool_source_t source, + smartlist_t *spool_out, + int *compressed_out, + int flags); + int directory_fetches_from_authorities(const or_options_t *options); int directory_fetches_dir_info_early(const or_options_t *options); int directory_fetches_dir_info_later(const or_options_t *options); diff --git a/src/feature/dircommon/directory.c b/src/feature/dircommon/directory.c index f65d3eec0..b177fe520 100644 --- a/src/feature/dircommon/directory.c +++ b/src/feature/dircommon/directory.c @@ -702,34 +702,3 @@ dir_split_resource_into_fingerprints(const char *resource, smartlist_free(fp_tmp); return 0; } - -/** As dir_split_resource_into_fingerprints, but instead fills - * spool_out with a list of spoolable_resource_t for the resource - * identified through source. */ -int -dir_split_resource_into_spoolable(const char *resource, - dir_spool_source_t source, - smartlist_t *spool_out, - int *compressed_out, - int flags) -{ - smartlist_t *fingerprints = smartlist_new(); - - tor_assert(flags & (DSR_HEX|DSR_BASE64)); - const size_t digest_len = - (flags & DSR_DIGEST256) ? DIGEST256_LEN : DIGEST_LEN; - - int r = dir_split_resource_into_fingerprints(resource, fingerprints, - compressed_out, flags); - /* This is not a very efficient implementation XXXX */ - SMARTLIST_FOREACH_BEGIN(fingerprints, uint8_t *, digest) { - spooled_resource_t *spooled = - spooled_resource_new(source, digest, digest_len); - if (spooled) - smartlist_add(spool_out, spooled); - tor_free(digest); - } SMARTLIST_FOREACH_END(digest); - - smartlist_free(fingerprints); - return r; -} diff --git a/src/feature/dircommon/directory.h b/src/feature/dircommon/directory.h index 1ed2138d0..0f26cdeff 100644 --- a/src/feature/dircommon/directory.h +++ b/src/feature/dircommon/directory.h @@ -108,12 +108,6 @@ void connection_dir_about_to_close(dir_connection_t *dir_conn); int dir_split_resource_into_fingerprints(const char *resource, smartlist_t *fp_out, int *compressed_out, int flags); -enum dir_spool_source_t; -int dir_split_resource_into_spoolable(const char *resource, - enum dir_spool_source_t source, - smartlist_t *spool_out, - int *compressed_out, - int flags); int dir_split_resource_into_fingerprint_pairs(const char *res, smartlist_t *pairs_out); char *directory_dump_request_log(void);

1 0

[tor/master] Disable feature/dircache files when dircache module is disabled.
by nickm＠torproject.org 17 Jan '20

17 Jan '20

commit 8a0c739467c87c6d7358d112bd1400250ad6e5c4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 8 21:13:29 2020 -0500 Disable feature/dircache files when dircache module is disabled. To make Tor still work, we define a minimal dircache_stub.c file that defines the entry points to the module that can actually be seen by the compiler when we're building with dircache and relay disabled. --- src/core/include.am | 18 ++++- src/feature/dircache/dircache_stub.c | 152 +++++++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+), 4 deletions(-) diff --git a/src/core/include.am b/src/core/include.am index bd36d01f2..1861f6cd4 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -91,10 +91,6 @@ LIBTOR_APP_A_SOURCES = \ src/feature/control/control_proto.c \ src/feature/control/fmt_serverstatus.c \ src/feature/control/getinfo_geoip.c \ - src/feature/dircache/conscache.c \ - src/feature/dircache/consdiffmgr.c \ - src/feature/dircache/dircache.c \ - src/feature/dircache/dirserv.c \ src/feature/dirclient/dirclient.c \ src/feature/dirclient/dlstatus.c \ src/feature/dircommon/consdiff.c \ @@ -183,6 +179,13 @@ MODULE_RELAY_SOURCES = \ src/feature/relay/relay_sys.c \ src/feature/relay/transport_config.c +# The Directory Cache module. +MODULE_DIRCACHE_SOURCES = \ + src/feature/dircache/conscache.c \ + src/feature/dircache/consdiffmgr.c \ + src/feature/dircache/dircache.c \ + src/feature/dircache/dirserv.c + # The Directory Authority module. MODULE_DIRAUTH_SOURCES = \ src/feature/dirauth/authmode.c \ @@ -209,6 +212,12 @@ else LIBTOR_APP_A_STUB_SOURCES += src/feature/relay/relay_stub.c endif +if BUILD_MODULE_DIRCACHE +LIBTOR_APP_A_SOURCES += $(MODULE_DIRCACHE_SOURCES) +else +LIBTOR_APP_A_STUB_SOURCES += src/feature/dircache/dircache_stub.c +endif + if BUILD_MODULE_DIRAUTH LIBTOR_APP_A_SOURCES += $(MODULE_DIRAUTH_SOURCES) else @@ -222,6 +231,7 @@ if UNITTESTS_ENABLED # Add the sources of the modules that are needed for tests to work here. LIBTOR_APP_TESTING_A_SOURCES += $(MODULE_RELAY_SOURCES) +LIBTOR_APP_TESTING_A_SOURCES += $(MODULE_DIRCACHE_SOURCES) LIBTOR_APP_TESTING_A_SOURCES += $(MODULE_DIRAUTH_SOURCES) src_core_libtor_app_testing_a_SOURCES = $(LIBTOR_APP_TESTING_A_SOURCES) diff --git a/src/feature/dircache/dircache_stub.c b/src/feature/dircache/dircache_stub.c new file mode 100644 index 000000000..dcab3bbbb --- /dev/null +++ b/src/feature/dircache/dircache_stub.c @@ -0,0 +1,152 @@ +/* Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2020, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * @file dircache_stub.c + * @brief Stub declarations for use when dircache module is disabled. + **/ + +#include "core/or/or.h" +#include "feature/dircache/consdiffmgr.h" +#include "feature/dircache/dircache.h" +#include "feature/dircache/dirserv.h" +#include "feature/dircommon/dir_connection_st.h" + +int +directory_handle_command(dir_connection_t *conn) +{ + (void) conn; + tor_assert_nonfatal_unreached_once(); + return -1; +} + +int +connection_dirserv_flushed_some(dir_connection_t *conn) +{ + (void) conn; + tor_assert_nonfatal_unreached_once(); + return -1; +} + +int +directory_fetches_from_authorities(const or_options_t *options) +{ + (void) options; + return 0; +} + +int +directory_fetches_dir_info_early(const or_options_t *options) +{ + (void) options; + return 0; +} + +int +directory_fetches_dir_info_later(const or_options_t *options) +{ + (void) options; + return 0; +} + +int +directory_caches_unknown_auth_certs(const or_options_t *options) +{ + (void) options; + return 0; +} + +int +directory_caches_dir_info(const or_options_t *options) +{ + (void) options; + return 0; +} + +int +directory_permits_begindir_requests(const or_options_t *options) +{ + (void) options; + return 0; +} + +int +directory_too_idle_to_fetch_descriptors(const or_options_t *options, + time_t now) +{ + (void)options; + (void)now; + return 0; +} + +cached_dir_t * +dirserv_get_consensus(const char *flavor_name) +{ + (void) flavor_name; + return NULL; +} + +void +dir_conn_clear_spool(dir_connection_t *conn) +{ + if (!conn) + return; + tor_assert_nonfatal_once(conn->spool == NULL); +} + +void +consdiffmgr_enable_background_compression(void) +{ +} + +void +dirserv_set_cached_consensus_networkstatus(const char *networkstatus, + size_t networkstatus_len, + const char *flavor_name, + const common_digests_t *digests, + const uint8_t *sha3_as_signed, + time_t published) +{ + (void)networkstatus; + (void)networkstatus_len; + (void)flavor_name; + (void)digests; + (void)sha3_as_signed; + (void)published; +} + +int +consdiffmgr_add_consensus(const char *consensus, + size_t consensus_len, + const networkstatus_t *as_parsed) +{ + (void)consensus; + (void)consensus_len; + (void)as_parsed; + return 0; +} + +int +consdiffmgr_register_with_sandbox(struct sandbox_cfg_elem_t **cfg) +{ + (void)cfg; + return 0; +} + +int +consdiffmgr_cleanup(void) +{ + return 0; +} + +void +consdiffmgr_free_all(void) +{ +} + +void +dirserv_free_all(void) +{ +}

1 0

[tor/master] Move dirserv_get_routerdescs() to control_getinfo.c
by nickm＠torproject.org 17 Jan '20

17 Jan '20

commit fe8156dbc20870bb2e065aa10ca7f2e993958597 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 8 21:32:16 2020 -0500 Move dirserv_get_routerdescs() to control_getinfo.c This function had some XXX comments indicating (correctly) that it was not actually used by the dirserver code, and that only the controller still used it. --- src/feature/control/control_getinfo.c | 83 ++++++++++++++++++++++++++++++++++- src/feature/dircache/dirserv.c | 81 ---------------------------------- src/feature/dircache/dirserv.h | 2 - 3 files changed, 82 insertions(+), 84 deletions(-) diff --git a/src/feature/control/control_getinfo.c b/src/feature/control/control_getinfo.c index 48c185494..6f30878d2 100644 --- a/src/feature/control/control_getinfo.c +++ b/src/feature/control/control_getinfo.c @@ -34,6 +34,7 @@ #include "feature/dircache/dirserv.h" #include "feature/dirclient/dirclient.h" #include "feature/dirclient/dlstatus.h" +#include "feature/dircommon/directory.h" #include "feature/hibernate/hibernate.h" #include "feature/hs/hs_cache.h" #include "feature/hs_common/shared_random_client.h" @@ -361,6 +362,86 @@ getinfo_helper_current_consensus(consensus_flavor_t flavor, return 0; } +/** Helper for getinfo_helper_dir. + * + * Add a signed_descriptor_t to descs_out for each router matching + * key. The key should be either + * - "/tor/server/authority" for our own routerinfo; + * - "/tor/server/all" for all the routerinfos we have, concatenated; + * - "/tor/server/fp/FP" where FP is a plus-separated sequence of + * hex identity digests; or + * - "/tor/server/d/D" where D is a plus-separated sequence + * of server descriptor digests, in hex. + * + * Return 0 if we found some matching descriptors, or -1 if we do not + * have any descriptors, no matching descriptors, or if we did not + * recognize the key (URL). + * If -1 is returned *msg will be set to an appropriate error + * message. + */ +static int +controller_get_routerdescs(smartlist_t *descs_out, const char *key, + const char **msg) +{ + *msg = NULL; + + if (!strcmp(key, "/tor/server/all")) { + routerlist_t *rl = router_get_routerlist(); + SMARTLIST_FOREACH(rl->routers, routerinfo_t *, r, + smartlist_add(descs_out, &(r->cache_info))); + } else if (!strcmp(key, "/tor/server/authority")) { + const routerinfo_t *ri = router_get_my_routerinfo(); + if (ri) + smartlist_add(descs_out, (void*) &(ri->cache_info)); + } else if (!strcmpstart(key, "/tor/server/d/")) { + smartlist_t *digests = smartlist_new(); + key += strlen("/tor/server/d/"); + dir_split_resource_into_fingerprints(key, digests, NULL, + DSR_HEX|DSR_SORT_UNIQ); + SMARTLIST_FOREACH(digests, const char *, d, + { + signed_descriptor_t *sd = router_get_by_descriptor_digest(d); + if (sd) + smartlist_add(descs_out,sd); + }); + SMARTLIST_FOREACH(digests, char *, d, tor_free(d)); + smartlist_free(digests); + } else if (!strcmpstart(key, "/tor/server/fp/")) { + smartlist_t *digests = smartlist_new(); + time_t cutoff = time(NULL) - ROUTER_MAX_AGE_TO_PUBLISH; + key += strlen("/tor/server/fp/"); + dir_split_resource_into_fingerprints(key, digests, NULL, + DSR_HEX|DSR_SORT_UNIQ); + SMARTLIST_FOREACH_BEGIN(digests, const char *, d) { + if (router_digest_is_me(d)) { + /* calling router_get_my_routerinfo() to make sure it exists */ + const routerinfo_t *ri = router_get_my_routerinfo(); + if (ri) + smartlist_add(descs_out, (void*) &(ri->cache_info)); + } else { + const routerinfo_t *ri = router_get_by_id_digest(d); + /* Don't actually serve a descriptor that everyone will think is + * expired. This is an (ugly) workaround to keep buggy 0.1.1.10 + * Tors from downloading descriptors that they will throw away. + */ + if (ri && ri->cache_info.published_on > cutoff) + smartlist_add(descs_out, (void*) &(ri->cache_info)); + } + } SMARTLIST_FOREACH_END(d); + SMARTLIST_FOREACH(digests, char *, d, tor_free(d)); + smartlist_free(digests); + } else { + *msg = "Key not recognized"; + return -1; + } + + if (!smartlist_len(descs_out)) { + *msg = "Servers unavailable"; + return -1; + } + return 0; +} + /** Implementation helper for GETINFO: knows the answers for questions about * directory information. */ STATIC int @@ -590,7 +671,7 @@ getinfo_helper_dir(control_connection_t *control_conn, int res; char *cp; tor_asprintf(&url, "/tor/%s", question+4); - res = dirserv_get_routerdescs(descs, url, &msg); + res = controller_get_routerdescs(descs, url, &msg); if (res) { log_warn(LD_CONTROL, "getinfo '%s': %s", question, msg); smartlist_free(descs); diff --git a/src/feature/dircache/dirserv.c b/src/feature/dircache/dirserv.c index 738b1928a..721261479 100644 --- a/src/feature/dircache/dirserv.c +++ b/src/feature/dircache/dirserv.c @@ -363,87 +363,6 @@ dirserv_get_routerdesc_spool(smartlist_t *spool_out, return 0; } -/** Add a signed_descriptor_t to descs_out for each router matching - * key. The key should be either - * - "/tor/server/authority" for our own routerinfo; - * - "/tor/server/all" for all the routerinfos we have, concatenated; - * - "/tor/server/fp/FP" where FP is a plus-separated sequence of - * hex identity digests; or - * - "/tor/server/d/D" where D is a plus-separated sequence - * of server descriptor digests, in hex. - * - * Return 0 if we found some matching descriptors, or -1 if we do not - * have any descriptors, no matching descriptors, or if we did not - * recognize the key (URL). - * If -1 is returned *msg will be set to an appropriate error - * message. - * - * XXXX rename this function. It's only called from the controller. - * XXXX in fact, refactor this function, merging as much as possible. - */ -int -dirserv_get_routerdescs(smartlist_t *descs_out, const char *key, - const char **msg) -{ - *msg = NULL; - - if (!strcmp(key, "/tor/server/all")) { - routerlist_t *rl = router_get_routerlist(); - SMARTLIST_FOREACH(rl->routers, routerinfo_t *, r, - smartlist_add(descs_out, &(r->cache_info))); - } else if (!strcmp(key, "/tor/server/authority")) { - const routerinfo_t *ri = router_get_my_routerinfo(); - if (ri) - smartlist_add(descs_out, (void*) &(ri->cache_info)); - } else if (!strcmpstart(key, "/tor/server/d/")) { - smartlist_t *digests = smartlist_new(); - key += strlen("/tor/server/d/"); - dir_split_resource_into_fingerprints(key, digests, NULL, - DSR_HEX|DSR_SORT_UNIQ); - SMARTLIST_FOREACH(digests, const char *, d, - { - signed_descriptor_t *sd = router_get_by_descriptor_digest(d); - if (sd) - smartlist_add(descs_out,sd); - }); - SMARTLIST_FOREACH(digests, char *, d, tor_free(d)); - smartlist_free(digests); - } else if (!strcmpstart(key, "/tor/server/fp/")) { - smartlist_t *digests = smartlist_new(); - time_t cutoff = time(NULL) - ROUTER_MAX_AGE_TO_PUBLISH; - key += strlen("/tor/server/fp/"); - dir_split_resource_into_fingerprints(key, digests, NULL, - DSR_HEX|DSR_SORT_UNIQ); - SMARTLIST_FOREACH_BEGIN(digests, const char *, d) { - if (router_digest_is_me(d)) { - /* calling router_get_my_routerinfo() to make sure it exists */ - const routerinfo_t *ri = router_get_my_routerinfo(); - if (ri) - smartlist_add(descs_out, (void*) &(ri->cache_info)); - } else { - const routerinfo_t *ri = router_get_by_id_digest(d); - /* Don't actually serve a descriptor that everyone will think is - * expired. This is an (ugly) workaround to keep buggy 0.1.1.10 - * Tors from downloading descriptors that they will throw away. - */ - if (ri && ri->cache_info.published_on > cutoff) - smartlist_add(descs_out, (void*) &(ri->cache_info)); - } - } SMARTLIST_FOREACH_END(d); - SMARTLIST_FOREACH(digests, char *, d, tor_free(d)); - smartlist_free(digests); - } else { - *msg = "Key not recognized"; - return -1; - } - - if (!smartlist_len(descs_out)) { - *msg = "Servers unavailable"; - return -1; - } - return 0; -} - /* ========== * Spooling code. * ========== */ diff --git a/src/feature/dircache/dirserv.h b/src/feature/dircache/dirserv.h index a4e10dd16..895cef948 100644 --- a/src/feature/dircache/dirserv.h +++ b/src/feature/dircache/dirserv.h @@ -101,8 +101,6 @@ int dirserv_get_routerdesc_spool(smartlist_t *spools_out, const char *key, dir_spool_source_t source, int conn_is_encrypted, const char **msg_out); -int dirserv_get_routerdescs(smartlist_t *descs_out, const char *key, - const char **msg); void dirserv_free_all(void); void cached_dir_decref(cached_dir_t *d);

1 0

[tor/master] Use dir_conn_clear_spool() in connection.c.
by nickm＠torproject.org 17 Jan '20

17 Jan '20

commit 6e12a8f04714aa56308b06c691066cc3d4b0090b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 8 21:43:02 2020 -0500 Use dir_conn_clear_spool() in connection.c. This is cleaner than iterating over the spool. --- src/core/mainloop/connection.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index 09b75c4e5..f0ebce9bb 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -719,11 +719,7 @@ connection_free_minimal(connection_t *conn) tor_free(dir_conn->requested_resource); tor_compress_free(dir_conn->compress_state); - if (dir_conn->spool) { - SMARTLIST_FOREACH(dir_conn->spool, spooled_resource_t *, spooled, - spooled_resource_free(spooled)); - smartlist_free(dir_conn->spool); - } + dir_conn_clear_spool(dir_conn); rend_data_free(dir_conn->rend_data); hs_ident_dir_conn_free(dir_conn->hs_ident);

1 0