Don't crash when asked to verify a badly encoded domain or selector.

2011-06-02 23:07:01 +10:00
parent 30bf1bc171
commit f4875a8768
2 changed files with 12 additions and 3 deletions
@@ -430,8 +430,11 @@ def verify(message, logger=None, dnsfunc=dnstxt):
        return False

    # dnstxt wants Unicode
-    selector = sig[b's'].decode('ascii')
-    domain = sig[b'd'].decode('ascii')
+    try:
+        selector = sig[b's'].decode('ascii')
+        domain = sig[b'd'].decode('ascii')
+    except UnicodeDecodeError:
+        return False
    name = "%s._domainkey.%s." % (selector, domain)
    s = dnsfunc(name).encode('utf-8')
    if not s: