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

[tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit a159eaf45fb59fb47732d5d811db2cc78c02a960 Merge: 15d7f24c5 fea35ddf0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 30 08:45:01 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26924 | 4 ++++ changes/bug26927 | 4 ++++ src/or/connection_or.c | 14 +++++++++----- 3 files changed, 17 insertions(+), 5 deletions(-)

1 0

[tor/release-0.3.2] Merge remote-tracking branch 'teor/bug26924_032' into maint-0.3.2
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit fea35ddf0017827cb5e26bb725574108ad97c261 Merge: a8bdb851e 859d5a737 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 30 08:44:40 2018 -0400 Merge remote-tracking branch 'teor/bug26924_032' into maint-0.3.2 changes/bug26924 | 4 ++++ changes/bug26927 | 4 ++++ src/or/connection_or.c | 14 +++++++++----- 3 files changed, 17 insertions(+), 5 deletions(-)

1 0

[tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit 4632ad4314e8fa339a5c071e6e6a8a39d70f4bb5 Merge: 409d0cf8d 6443812e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 30 08:45:01 2018 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug26924 | 4 ++++ src/or/connection_or.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Stop logging link auth warnings on Single Onion Services and Tor2web
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit 6443812e343635d0db6ea1aac58b817732b7f29a Author: teor <teor(a)torproject.org> Date: Wed Jul 25 14:28:06 2018 +1000 Stop logging link auth warnings on Single Onion Services and Tor2web Instead, log a protocol warning when single onion services or Tor2web clients fail to authenticate direct connections to relays. Fixes bug 26924; bugfix on 0.2.9.1-alpha. --- changes/bug26924 | 4 ++++ src/or/connection_or.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug26924 b/changes/bug26924 new file mode 100644 index 000000000..882db56b4 --- /dev/null +++ b/changes/bug26924 @@ -0,0 +1,4 @@ + o Minor bugfixes (single onion services, Tor2web): + - Log a protocol warning when single onion services or Tor2web clients + fail to authenticate direct connections to relays. + Fixes bug 26924; bugfix on 0.2.9.1-alpha. diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 8beedcae7..a01d08627 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -47,6 +47,7 @@ #include "nodelist.h" #include "reasons.h" #include "relay.h" +#include "rendcommon.h" #include "rephist.h" #include "router.h" #include "routerlist.h" @@ -1628,10 +1629,13 @@ connection_or_client_learned_peer_id(or_connection_t *conn, conn->identity_digest); const int is_authority_fingerprint = router_digest_is_trusted_dir( conn->identity_digest); + const int non_anonymous_mode = rend_non_anonymous_mode_enabled(options); int severity; const char *extra_log = ""; - if (server_mode(options)) { + /* Relays, Single Onion Services, and Tor2web make direct connections using + * untrusted authentication keys. */ + if (server_mode(options) || non_anonymous_mode) { severity = LOG_PROTOCOL_WARN; } else { if (using_hardcoded_fingerprints) {

1 0

[tor/release-0.3.3] Stop logging link auth warnings on Single Onion Services and Tor2web
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit 6443812e343635d0db6ea1aac58b817732b7f29a Author: teor <teor(a)torproject.org> Date: Wed Jul 25 14:28:06 2018 +1000 Stop logging link auth warnings on Single Onion Services and Tor2web Instead, log a protocol warning when single onion services or Tor2web clients fail to authenticate direct connections to relays. Fixes bug 26924; bugfix on 0.2.9.1-alpha. --- changes/bug26924 | 4 ++++ src/or/connection_or.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug26924 b/changes/bug26924 new file mode 100644 index 000000000..882db56b4 --- /dev/null +++ b/changes/bug26924 @@ -0,0 +1,4 @@ + o Minor bugfixes (single onion services, Tor2web): + - Log a protocol warning when single onion services or Tor2web clients + fail to authenticate direct connections to relays. + Fixes bug 26924; bugfix on 0.2.9.1-alpha. diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 8beedcae7..a01d08627 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -47,6 +47,7 @@ #include "nodelist.h" #include "reasons.h" #include "relay.h" +#include "rendcommon.h" #include "rephist.h" #include "router.h" #include "routerlist.h" @@ -1628,10 +1629,13 @@ connection_or_client_learned_peer_id(or_connection_t *conn, conn->identity_digest); const int is_authority_fingerprint = router_digest_is_trusted_dir( conn->identity_digest); + const int non_anonymous_mode = rend_non_anonymous_mode_enabled(options); int severity; const char *extra_log = ""; - if (server_mode(options)) { + /* Relays, Single Onion Services, and Tor2web make direct connections using + * untrusted authentication keys. */ + if (server_mode(options) || non_anonymous_mode) { severity = LOG_PROTOCOL_WARN; } else { if (using_hardcoded_fingerprints) {

1 0

[tor/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit b8e94b2f1d0df8152fd7b9726a470aa83970b3c5 Merge: ec1ced3cc 7d66ec0fe Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 30 08:45:01 2018 -0400 Merge branch 'maint-0.3.4'

1 0

[tor/release-0.3.2] Improve connection auth logging
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit 859d5a737502258641703cb52598b64bd08ce870 Author: teor <teor(a)torproject.org> Date: Wed Jul 25 14:39:31 2018 +1000 Improve connection auth logging Improve the log message when connection initiators fail to authenticate direct connections to relays. Fixes bug 26927; bugfix on 0.3.0.1-alpha. --- changes/bug26927 | 4 ++++ src/or/connection_or.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/changes/bug26927 b/changes/bug26927 new file mode 100644 index 000000000..cd035bba8 --- /dev/null +++ b/changes/bug26927 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging): + - Improve the log message when connection initiators fail to authenticate + direct connections to relays. + Fixes bug 26927; bugfix on 0.3.0.1-alpha. diff --git a/src/or/connection_or.c b/src/or/connection_or.c index add0493d2..fe2cea4f4 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1708,8 +1708,8 @@ connection_or_client_learned_peer_id(or_connection_t *conn, } log_fn(severity, LD_HANDSHAKE, - "Tried connecting to router at %s:%d, but RSA identity key was not " - "as expected: wanted %s + %s but got %s + %s.%s", + "Tried connecting to router at %s:%d, but RSA + ed25519 identity " + "keys were not as expected: wanted %s + %s but got %s + %s.%s", conn->base_.address, conn->base_.port, expected_rsa, expected_ed, seen_rsa, seen_ed, extra_log); @@ -1726,8 +1726,8 @@ connection_or_client_learned_peer_id(or_connection_t *conn, } if (!expected_ed_key && ed_peer_id) { - log_info(LD_HANDSHAKE, "(we had no Ed25519 ID in mind when we made this " - "connection."); + log_info(LD_HANDSHAKE, "(We had no Ed25519 ID in mind when we made this " + "connection.)"); connection_or_set_identity_digest(conn, (const char*)rsa_peer_id, ed_peer_id); changed_identity = 1;

1 0

[tor/release-0.2.9] Stop logging link auth warnings on Single Onion Services and Tor2web
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit 6443812e343635d0db6ea1aac58b817732b7f29a Author: teor <teor(a)torproject.org> Date: Wed Jul 25 14:28:06 2018 +1000 Stop logging link auth warnings on Single Onion Services and Tor2web Instead, log a protocol warning when single onion services or Tor2web clients fail to authenticate direct connections to relays. Fixes bug 26924; bugfix on 0.2.9.1-alpha. --- changes/bug26924 | 4 ++++ src/or/connection_or.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug26924 b/changes/bug26924 new file mode 100644 index 000000000..882db56b4 --- /dev/null +++ b/changes/bug26924 @@ -0,0 +1,4 @@ + o Minor bugfixes (single onion services, Tor2web): + - Log a protocol warning when single onion services or Tor2web clients + fail to authenticate direct connections to relays. + Fixes bug 26924; bugfix on 0.2.9.1-alpha. diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 8beedcae7..a01d08627 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -47,6 +47,7 @@ #include "nodelist.h" #include "reasons.h" #include "relay.h" +#include "rendcommon.h" #include "rephist.h" #include "router.h" #include "routerlist.h" @@ -1628,10 +1629,13 @@ connection_or_client_learned_peer_id(or_connection_t *conn, conn->identity_digest); const int is_authority_fingerprint = router_digest_is_trusted_dir( conn->identity_digest); + const int non_anonymous_mode = rend_non_anonymous_mode_enabled(options); int severity; const char *extra_log = ""; - if (server_mode(options)) { + /* Relays, Single Onion Services, and Tor2web make direct connections using + * untrusted authentication keys. */ + if (server_mode(options) || non_anonymous_mode) { severity = LOG_PROTOCOL_WARN; } else { if (using_hardcoded_fingerprints) {

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit edfa746888d5492693becd7d1c74b4c934503790 Merge: d79557efc fea35ddf0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 30 08:45:01 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug26924 | 4 ++++ changes/bug26927 | 4 ++++ src/or/connection_or.c | 14 +++++++++----- 3 files changed, 17 insertions(+), 5 deletions(-)

1 0

[tor/release-0.3.3] Merge remote-tracking branch 'teor/bug26924_032' into maint-0.3.2
by nickm＠torproject.org 30 Jul '18

30 Jul '18

commit fea35ddf0017827cb5e26bb725574108ad97c261 Merge: a8bdb851e 859d5a737 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 30 08:44:40 2018 -0400 Merge remote-tracking branch 'teor/bug26924_032' into maint-0.3.2 changes/bug26924 | 4 ++++ changes/bug26927 | 4 ++++ src/or/connection_or.c | 14 +++++++++----- 3 files changed, 17 insertions(+), 5 deletions(-)

1 0