diff options
| author | teor <teor@torproject.org> | 2019-11-06 11:15:45 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-11-06 11:15:45 +1000 |
| commit | 0650bf3695ae2e118426f3f6ecf1f8a344562119 (patch) | |
| tree | 313f23180f91682ae0e3f639e325cc3f7d53277f | |
| parent | c06d540ff9b507e0fa9749948fe406fb17dbee73 (diff) | |
| parent | f0e4120996d3a96252200ea5302dcde3af6e0bc0 (diff) | |
| download | tor-0650bf3695ae2e118426f3f6ecf1f8a344562119.tar.gz tor-0650bf3695ae2e118426f3f6ecf1f8a344562119.zip | |
Merge remote-tracking branch 'tor-github/pr/1342' into maint-0.2.9
| -rw-r--r-- | changes/ticket31466 | 5 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/changes/ticket31466 b/changes/ticket31466 new file mode 100644 index 0000000000..e535b4502e --- /dev/null +++ b/changes/ticket31466 @@ -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. diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 7a97c632d1..5638d9a1be 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -1186,9 +1186,11 @@ connection_ap_handshake_rewrite(entry_connection_t *conn, * disallowed when they're coming straight from the client, but you're * allowed to have them in MapAddress commands and so forth. */ if (!strcmpend(socks->address, ".exit") && !options->AllowDotExit) { - log_warn(LD_APP, "The \".exit\" notation is disabled in Tor due to " - "security risks. Set AllowDotExit in your torrc to enable " - "it (at your own risk)."); + 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. Set AllowDotExit in your torrc to enable " + "it (at your own risk)."); control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s", escaped(socks->address)); out->end_reason = END_STREAM_REASON_TORPROTOCOL; |