Merge lp:~valimail/authentication-results-python/gene into lp:authentication-results-python/0.6

[Scott Kitterman]

Merge ARC updates.

[Scott Kitterman (kitterman)]

Ship it.

review: Approve

=== modified file 'authres/arc.py'
--- authres/arc.py	2017-07-14 05:28:08 +0000
+++ authres/arc.py	2017-08-04 18:49:56 +0000
@@ -40,23 +40,29 @@
         result               = None,  result_comment               = None,
         reason               = None,  reason_comment               = None,
         properties = None,
-        header_d             = None,  header_d_comment             = None,
+        header_ams_d                = None,  header_ams_d_comment                = None,
+        header_ams_s                = None,  header_ams_s_comment                = None,
+        header_as_d                 = None,  header_as_d_comment                 = None,
+        header_as_s                 = None,  header_as_s_comment                 = None,
     ):
         authres.core.AuthenticationResult.__init__(self, self.METHOD, version,
             result, result_comment, reason, reason_comment, properties)
-        if header_d:                     self.header_d                     = header_d
-        if header_d_comment:             self.header_d_comment             = header_d_comment
-
-    header_d,             header_d_comment             = make_result_class_properties('header', 'd')
-
-    def match_signature(self, signature_d):
-        """Match authentication result against a ARC signature by ``header.d``."""
-
-        return self.header_d == signature_d
+        if header_ams_d:                        self.header_ams_d                    = header_ams_d
+        if header_ams_d_comment:                self.header_ams_d_comment            = header_ams_d_comment
+        if header_ams_s:                        self.header_ams_s                    = header_ams_s
+        if header_ams_s_comment:                self.header_ams_s_comment            = header_ams_s_comment
+        if header_as_d:                         self.header_as_d                     = header_as_d
+        if header_as_d_comment:                 self.header_as_d_comment             = header_as_d_comment
+        if header_as_s:                         self.header_as_s                     = header_as_s
+        if header_as_s_comment:                 self.header_as_s_comment             = header_as_s_comment
+
+    header_ams_d,             header_ams_d_comment             = make_result_class_properties('header', 'ams-d')
+    header_ams_s,             header_ams_s_comment             = make_result_class_properties('header', 'ams-s')
+    header_as_d,              header_ams_d_comment             = make_result_class_properties('header', 'as-d')
+    header_as_s,              header_ams_s_comment             = make_result_class_properties('header', 'as-s')
 
 RESULT_CLASSES = [
     ARCAuthenticationResult
 ]
 
 # vim:sw=4 sts=4
-    

=== modified file 'authres/tests'
--- authres/tests	2017-07-13 05:10:33 +0000
+++ authres/tests	2017-08-04 18:49:56 +0000
@@ -529,10 +529,10 @@
 >>> import authres
 >>> import authres.arc
 >>> arc_pass = authres.arc.ARCAuthenticationResult(result = 'pass',
-... header_d = 'example.net')
+... header_ams_d = 'example.net', header_ams_s='valimail2016', header_as_d="example.com", header_as_s="valimail2017")
 >>> str(authres.AuthenticationResultsHeader(authserv_id = 'example.com',
 ... results = [arc_pass]))
-'Authentication-Results: example.com; arc=pass header.d=example.net'
+'Authentication-Results: example.com; arc=pass header.ams-d=example.net header.ams-s=valimail2016 header.as-d=example.com header.as-s=valimail2017'
 
 # Parsing IP6 address.
 >>> arobj = authres_context.parse('Authentication-Results: mail.bmsi.com; iprev=pass policy.iprev="2001:748:100:40::2:2" (mout0.freenet.de); spf=none smtp.mailfrom=[e-mail]')