[tor-commits] [tor/master] prop224: Log undecodable descriptor when SafeLogging is off

[nickm at torproject.org]

commit 00967cd2a87f8ef4c30bfcebd8eae9c9fb2ed251
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Aug 31 12:33:52 2017 -0400

    prop224: Log undecodable descriptor when SafeLogging is off
    
    Closes #23304
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/or/hs_client.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/or/hs_client.c b/src/or/hs_client.c
index 99be058eb..75cc45b3b 100644
--- a/src/or/hs_client.c
+++ b/src/or/hs_client.c
@@ -903,7 +903,10 @@ hs_client_decode_descriptor(const char *desc_str,
   ret = hs_desc_decode_descriptor(desc_str, subcredential, desc);
   memwipe(subcredential, 0, sizeof(subcredential));
   if (ret < 0) {
-    log_warn(LD_GENERAL, "Could not parse received descriptor as client");
+    log_warn(LD_GENERAL, "Could not parse received descriptor as client.");
+    if (get_options()->SafeLogging_ == SAFELOG_SCRUB_NONE) {
+      log_warn(LD_GENERAL, "%s", escaped(desc_str));
+    }
     goto err;
   }