Mark Sapiro pushed to branch master at GNU Mailman / Mailman Core


Commits:
f311b135 by Mark Sapiro at 2021-10-24T10:42:46-07:00
Require authheaders >=0.14.0 and adjust tests accordingly.

- - - - -
ba2bdf72 by Mark Sapiro at 2021-10-24T19:30:18+00:00
Merge branch 'arc' into 'master'

Require authheaders >=0.14.0 and adjust tests accordingly.

Closes #954

See merge request mailman/mailman!929
- - - - -


3 changed files:

- setup.py
- src/mailman/docs/NEWS.rst
- src/mailman/handlers/tests/test_arc_validate.py


Changes:

=====================================
setup.py
=====================================
@@ -113,7 +113,7 @@ case second 'm'.  Any other spelling is incorrect.""",
         'aiosmtpd>=1.4.1',
         'alembic>=1.6.2,<1.7',
         'atpublic',
-        'authheaders>=0.9.2',
+        'authheaders>=0.14.0',
         'authres>=1.0.1',
         'click>=8.0.0',
         'dnspython>=1.14.0',


=====================================
src/mailman/docs/NEWS.rst
=====================================
@@ -19,6 +19,7 @@ Bugs fixed
 ----------
 * The ``mailman members`` command reports incompatible options that would
   otherwise throw exceptions.
+* Require authheaders >=0.14.0 and adjust tests accordingly.  (Closes #954)
 
 .. _news-3.3.5:
 


=====================================
src/mailman/handlers/tests/test_arc_validate.py
=====================================
@@ -190,8 +190,9 @@ This is a test message.
 """)
 
         ValidateAuthenticity().process(lst, msg, msgdata)
-        res = ["lists.example.org; spf=pass smtp.mfrom=jqd@d1.example"
-               "; dkim=pass header.i=@d1.example; dmarc=pass; arc=fail"]
+        res = ['lists.example.org; spf=pass smtp.mfrom=jqd@d1.example',
+               '; dkim=pass header.i=@d1.example; dmarc=pass; arc=fail ',
+               '(Most recent ARC-Message-Signature did not validate)']
         self.assertEqual(msg["Authentication-Results"], ''.join(res))
 
     def test_authentication_whitelist_hit(self):
@@ -233,8 +234,9 @@ This is a test!
 
         ValidateAuthenticity().process(lst, msg, msgdata)
 
-        res = ["example.com; spf=pass smtp.mailfrom=gmail.com"
-               "; dkim=pass header.d=valimail.com; arc=none"]
+        res = ['example.com; spf=pass smtp.mailfrom=gmail.com',
+               '; dkim=pass header.d=valimail.com; arc=none ',
+               '(Message is not ARC signed)']
         self.assertEqual(msg["Authentication-Results"], ''.join(res))
 
     def test_authentication_whitelist_miss(self):
@@ -277,7 +279,8 @@ This is a test!
 
         ValidateAuthenticity().process(lst, msg, msgdata)
         self.assertEqual(msg["Authentication-Results"],
-                         "test.com; dkim=pass header.d=valimail.com; arc=none")
+                         'test.com; dkim=pass header.d=valimail.com; arc=none '
+                         '(Message is not ARC signed)')
 
     def test_authentication_bad_outlook_header(self):
         config.push('just_dkim', """
@@ -321,7 +324,8 @@ This is a test!
 
         ValidateAuthenticity().process(lst, msg, msgdata)
         self.assertEqual(msg["Authentication-Results"],
-                         "test.com; dkim=fail header.d=valimail.com; arc=none")
+                         'test.com; dkim=fail header.d=valimail.com; arc=none '
+                         '(Message is not ARC signed)')
 
 
 class TestTimeout(unittest.TestCase):



View it on GitLab: 
https://gitlab.com/mailman/mailman/-/compare/7ab98462371e622fe39aae174138f21ad07a6940...ba2bdf7250b9c2666f1c8e37290932e15978dc13

-- 
View it on GitLab: 
https://gitlab.com/mailman/mailman/-/compare/7ab98462371e622fe39aae174138f21ad07a6940...ba2bdf7250b9c2666f1c8e37290932e15978dc13
You're receiving this email because of your account on gitlab.com.


_______________________________________________
Mailman-checkins mailing list -- mailman-checkins@python.org
To unsubscribe send an email to mailman-checkins-le...@python.org
https://mail.python.org/mailman3/lists/mailman-checkins.python.org/
Member address: arch...@jab.org

Reply via email to