0
0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-19 20:02:15 +02:00

Merge branch 'maint-0.4.6'

This commit is contained in:
David Goulet 2021-10-06 13:25:08 -04:00
commit c3e50f0fde
2 changed files with 14 additions and 4 deletions

5
changes/ticket40474 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (onion service, TROVE-2021-008):
- Only log once any v2 access attempts in order to not pollute the logs
with warnings and avoid recording the times on disk when v2 access was
attempted. Important to note that the onion address was _never_ logged.
That is a Low security issue. Fixes bug 40474; bugfix on 0.4.5.8.

View File

@ -2561,10 +2561,15 @@ connection_ap_handshake_rewrite_and_attach(entry_connection_t *conn,
/* We don't support v2 onions anymore. Log a warning and bail. */
if (addresstype == ONION_V2_HOSTNAME) {
log_warn(LD_PROTOCOL, "Tried to connect to a v2 onion address, but this "
"version of Tor no longer supports them. Please encourage the "
"site operator to upgrade. For more information see "
"https://blog.torproject.org/v2-deprecation-timeline.");
static bool log_once = false;
if (!log_once) {
log_warn(LD_PROTOCOL, "Tried to connect to a v2 onion address, but "
"this version of Tor no longer supports them. Please "
"encourage the site operator to upgrade. For more "
"information see "
"https://blog.torproject.org/v2-deprecation-timeline.");
log_once = true;
}
control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s",
escaped(socks->address));
/* Send back the 0xF6 extended code indicating a bad hostname. This is