DandelionNStuff/dkimpy-smtputf8
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Shrink the mandatory fields check.

Browse Source
This commit is contained in:
William Grant
2011-03-09 21:36:46 +11:00
parent 2437ab75a3
commit ece86c0e67
1 changed files with 7 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dkim/__init__.py
+5 -26
View File
@@ -466,42 +466,25 @@ def verify(message, debuglog=None, dnsfunc=dnstxt):
if debuglog is not None: if debuglog is not None:
print >>debuglog, "sig:", sig print >>debuglog, "sig:", sig
if 'v' not in sig: mandatory_fields = ('v', 'a', 'b', 'bh', 'd', 'h', 's')
for field in mandatory_fields:
if field not in sig:
if debuglog is not None: if debuglog is not None:
print >>debuglog, "signature missing v=" print >>debuglog, "signature missing %s=" % field
return False return False
if sig['v'] != "1": if sig['v'] != "1":
if debuglog is not None: if debuglog is not None:
print >>debuglog, "v= value is not 1 (%s)" % sig['v'] print >>debuglog, "v= value is not 1 (%s)" % sig['v']
return False return False
if 'a' not in sig:
if debuglog is not None:
print >>debuglog, "signature missing a="
return False
if 'b' not in sig:
if debuglog is not None:
print >>debuglog, "signature missing b="
return False
if re.match(r"[\s0-9A-Za-z+/]+=*$", sig['b']) is None: if re.match(r"[\s0-9A-Za-z+/]+=*$", sig['b']) is None:
if debuglog is not None: if debuglog is not None:
print >>debuglog, "b= value is not valid base64 (%s)" % sig['b'] print >>debuglog, "b= value is not valid base64 (%s)" % sig['b']
return False return False
if 'bh' not in sig:
if debuglog is not None:
print >>debuglog, "signature missing bh="
return False
if re.match(r"[\s0-9A-Za-z+/]+=*$", sig['bh']) is None: if re.match(r"[\s0-9A-Za-z+/]+=*$", sig['bh']) is None:
if debuglog is not None: if debuglog is not None:
print >>debuglog, "bh= value is not valid base64 (%s)" % sig['bh'] print >>debuglog, "bh= value is not valid base64 (%s)" % sig['bh']
return False return False
if 'd' not in sig:
if debuglog is not None:
print >>debuglog, "signature missing d="
return False
if 'h' not in sig:
if debuglog is not None:
print >>debuglog, "signature missing h="
return False
if 'i' in sig and (not sig['i'].endswith(sig['d']) or sig['i'][-len(sig['d'])-1] not in "@."): if 'i' in sig and (not sig['i'].endswith(sig['d']) or sig['i'][-len(sig['d'])-1] not in "@."):
if debuglog is not None: if debuglog is not None:
print >>debuglog, "i= domain is not a subdomain of d= (i=%s d=%d)" % (sig['i'], sig['d']) print >>debuglog, "i= domain is not a subdomain of d= (i=%s d=%d)" % (sig['i'], sig['d'])
@@ -514,10 +497,6 @@ def verify(message, debuglog=None, dnsfunc=dnstxt):
if debuglog is not None: if debuglog is not None:
print >>debuglog, "q= value is not dns/txt (%s)" % sig['q'] print >>debuglog, "q= value is not dns/txt (%s)" % sig['q']
return False return False
if 's' not in sig:
if debuglog is not None:
print >>debuglog, "signature missing s="
return False
if 't' in sig and re.match(r"\d+$", sig['t']) is None: if 't' in sig and re.match(r"\d+$", sig['t']) is None:
if debuglog is not None: if debuglog is not None:
print >>debuglog, "t= value is not a decimal integer (%s)" % sig['t'] print >>debuglog, "t= value is not a decimal integer (%s)" % sig['t']