浏览代码

Make "Invalid onion hostname" msg respect SafeLogging.

Patch by Roger; fixes bug 1027.
Nick Mathewson 16 年之前
父节点
当前提交
258b980331
共有 2 个文件被更改,包括 5 次插入2 次删除
  1. 3 1
      ChangeLog
  2. 2 1
      src/or/connection_edge.c

+ 3 - 1
ChangeLog

@@ -1,4 +1,4 @@
-Changes in version 0.2.1.17-rc - 2009-07-02
+Changes in version 0.2.1.17-rc - 2009-07-07
   o Major features:
   o Major features:
     - Clients now use the bandwidth values in the consensus, rather than
     - Clients now use the bandwidth values in the consensus, rather than
       the bandwidth values in each relay descriptor. This approach opens
       the bandwidth values in each relay descriptor. This approach opens
@@ -36,6 +36,8 @@ Changes in version 0.2.1.17-rc - 2009-07-02
     - When we can't find an intro key for a v2 hidden service descriptor,
     - When we can't find an intro key for a v2 hidden service descriptor,
       fall back to the v0 hidden service descriptor and log a bug message.
       fall back to the v0 hidden service descriptor and log a bug message.
       Workaround for bug 1024.
       Workaround for bug 1024.
+    - Fix a log message that did not respect the SafeLogging option.
+      Resolves bug 1027.
 
 
   o Minor features:
   o Minor features:
     - If we're a relay and we change our IP address, be more verbose
     - If we're a relay and we change our IP address, be more verbose

+ 2 - 1
src/or/connection_edge.c

@@ -1484,7 +1484,8 @@ connection_ap_handshake_rewrite_and_attach(edge_connection_t *conn,
   addresstype = parse_extended_hostname(socks->address);
   addresstype = parse_extended_hostname(socks->address);
 
 
   if (addresstype == BAD_HOSTNAME) {
   if (addresstype == BAD_HOSTNAME) {
-    log_warn(LD_APP, "Invalid hostname %s; rejecting", socks->address);
+    log_warn(LD_APP, "Invalid onion hostname %s; rejecting",
+             safe_str(socks->address));
     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));
     connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL);
     connection_mark_unattached_ap(conn, END_STREAM_REASON_TORPROTOCOL);