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

[tor/maint-0.3.5] Merge branch 'bug28612_squashed' into maint-0.3.5
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit 26bbeb298d1f5692bc18f38d61379087436461a2 Merge: 702fd6f0f 1c2abea30 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 18 13:55:57 2018 -0500 Merge branch 'bug28612_squashed' into maint-0.3.5 changes/bug28612 | 4 ++++ src/app/main/main.c | 2 +- src/app/main/main.h | 2 ++ src/app/main/ntmain.c | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.3.5] Always initialize addr in parse_port_config()
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit 4894d44ab8beee587c99a1765236813d445b392e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 17 09:38:42 2018 -0500 Always initialize addr in parse_port_config() It was always analyzed before use, but scan-build wasn't able to persuade itself of that. Closes ticket 28881. --- changes/ticket28881 | 4 ++++ src/app/config/config.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/changes/ticket28881 b/changes/ticket28881 new file mode 100644 index 000000000..1b015a6c3 --- /dev/null +++ b/changes/ticket28881 @@ -0,0 +1,4 @@ + o Code simplification and refactoring: + - When parsing a port configuration, make it more + obvious to static analyzer tools that we will always initialize the + address. Closes ticket 28881. diff --git a/src/app/config/config.c b/src/app/config/config.c index 81cc3e378..4a8f94da0 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -6913,6 +6913,8 @@ parse_port_config(smartlist_t *out, for (; ports; ports = ports->next) { tor_addr_t addr; + tor_addr_make_unspec(&addr); + int port; int sessiongroup = SESSION_GROUP_UNSET; unsigned isolation = ISO_DEFAULT;

1 0

[tor/maint-0.3.5] Call run_tor_main_loop() in ntmain.c, rather than do_main_loop().
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit 1c2abea30a36c2b9e0e7e220542d17210bdd0b5e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 5 10:31:43 2018 -0500 Call run_tor_main_loop() in ntmain.c, rather than do_main_loop(). Fixes bug 28612; bugfix on 0.3.5.3-alpha. --- changes/bug28612 | 4 ++++ src/app/main/main.c | 2 +- src/app/main/main.h | 2 ++ src/app/main/ntmain.c | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/changes/bug28612 b/changes/bug28612 new file mode 100644 index 000000000..559f25423 --- /dev/null +++ b/changes/bug28612 @@ -0,0 +1,4 @@ + o Minor bugfixes (windows services): + - Make Tor start correctly as an NT service again: previously it + was broken by refactoring. Fixes bug 28612; bugfix on 0.3.5.3-alpha. + diff --git a/src/app/main/main.c b/src/app/main/main.c index ae87add67..a2b7c0845 100644 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@ -1269,7 +1269,7 @@ sandbox_init_filter(void) return cfg; } -static int +int run_tor_main_loop(void) { handle_signals(); diff --git a/src/app/main/main.h b/src/app/main/main.h index b64f2ef41..23a436703 100644 --- a/src/app/main/main.h +++ b/src/app/main/main.h @@ -26,4 +26,6 @@ void tor_free_all(int postfork); int tor_init(int argc, char **argv); +int run_tor_main_loop(void); + #endif /* !defined(TOR_MAIN_H) */ diff --git a/src/app/main/ntmain.c b/src/app/main/ntmain.c index 800720a0b..8d2135a58 100644 --- a/src/app/main/ntmain.c +++ b/src/app/main/ntmain.c @@ -298,7 +298,7 @@ nt_service_body(int argc, char **argv) service_status.dwCurrentState = SERVICE_RUNNING; service_fns.SetServiceStatus_fn(hStatus, &service_status); set_main_thread(); - do_main_loop(); + run_tor_main_loop(); tor_cleanup(); } @@ -326,7 +326,7 @@ nt_service_main(void) return; switch (get_options()->command) { case CMD_RUN_TOR: - do_main_loop(); + run_tor_main_loop(); break; case CMD_LIST_FINGERPRINT: case CMD_HASH_PASSWORD:

1 0

[tor/maint-0.3.5] Merge branch 'ticket28881_035' into maint-0.3.5
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit 702fd6f0f21138c0864cdf0ce73c0319aceeccb7 Merge: bf71dce01 4894d44ab Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 18 13:52:36 2018 -0500 Merge branch 'ticket28881_035' into maint-0.3.5 changes/ticket28881 | 4 ++++ src/app/config/config.c | 2 ++ 2 files changed, 6 insertions(+)

1 0

[tor/master] Add changes file for <30min HeartbeatPeriod patch
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit 06046c726fb09ec745d2a565abfef28097856a19 Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Fri Dec 14 09:24:19 2018 -0500 Add changes file for <30min HeartbeatPeriod patch --- changes/ticket28840 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket28840 b/changes/ticket28840 new file mode 100644 index 000000000..05d3fbb94 --- /dev/null +++ b/changes/ticket28840 @@ -0,0 +1,3 @@ + o Minor features (testing): + - Allow HeartbeatPeriod of less than 30 minutes in testing Tor networks. + Closes ticket 28840, patch by robgjansen

1 0

[tor/master] allow any value for HearbeatPeriod in testing Tor networks
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit 325348b360fc8a51d1344d918c1bb20017f1e863 Author: Rob Jansen <jansen(a)cs.umn.edu> Date: Wed Dec 12 15:27:45 2018 -0500 allow any value for HearbeatPeriod in testing Tor networks --- src/app/config/config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/config/config.c b/src/app/config/config.c index dcefa3d6a..071c33d53 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -3897,7 +3897,8 @@ options_validate(or_options_t *old_options, or_options_t *options, } if (options->HeartbeatPeriod && - options->HeartbeatPeriod < MIN_HEARTBEAT_PERIOD) { + options->HeartbeatPeriod < MIN_HEARTBEAT_PERIOD && + !options->TestingTorNetwork) { log_warn(LD_CONFIG, "HeartbeatPeriod option is too short; " "raising to %d seconds.", MIN_HEARTBEAT_PERIOD); options->HeartbeatPeriod = MIN_HEARTBEAT_PERIOD;

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/595'
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit a3e6f2467b55bdd122ef764a7d23e040c6395fb8 Merge: 872998dd0 06046c726 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 18 13:51:21 2018 -0500 Merge remote-tracking branch 'tor-github/pr/595' changes/ticket28840 | 3 +++ src/app/config/config.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 18 Dec '18

18 Dec '18

commit 253f235ff15e9046c6d6bdd57a5caafa480484f7 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 18 18:45:39 2018 +0000 Update translations for https_everywhere --- gl/https-everywhere.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gl/https-everywhere.dtd b/gl/https-everywhere.dtd index f7d3a9014..7239a8981 100644 --- a/gl/https-everywhere.dtd +++ b/gl/https-everywhere.dtd @@ -3,18 +3,18 @@ <!ENTITY https-everywhere.about.ext_description "Cifrar a Web! Usar automáticamente seguridade HTTPS en moitos sitios."> <!ENTITY https-everywhere.about.version "Versión"> <!ENTITY https-everywhere.about.rulesets_version "Rulesets version for"> -<!ENTITY https-everywhere.about.add_new_rule "Add New Rule"> +<!ENTITY https-everywhere.about.add_new_rule "Engadir Nova Regra"> <!ENTITY https-everywhere.menu.donate_eff_imperative "Donate to EFF"> <!ENTITY https-everywhere.menu.observatory "Preferencias do Observatorio SSL"> <!ENTITY https-everywhere.menu.globalEnable "Activar HTTPS para todo"> -<!ENTITY https-everywhere.menu.blockUnencryptedRequests "Block all unencrypted requests"> +<!ENTITY https-everywhere.menu.blockUnencryptedRequests "Bloquear todas as peticións non ecriptadas"> <!ENTITY https-everywhere.menu.showCounter "Amosar Contador"> <!ENTITY https-everywhere.menu.viewAllRules "Ver Tódalas Regras"> <!ENTITY https-everywhere.options.generalSettings "Configuración Xeral"> <!ENTITY https-everywhere.options.advancedSettings "Configuración Avanzada"> -<!ENTITY https-everywhere.options.updateChannels "Update Channels"> +<!ENTITY https-everywhere.options.updateChannels "Actualizar Canles"> <!ENTITY https-everywhere.options.enableMixedRulesets "Enable mixed content rulesets"> <!ENTITY https-everywhere.options.showDevtoolsTab "Show Devtools tab"> <!ENTITY https-everywhere.options.autoUpdateRulesets "Auto-update rulesets"> @@ -29,7 +29,7 @@ <!ENTITY https-everywhere.options.updatesLastChecked "Updates last checked: "> <!ENTITY https-everywhere.options.updatesLastCheckedNever "Nunca"> -<!ENTITY https-everywhere.prefs.export_settings "Export Settings"> +<!ENTITY https-everywhere.prefs.export_settings "Exportar Axustes"> <!ENTITY https-everywhere.prefs.reset_defaults "Restablecer a Valores por Defecto"> <!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> @@ -38,7 +38,7 @@ <!ENTITY https-everywhere.chrome.stable_rules "Stable rules"> <!ENTITY https-everywhere.chrome.stable_rules_description "Force encrypted connections to these websites:"> -<!ENTITY https-everywhere.chrome.experimental_rules "Experimental rules"> +<!ENTITY https-everywhere.chrome.experimental_rules "Regras Experimentais"> <!ENTITY https-everywhere.chrome.experimental_rules_description "May cause warnings or breakage. Disabled by default."> <!ENTITY https-everywhere.chrome.disable_on_this_site "Disable HTTPS Everywhere on this site"> <!ENTITY https-everywhere.chrome.enable_on_this_site "Enable HTTPS Everywhere on this site">

1 0

[tor/master] Ensure that line_size >= 1 before trying to trim input string.
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit c8b8b15f0eb2651dea694a057e70e6b8c34dbe05 Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Dec 14 03:31:56 2018 +0100 Ensure that line_size >= 1 before trying to trim input string. See: https://bugs.torproject.org/28179 --- src/lib/process/process.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/process/process.c b/src/lib/process/process.c index fb76a0a72..b3370e919 100644 --- a/src/lib/process/process.c +++ b/src/lib/process/process.c @@ -766,13 +766,13 @@ process_read_lines(process_t *process, tor_assert(ret != -1); /* Remove \n from the end of the line. */ - if (data[line_size - 1] == '\n') { + if (line_size >= 1 && data[line_size - 1] == '\n') { data[line_size - 1] = '\0'; --line_size; } /* Remove \r from the end of the line. */ - if (data[line_size - 1] == '\r') { + if (line_size >= 1 && data[line_size - 1] == '\r') { data[line_size - 1] = '\0'; --line_size; }

1 0

[tor/master] Merge branch 'ticket28179_squashed' into ticket28179_squashed_merged
by nickm＠torproject.org 18 Dec '18

18 Dec '18

commit e969d9c6b4b82178fbc840e3d53e12cbb64fee5c Merge: 5a22b42c3 c8b8b15f0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 17 16:41:01 2018 -0500 Merge branch 'ticket28179_squashed' into ticket28179_squashed_merged .appveyor.yml | 2 + .gitignore | 4 +- doc/tor.1.txt | 3 +- src/app/config/config.c | 2 +- src/app/main/main.c | 6 + src/core/mainloop/mainloop.c | 15 +- src/core/mainloop/mainloop.h | 1 + src/feature/client/transports.c | 235 +++++--- src/feature/client/transports.h | 15 +- src/feature/control/control.c | 11 + src/feature/control/control.h | 4 +- src/lib/log/log.c | 2 +- src/lib/log/log.h | 6 +- src/lib/net/buffers_net.c | 131 ++++- src/lib/net/buffers_net.h | 7 + src/lib/process/.may_include | 5 +- src/lib/process/include.am | 8 +- src/lib/process/process.c | 797 +++++++++++++++++++++++++ src/lib/process/process.h | 142 +++++ src/lib/process/process_unix.c | 704 ++++++++++++++++++++++ src/lib/process/process_unix.h | 68 +++ src/lib/process/process_win32.c | 1026 ++++++++++++++++++++++++++++++++ src/lib/process/process_win32.h | 97 +++ src/lib/process/subprocess.c | 1236 --------------------------------------- src/lib/process/subprocess.h | 134 ----- src/test/Makefile.nmake | 7 +- src/test/include.am | 5 +- src/test/test-child.c | 61 -- src/test/test-process.c | 85 +++ src/test/test.c | 1 + src/test/test.h | 3 +- src/test/test_logging.c | 22 +- src/test/test_process.c | 696 ++++++++++++++++++++++ src/test/test_process_slow.c | 332 +++++++++++ src/test/test_pt.c | 87 +-- src/test/test_slow.c | 2 +- src/test/test_util.c | 318 +--------- src/test/test_util_slow.c | 396 ------------- 38 files changed, 4324 insertions(+), 2352 deletions(-) diff --cc src/app/main/main.c index 3f4e1d06a,15b6b48ff..51113cd53 --- a/src/app/main/main.c +++ b/src/app/main/main.c @@@ -71,9 -71,9 +71,10 @@@ #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_s2k.h" #include "lib/geoip/geoip.h" +#include "lib/net/resolve.h" #include "lib/process/waitpid.h" + #include "lib/process/process.h" #include "lib/meminfo/meminfo.h" #include "lib/osinfo/uname.h" diff --cc src/lib/process/.may_include index 3a5d849fe,b1c50c24a..2e90f4d8d --- a/src/lib/process/.may_include +++ b/src/lib/process/.may_include @@@ -15,4 -16,4 +16,4 @@@ lib/subsys/*. lib/testsupport/*.h lib/thread/*.h - ext/ht.h -ht.h ++ext/ht.h diff --cc src/test/test_util.c index 2b4d64e42,a94153f2d..b983cbb0b --- a/src/test/test_util.c +++ b/src/test/test_util.c @@@ -10,10 -10,10 +10,10 @@@ #define UTIL_PRIVATE #define UTIL_MALLOC_PRIVATE #define SOCKET_PRIVATE - #define SUBPROCESS_PRIVATE + #define PROCESS_WIN32_PRIVATE #include "lib/testsupport/testsupport.h" #include "core/or/or.h" -#include "lib/container/buffers.h" +#include "lib/buf/buffers.h" #include "app/config/config.h" #include "feature/control/control.h" #include "feature/client/transports.h"

1 0