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

[tor/master] config: Deprecate HTTPProxy option
by nickm＠torproject.org 19 Jun '17

19 Jun '17

commit 3f807ec05866d0438d81c252ac43946cabd23233 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Apr 25 09:11:49 2017 -0400 config: Deprecate HTTPProxy option Move the HTTPProxy option to the deprecated list so for now it will only warn users but feature is still in the code which will be removed in a future stable version. Fixes #20575 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket20575 | 4 ++++ doc/tor.1.txt | 7 ++++--- src/or/config.c | 7 +++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/changes/ticket20575 b/changes/ticket20575 new file mode 100644 index 0000000..bfbf03f --- /dev/null +++ b/changes/ticket20575 @@ -0,0 +1,4 @@ + o Deprecation (config): + - Deprecate HTTPProxy/HTTPProxyAuthenticator config options. It only + applies to direct unencrypted HTTP connections to your directory server, + which your Tor probably isn't using. Fixes bug 20575. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 568d037..c0fc861 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -522,13 +522,14 @@ GENERAL OPTIONS [[HTTPProxy]] **HTTPProxy** __host__[:__port__]:: Tor will make all its directory requests through this host:port (or host:80 if port is not specified), rather than connecting directly to any directory - servers. + servers. (DEPRECATED: As of 0.3.1.0-alpha you should use HTTPSProxy.) [[HTTPProxyAuthenticator]] **HTTPProxyAuthenticator** __username:password__:: If defined, Tor will use this username:password for Basic HTTP proxy authentication, as in RFC 2617. This is currently the only form of HTTP proxy authentication that Tor supports; feel free to submit a patch if you - want it to support others. + want it to support others. (DEPRECATED: As of 0.3.1.0-alpha you should use + HTTPSProxyAuthenticator.) [[HTTPSProxy]] **HTTPSProxy** __host__[:__port__]:: Tor will make all its OR (SSL) connections through this host:port (or @@ -646,7 +647,7 @@ GENERAL OPTIONS (127.0.0.0/8 and ::1). [[OutboundBindAddressOR]] **OutboundBindAddressOR** __IP__:: - Make all outbound non-exit (=relay and other) connections originate from the IP + Make all outbound non-exit (=relay and other) connections originate from the IP address specified. This option overrides **OutboundBindAddress** for the same IP version. This option may be used twice, once with an IPv4 address and once with an IPv6 address. This setting will be ignored for connections to the diff --git a/src/or/config.c b/src/or/config.c index a73f397..5fda820 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -693,6 +693,13 @@ static const config_deprecation_t option_deprecation_notes_[] = { "NoAdvertise sub-option" }, /* End of options deprecated since 0.2.9.2-alpha. */ + /* Deprecated since 0.3.1.0-alpha. */ + { "HTTPProxy", "It only applies to direct unencrypted HTTP connections " + "to your directory server, which your Tor probably wasn't using." }, + { "HTTPProxyAuthenticator", "HTTPProxy is deprecated in favor of HTTPSProxy " + "which should be used with HTTPSProxyAuthenticator." }, + /* End of options deprecated since 0.3.1.0-alpha. */ + { NULL, NULL } };

1 0

[tor/master] simplify because relay_crypt_one_payload can't fail
by nickm＠torproject.org 19 Jun '17

19 Jun '17

