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

Fix cv=none processing for initial signature in chain

Browse Source
This commit is contained in:
Scott Kitterman
2019-04-14 22:17:41 -04:00
parent 0ce3775afa
commit aa5419b7d9
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+1
View File
@@ -3,6 +3,7 @@ UNRELEASED Version 0.9.2
srv_id option is the authserv_id to use in the ARC signatures - Only AR srv_id option is the authserv_id to use in the ARC signatures - Only AR
fields with an authserv-id that matches srv_id will be considered for fields with an authserv-id that matches srv_id will be considered for
ARC signing) ARC signing)
- Fix cv=none processing for initial signature in chain
- Refactor canonicalization.py strip_trailing_lines to avoid using re for - Refactor canonicalization.py strip_trailing_lines to avoid using re for
more consistent processing across python versions (Thanks to Jonathan more consistent processing across python versions (Thanks to Jonathan
Bastien-Filiatrault for the change) Bastien-Filiatrault for the change)
dkim/__init__.py
+3 -3
View File
@@ -967,8 +967,7 @@ class ARC(DomainSigner):
parsed_auth_results = AuthenticationResultsHeader.parse('Authentication-Results: ' + auth_results.decode('utf-8')) parsed_auth_results = AuthenticationResultsHeader.parse('Authentication-Results: ' + auth_results.decode('utf-8'))
arc_results = [res for res in parsed_auth_results.results if res.method == 'arc'] arc_results = [res for res in parsed_auth_results.results if res.method == 'arc']
if len(arc_results) == 0: if len(arc_results) == 0:
self.logger.debug("no AR arc stamps found, chain terminated") chain_validation_status = CV_None
return []
elif len(arc_results) != 1: elif len(arc_results) != 1:
self.logger.debug("multiple AR arc stamps found, failing chain") self.logger.debug("multiple AR arc stamps found, failing chain")
chain_validation_status = CV_Fail chain_validation_status = CV_Fail
@@ -1003,7 +1002,8 @@ class ARC(DomainSigner):
if instance == 1 and chain_validation_status != CV_None: if instance == 1 and chain_validation_status != CV_None:
raise ParameterError("No existing chain found on message, cv should be none") raise ParameterError("No existing chain found on message, cv should be none")
elif instance != 1 and chain_validation_status == CV_None: elif instance != 1 and chain_validation_status == CV_None:
raise ParameterError("cv=none not allowed on instance %d" % instance) self.logger.debug("no previous AR arc results found and instance > 1, chain terminated")
return []
new_arc_set = [] new_arc_set = []
if chain_validation_status != CV_Fail: if chain_validation_status != CV_Fail: