tor

commit 6bfdd096792194d1077a101a34859bff996c940e
parent 15d67842f9c1cb993491cf473478999dace7c6c2
Author: teor <teor@torproject.org>
Date:   Wed,  6 Nov 2019 11:16:09 +1000

Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5

Diffstat:
A
changes/ticket31466
 | 
5
+++++
M
src/core/or/connection_edge.c
 | 
6
++++--

2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/changes/ticket31466 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/core/or/connection_edge.c b/src/core/or/connection_edge.c
@@ -1598,8 +1598,10 @@ 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")) {
-    log_warn(LD_APP, "The  \".exit\" notation is disabled in Tor due to "
-             "security risks.");
+    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.");
     control_event_client_status(LOG_WARN, "SOCKS_BAD_HOSTNAME HOSTNAME=%s",
                                 escaped(socks->address));
     out->end_reason = END_STREAM_REASON_TORPROTOCOL;