commit 084b64ba2e0e4daeca794fcd32aaa3baa221563a Author: Roger Dingledine <arma(a)torproject.org> Date: Sun May 28 01:51:22 2017 -0400 simplify because relay_crypt_one_payload can't fail --- src/or/relay.c | 41 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/src/or/relay.c b/src/or/relay.c index 7082002..29716b7 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -184,18 +184,12 @@ relay_digest_matches(crypto_digest_t *digest, cell_t *cell) /** Apply cipher to CELL_PAYLOAD_SIZE bytes of in * (in place). * - * If encrypt_mode is 1 then encrypt, else decrypt. - * - * Returns 0. + * Note that we use the same operation for encrypting and for decrypting. */ -static int -relay_crypt_one_payload(crypto_cipher_t *cipher, uint8_t *in, - int encrypt_mode) +static void +relay_crypt_one_payload(crypto_cipher_t *cipher, uint8_t *in) { - (void)encrypt_mode; crypto_cipher_crypt_inplace(cipher, (char*) in, CELL_PAYLOAD_SIZE); - - return 0; } /** @@ -449,8 +443,8 @@ relay_crypt(circuit_t *circ, cell_t *cell, cell_direction_t cell_direction, do { /* Remember: cpath is in forward order, that is, first hop first. */ tor_assert(thishop); - if (relay_crypt_one_payload(thishop->b_crypto, cell->payload, 0) < 0) - return -1; + /* decrypt one layer */ + relay_crypt_one_payload(thishop->b_crypto, cell->payload); relay_header_unpack(&rh, cell->payload); if (rh.recognized == 0) { @@ -467,19 +461,14 @@ relay_crypt(circuit_t *circ, cell_t *cell, cell_direction_t cell_direction, log_fn(LOG_PROTOCOL_WARN, LD_OR, "Incoming cell at client not recognized. Closing."); return -1; - } else { /* we're in the middle. Just one crypt. */ - if (relay_crypt_one_payload(TO_OR_CIRCUIT(circ)->p_crypto, - cell->payload, 1) < 0) - return -1; -// log_fn(LOG_DEBUG,"Skipping recognized check, because we're not " -// "the client."); + } else { + /* We're in the middle. Encrypt one layer. */ + relay_crypt_one_payload(TO_OR_CIRCUIT(circ)->p_crypto, cell->payload); } } else /* cell_direction == CELL_DIRECTION_OUT */ { - /* we're in the middle. Just one crypt. */ + /* We're in the middle. Decrypt one layer. */ - if (relay_crypt_one_payload(TO_OR_CIRCUIT(circ)->n_crypto, - cell->payload, 0) < 0) - return -1; + relay_crypt_one_payload(TO_OR_CIRCUIT(circ)->n_crypto, cell->payload); relay_header_unpack(&rh, cell->payload); if (rh.recognized == 0) { @@ -526,10 +515,8 @@ circuit_package_relay_cell(cell_t *cell, circuit_t *circ, do { tor_assert(thishop); /* XXXX RD This is a bug, right? */ - log_debug(LD_OR,"crypting a layer of the relay cell."); - if (relay_crypt_one_payload(thishop->f_crypto, cell->payload, 1) < 0) { - return -1; - } + log_debug(LD_OR,"encrypting a layer of the relay cell."); + relay_crypt_one_payload(thishop->f_crypto, cell->payload); thishop = thishop->prev; } while (thishop != TO_ORIGIN_CIRCUIT(circ)->cpath->prev); @@ -546,8 +533,8 @@ circuit_package_relay_cell(cell_t *cell, circuit_t *circ, or_circ = TO_OR_CIRCUIT(circ); chan = or_circ->p_chan; relay_set_digest(or_circ->p_digest, cell); - if (relay_crypt_one_payload(or_circ->p_crypto, cell->payload, 1) < 0) - return -1; + /* encrypt one layer */ + relay_crypt_one_payload(or_circ->p_crypto, cell->payload); } ++stats_n_relay_cells_relayed;

1 0

[tor/master] Merge remote-tracking branch 'arma/ticket22420'
by nickm＠torproject.org 19 Jun '17

19 Jun '17

commit f6946d7a823875211bd84cfa4565ed1b83b1dfc2 Merge: 32948eb 084b64b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 19 14:03:57 2017 -0400 Merge remote-tracking branch 'arma/ticket22420' src/or/relay.c | 41 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 27 deletions(-)

1 0

[tor/master] Remove an XXXX RD comment that neither Roger or I understand. Closes 22420
by nickm＠torproject.org 19 Jun '17

19 Jun '17

