Procházet zdrojové kódy

Log malformed HS descriptor requests at the proper level

This log message should be a 'protocol warning', not a 'warning'.
Robert Ransom před 13 roky
rodič
revize
96b929e743
2 změnil soubory, kde provedl 9 přidání a 2 odebrání
  1. 5 0
      changes/bug2748
  2. 4 2
      src/or/rendcommon.c

+ 5 - 0
changes/bug2748

@@ -1,5 +1,10 @@
   o Minor bugfixes
     - Remove dead code from rend_cache_lookup_v2_desc_as_dir.  Fixes
       part of bug 2748; bugfix on 0.2.0.10-alpha.
+    - Log malformed requests for rendezvous descriptors as protocol
+      warnings, not warnings.  Also, use a more informative log
+      message in case someone sees it at log level warning without
+      prior info-level messages.  Fixes the other part of bug 2748;
+      bugfix on 0.2.0.10-alpha.
 
 

+ 4 - 2
src/or/rendcommon.c

@@ -1004,8 +1004,10 @@ rend_cache_lookup_v2_desc_as_dir(const char *desc_id, const char **desc)
   tor_assert(rend_cache_v2_dir);
   if (base32_decode(desc_id_digest, DIGEST_LEN,
                     desc_id, REND_DESC_ID_V2_LEN_BASE32) < 0) {
-    log_warn(LD_REND, "Descriptor ID contains illegal characters: %s",
-             safe_str(desc_id));
+    log_fn(LOG_PROTOCOL_WARN, LD_REND,
+           "Rejecting v2 rendezvous descriptor request -- descriptor ID "
+           "contains illegal characters: %s",
+           safe_str(desc_id));
     return -1;
   }
   /* Lookup descriptor and return. */