diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-06-03 11:16:48 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-06-03 11:16:48 -0400 |
| commit | de069f5ea73a4fe841df27d85c28c0d79ad2c13e (patch) | |
| tree | 4819f3b90fe804228d83d0de1de92c1acbf4f60f | |
| parent | b79d50dfcc77013329b2fbfd4a84af29a5965b27 (diff) | |
| parent | 96b929e743dc68f706f374c3448ed27c54a9cead (diff) | |
| download | tor-de069f5ea73a4fe841df27d85c28c0d79ad2c13e.tar.gz tor-de069f5ea73a4fe841df27d85c28c0d79ad2c13e.zip | |
Merge remote-tracking branch 'rransom/bug2748-v2' into maint-0.2.2
| -rw-r--r-- | changes/bug2748 | 10 | ||||
| -rw-r--r-- | src/or/rendcommon.c | 13 |
2 files changed, 14 insertions, 9 deletions
diff --git a/changes/bug2748 b/changes/bug2748 new file mode 100644 index 0000000000..b522560a92 --- /dev/null +++ b/changes/bug2748 @@ -0,0 +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. + + diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c index 683e11ad24..3b18bf6078 100644 --- a/src/or/rendcommon.c +++ b/src/or/rendcommon.c @@ -984,15 +984,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)); - return -1; - } - /* Determine if we are responsible. */ - if (hid_serv_responsible_for_desc_id(desc_id_digest) < 0) { - log_info(LD_REND, "Could not answer fetch request for v2 descriptor; " - "either we are no hidden service directory, or we are " - "not responsible for the requested 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. */ |