commit bf95d678e86598c5200417e96d4d4069ace8b851 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 19 14:06:07 2017 -0400 Remove an XXXX RD comment that neither Roger or I understand. Closes 22420 --- src/or/relay.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/or/relay.c b/src/or/relay.c index f6e40b8..18ccc65 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -514,7 +514,6 @@ circuit_package_relay_cell(cell_t *cell, circuit_t *circ, /* moving from farthest to nearest hop */ do { tor_assert(thishop); - /* XXXX RD This is a bug, right? */ log_debug(LD_OR,"encrypting a layer of the relay cell."); relay_crypt_one_payload(thishop->f_crypto, cell->payload);

1 0

[tor/maint-0.3.0] Merge remote-tracking branch 'public/bug22516_029' into maint-0.2.9
by nickm＠torproject.org 19 Jun '17

19 Jun '17

commit 1c64133cb3b9656fc37c1d8c91e1b4225f889428 Merge: cd7d006 59f2997 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 19 13:50:49 2017 -0400 Merge remote-tracking branch 'public/bug22516_029' into maint-0.2.9 changes/bug22516 | 5 +++++ src/common/sandbox.c | 3 +++ 2 files changed, 8 insertions(+)

1 0

[tor/maint-0.2.9] Permit the fchmod system call.
by nickm＠torproject.org 19 Jun '17

19 Jun '17

commit 59f29970fa78bec8c01bd5f16edca8c24b8724f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 16 14:03:02 2017 -0400 Permit the fchmod system call. Fixes bug 22516; bugfix on 0.2.5.4-alpha. --- changes/bug22516 | 5 +++++ src/common/sandbox.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/changes/bug22516 b/changes/bug22516 new file mode 100644 index 0000000..f024a3c --- /dev/null +++ b/changes/bug22516 @@ -0,0 +1,5 @@ + o Minor bugfixes (linux seccomp2 sandbox): + - Permit the fchmod system call, to avoid crashing on startup when + starting with the seccomp2 sandbox and an unexpected set of permissions + on the data directory or its contents. Fixes bug 22516; bugfix on + 0.2.5.4-alpha. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 95c9f83..da96ad8 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -136,6 +136,9 @@ static int filter_nopar_gen[] = { #ifdef HAVE_PIPE SCMP_SYS(pipe), #endif +#ifdef __NR_fchmod + SCMP_SYS(fchmod), +#endif SCMP_SYS(fcntl), SCMP_SYS(fstat), #ifdef __NR_fstat64

1 0

[tor/maint-0.3.0] Permit the fchmod system call.
by nickm＠torproject.org 19 Jun '17

19 Jun '17

commit 59f29970fa78bec8c01bd5f16edca8c24b8724f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jun 16 14:03:02 2017 -0400 Permit the fchmod system call. Fixes bug 22516; bugfix on 0.2.5.4-alpha. --- changes/bug22516 | 5 +++++ src/common/sandbox.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/changes/bug22516 b/changes/bug22516 new file mode 100644 index 0000000..f024a3c --- /dev/null +++ b/changes/bug22516 @@ -0,0 +1,5 @@ + o Minor bugfixes (linux seccomp2 sandbox): + - Permit the fchmod system call, to avoid crashing on startup when + starting with the seccomp2 sandbox and an unexpected set of permissions + on the data directory or its contents. Fixes bug 22516; bugfix on + 0.2.5.4-alpha. diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 95c9f83..da96ad8 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -136,6 +136,9 @@ static int filter_nopar_gen[] = { #ifdef HAVE_PIPE SCMP_SYS(pipe), #endif +#ifdef __NR_fchmod + SCMP_SYS(fchmod), +#endif SCMP_SYS(fcntl), SCMP_SYS(fstat), #ifdef __NR_fstat64

1 0

[tor/maint-0.2.9] Merge remote-tracking branch 'public/bug22516_029' into maint-0.2.9
by nickm＠torproject.org 19 Jun '17

19 Jun '17

commit 1c64133cb3b9656fc37c1d8c91e1b4225f889428 Merge: cd7d006 59f2997 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 19 13:50:49 2017 -0400 Merge remote-tracking branch 'public/bug22516_029' into maint-0.2.9 changes/bug22516 | 5 +++++ src/common/sandbox.c | 3 +++ 2 files changed, 8 insertions(+)

1 0

[tor/release-0.2.9] Merge remote-tracking branch 'public/bug22516_029' into maint-0.2.9
by nickm＠torproject.org 19 Jun '17

19 Jun '17

commit 1c64133cb3b9656fc37c1d8c91e1b4225f889428 Merge: cd7d006 59f2997 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 19 13:50:49 2017 -0400 Merge remote-tracking branch 'public/bug22516_029' into maint-0.2.9 changes/bug22516 | 5 +++++ src/common/sandbox.c | 3 +++ 2 files changed, 8 insertions(+)

1 0

[tor/maint-0.3.1] Merge remote-tracking branch 'public/bug22516_029' into maint-0.2.9
by nickm＠torproject.org 19 Jun '17

19 Jun '17

commit 1c64133cb3b9656fc37c1d8c91e1b4225f889428 Merge: cd7d006 59f2997 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 19 13:50:49 2017 -0400 Merge remote-tracking branch 'public/bug22516_029' into maint-0.2.9 changes/bug22516 | 5 +++++ src/common/sandbox.c | 3 +++ 2 files changed, 8 insertions(+)

1 0