Merge branch 'develop'

Author: manfred-kaiser

README.md

@@ -26,7 +26,9 @@ FEATURES
     -   variables (RFC 5229)
     -   enotify (RFC 5435, particularly the mailto method RFC 5436)
     -   imap4flags (RFC 5232: setflag, addflag, removeflag; not supported: hasflags, :flags)
-- compatible with the python 2 version from https://github.com/garyp/sifter
+    -   reject and ereject (RFC 5429)
+    -   ihave (RFC 5463)
+
 
 INSTALL
 =======
@@ -72,7 +74,6 @@ TODO
     filtering
 -   Base spec features not yet implemented:
     -   encoded characters (section 2.4.2.4)
-    -   multi-line strings (section 2.4.2)
     -   message uniqueness (section 2.10.3)
     -   envelope test (section 5.4)
     -   handle message loops (section 10)
@@ -94,6 +95,5 @@ TODO
     -   environment (RFC 5183)
     -   date and index (RFC 5260)
     -   editheader (RFC 5293)
-    -   ihave (RFC 5463)
     -   mailbox metadata (RFC 5490)
     -   xmpp notifications (RFC 5437)

docs/index.rst

@@ -20,8 +20,8 @@ FEATURES
     -   variables (RFC 5229)
     -   enotify (RFC 5435, particularly the mailto method RFC 5436)
     -   imap4flags (RFC 5232: setflag, addflag, removeflag; not supported: hasflags, :flags)
-
--   compatible with the Python 2 version from https://github.com/garyp/sifter
+    -   reject and ereject (RFC 5429) (since version 0.2.4)
+    -   ihave (RFC 5463) (since version 0.2.5)
 
 INSTALL
 -------
@@ -81,3 +81,5 @@ TODO
     -   envelope test (section 5.4)
     -   handle message loops (section 10)
     -   limit abuse of redirect action (section
+    -   address test should limit allowed headers to those that contain
+        addresses (section 5.1)

setup.py

@@ -10,7 +10,7 @@
 
 setup(
     name="sifter3",
-    version="0.2.4",
+    version="0.2.5",
     author="Manfred Kaiser, Gary Peck",
     author_email="manfred.kaiser@logfile.at, gary@realify.com",
     url="https://sifter3.readthedocs.io/en/latest/",
@@ -78,6 +78,7 @@
             'true = sifter.tests.true:TestTrue',
             'valid_notify_method = sifter.tests.notify:TestValidNotifyMethod',
             'notify_method_capability = sifter.tests.notify:TestValidNotifyMethod',
+            'ihave = sifter.tests.ihave:TestIHave',
             # sifter comparators
             'ascii_casemap = sifter.comparators.ascii_casemap:ComparatorASCIICasemap',
             'ascii_casemap_noi = sifter.comparators.ascii_casemap:ComparatorASCIICasemapnoi',

sifter/tests/ihave.py

@@ -0,0 +1,31 @@
+from email.message import Message
+from typing import (
+    Optional
+)
+from sifter.grammar.state import EvaluationState
+from sifter.extensions import ExtensionRegistry
+
+from sifter.grammar.test import Test
+from sifter.validators.stringlist import StringList
+
+
+# RFC 5463
+class TestIHave(Test):
+
+    HANDLER_ID = 'IHAVE'
+    EXTENSION_NAME = 'ihave'
+    POSITIONAL_ARGS = [
+        StringList(),
+    ]
+
+    def evaluate(self, message: Message, state: EvaluationState) -> Optional[bool]:
+        state.check_required_extension('ihave', 'conditions on installed extensions')
+        extension_list = self.positional_args[0]
+
+        ret_val = True
+        for ext_name in extension_list:  # type: ignore
+            if ExtensionRegistry.has_extension(ext_name):
+                state.require_extension(ext_name)
+            else:
+                ret_val = False
+        return ret_val

tests/evaluation_ihave_reject.rules

@@ -0,0 +1,5 @@
+require "ihave";
+
+if ihave "reject"{
+    reject "I do not accept messages from this address.";
+}

tests/test_evaluation.py

@@ -28,6 +28,7 @@ def test_evaulation():
         ("evaluation_1.msg", "evaluation_5.rules", [('reject', 'I do not accept messages from\nthis address.\n.\n')]),
         ("evaluation_1.msg", "evaluation_6.rules", [('reject', 'I do not accept messages from this address.')]),
         ("evaluation_1.msg", "evaluation_7.rules", [('reject', 'I do not accept messages from/* this is\nnot a comment */this address.\n.\n')]),
+        ("evaluation_1.msg", "evaluation_ihave_reject.rules", [('reject', 'I do not accept messages from this address.')]),
     )
 
     for messagefile, rulefile, evaluated_rules in EVAL_RESULTS: