commit 96014b1ad9f349c88ae3df160e6a073a165857fa Author: Damian Johnson atagar@torproject.org Date: Fri Jun 3 09:16:40 2016 -0700

Suppress notifications for malformed dirreq-v3-ips lines

We've had a longstanding issue for months now where dirauths are accepting a malformed extrainfo descriptor...

https://trac.torproject.org/projects/tor/ticket/16858

No point in continuing to spam myself. Unfortunately this will mask other legitimate issues until it's solved but meh - out of my hands. --- descriptor_checker.py | 2 ++ fallback_directories.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/descriptor_checker.py b/descriptor_checker.py index 953def1..91fd825 100755 --- a/descriptor_checker.py +++ b/descriptor_checker.py @@ -53,6 +53,8 @@ def main(): if not query.error: count = len(list(query)) log.debug(" %i descriptors retrieved from %s in %0.2fs" % (count, query.download_url, query.runtime)) + elif "'dirreq-v3-ips' line had non-ascii content" in str(query.error): + log.debug("Suppressing error due to malformed dirreq-v3-ips line: https://trac.torproject.org/projects/tor/ticket/16858") else: log.warn("Unable to retrieve the %s: %s" % (descriptor_type, query.error)) send_email(EMAIL_SUBJECT, descriptor_type, query) diff --git a/fallback_directories.py b/fallback_directories.py index b9d6cc1..4914118 100755 --- a/fallback_directories.py +++ b/fallback_directories.py @@ -61,7 +61,7 @@ def main(): issues.append('%s => Downloading the consensus took %0.1f seconds' % (relay.fingerprint, download_time))

issue_percent = 100.0 * len(issues) / len(fallback_directories) - log.info('%i ssues found (%i%%)' % (len(issues), issue_percent)) + log.info('%i issues found (%i%%)' % (len(issues), issue_percent))

if issue_percent >= NOTIFICATION_THRESHOLD: log.info('Sending notification')