From: Roger Dingledine <arma@torproject.org>
Date: Sun, 22 Nov 2009 04:09:24 +0000 (-0500)
Subject: If somebody tries to overflow my dirport, don't log his IP by default.
X-Git-Tag: tor-0.2.2.7-alpha~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdd58f3bd5daa4a8982244d0b956fcfebfd91b6d;p=thirdparty%2Ftor.git

If somebody tries to overflow my dirport, don't log his IP by default.

aka Fix an instance where a Tor directory mirror might accidentally
log the IP address of a misbehaving Tor client. Bugfix on
0.1.0.1-rc.
---

diff --git a/ChangeLog b/ChangeLog
index 2b55d76839..1e19a2067d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@ Changes in version 0.2.2.7-alpha - 2009-??-??
       with a different memory value than we use for overwriting a freed
       internal circuit structure. Should help with debugging. Suggested
       by bug 1055.
+    - Fix an instance where a Tor directory mirror might accidentally
+      log the IP address of a misbehaving Tor client. Bugfix on
+      0.1.0.1-rc.
 
 
 Changes in version 0.2.2.6-alpha - 2009-11-19
diff --git a/src/or/directory.c b/src/or/directory.c
index 1d3c43ec0c..427f5d8c08 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -3242,8 +3242,8 @@ directory_handle_command(dir_connection_t *conn)
                               &body, &body_len, MAX_DIR_UL_SIZE, 0)) {
     case -1: /* overflow */
       log_warn(LD_DIRSERV,
-               "Invalid input from address '%s'. Closing.",
-               conn->_base.address);
+               "Request too large from address '%s' to DirPort. Closing.",
+               safe_str(conn->_base.address));
       return -1;
     case 0:
       log_debug(LD_DIRSERV,"command not all here yet.");