mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bug26924_029' into bug26924_032

Browse source
This commit is contained in:
teor 2018-07-25 14:33:10 +10:00
commit fdc3ad6259
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
changes/bug26924 Normal file
View file

@ -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.

6
src/or/connection_or.c
View file

@ -49,6 +49,7 @@
#include "proto_cell.h"
#include "reasons.h"
#include "relay.h"
#include "rendcommon.h"
#include "rephist.h"
#include "router.h"
#include "routerkeys.h"
@ -1677,10 +1678,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) {