| 1 |
From 19df037e53331ae528b876f225be08f198e0f8b6 Mon Sep 17 00:00:00 2001 |
| 2 |
From: Andreas Stieger <astieger@suse.com> |
| 3 |
Date: Mon, 24 Aug 2015 01:04:44 +0200 |
| 4 |
Subject: Log malformed hostnames in socks5 request respecting SafeLogging |
| 5 |
|
| 6 |
|
| 7 |
diff --git a/changes/malformed-hostname-safe-logging b/changes/malformed-hostname-safe-logging |
| 8 |
new file mode 100644 |
| 9 |
index 0000000..9300726 |
| 10 |
--- /dev/null |
| 11 |
+++ b/changes/malformed-hostname-safe-logging |
| 12 |
@@ -0,0 +1,3 @@ |
| 13 |
+ o Minor bugfixes: |
| 14 |
+ - When logging malformed hostnames in socks5 requests, respect |
| 15 |
+ SafeLogging configuration |
| 16 |
diff --git a/src/or/buffers.c b/src/or/buffers.c |
| 17 |
index 2d7dd93..85fcbc6 100644 |
| 18 |
--- a/src/or/buffers.c |
| 19 |
+++ b/src/or/buffers.c |
| 20 |
@@ -1842,7 +1842,7 @@ parse_socks(const char *data, size_t datalen, socks_request_t *req, |
| 21 |
log_warn(LD_PROTOCOL, |
| 22 |
"Your application (using socks5 to port %d) gave Tor " |
| 23 |
"a malformed hostname: %s. Rejecting the connection.", |
| 24 |
- req->port, escaped(req->address)); |
| 25 |
+ req->port, escaped_safe_str_client(req->address)); |
| 26 |
return -1; |
| 27 |
} |
| 28 |
if (log_sockstype) |
| 29 |
-- |
| 30 |
cgit v0.10.2 |
| 31 |
|
Parent Directory
| 
Revision Log