nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make "Invalid onion hostname" msg respect SafeLogging.

Browse Source 
Patch by Roger; fixes bug 1027.
This commit is contained in:
Nick Mathewson 2009-07-07 12:19:04 -04:00
parent 2c221e923b
commit 258b980331
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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

3
src/or/connection_edge.c
View File

@ -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);