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 remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5

Browse source
This commit is contained in:
teor 2019-11-06 11:16:09 +10:00
commit 6bfdd09679
No known key found for this signature in database
GPG key ID: 10FEAA0E7075672A
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changes/ticket31466 Normal file
View file

@ -0,0 +1,5 @@
o Minor bugfixes (logging):
- Rate-limit our the logging message about the obsolete .exit notation.
Previously, there was no limit on this warning, which could potentially
be triggered many times by a hostile website. Fixes bug 31466;
bugfix on 0.2.2.1-alpha.

4
src/core/or/connection_edge.c
View file

@ -1598,7 +1598,9 @@ connection_ap_handshake_rewrite(entry_connection_t *conn,
* disallowed when they're coming straight from the client, but you're * disallowed when they're coming straight from the client, but you're
* allowed to have them in MapAddress commands and so forth. */ * allowed to have them in MapAddress commands and so forth. */
if (!strcmpend(socks->address, ".exit")) { if (!strcmpend(socks->address, ".exit")) {
log_warn(LD_APP, "The \".exit\" notation is disabled in Tor due to " static ratelim_t exit_warning_limit = RATELIM_INIT(60*15);
log_fn_ratelim(&exit_warning_limit, LOG_WARN, LD_APP,
"The \".exit\" notation is disabled in Tor due to "
"security risks."); "security risks.");
control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s", control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s",
escaped(socks->address)); escaped(socks->address));