update multiline tests (#275)

irctest/controllers/ergo.py

@@ -58,6 +58,11 @@ BASE_CONFIG = {
             "enabled": True,
             "method": "strict",
         },
+        "login-throttling": {
+            "enabled": True,
+            "duration": "1m",
+            "max-attempts": 3,
+        },
     },
     "channels": {"registration": {"enabled": True}},
     "datastore": {"path": None},

irctest/server_tests/multiline.py

@@ -3,7 +3,7 @@
 """
 
 from irctest import cases
-from irctest.patma import ANYDICT, StrRe
+from irctest.patma import ANYDICT, ANYSTR, StrRe
 
 CAP_NAME = "draft/multiline"
 BATCH_TYPE = "draft/multiline"
@@ -135,3 +135,86 @@ class MultilineTestCase(cases.BaseServerTestCase):
         self.assertIn("+client-only-tag", fallback_relay[0].tags)
         self.assertIn("+client-only-tag", fallback_relay[1].tags)
         self.assertEqual(fallback_relay[0].tags["msgid"], msgid)
+
+    @cases.mark_capabilities("draft/multiline")
+    def testInvalidBatchTag(self):
+        """Test that an unexpected change of batch tag results in
+        FAIL BATCH MULTILINE_INVALID."""
+
+        self.connectClient(
+            "alice", capabilities=(base_caps + [CAP_NAME]), skip_if_cap_nak=True
+        )
+        self.joinChannel(1, "#test")
+
+        # invalid batch tag:
+        self.sendLine(1, "BATCH +123 %s #test" % (BATCH_TYPE,))
+        self.sendLine(1, "@batch=231 PRIVMSG #test :hi")
+        self.assertMessageMatch(
+            self.getMessage(1),
+            command="FAIL",
+            params=["BATCH", "MULTILINE_INVALID", ANYSTR],
+        )
+
+    @cases.mark_capabilities("draft/multiline")
+    def testInvalidBlankConcatTag(self):
+        """Test that the concat tag on a blank message results in
+        FAIL BATCH MULTILINE_INVALID."""
+
+        self.connectClient(
+            "alice", capabilities=(base_caps + [CAP_NAME]), skip_if_cap_nak=True
+        )
+        self.joinChannel(1, "#test")
+
+        # cannot send the concat tag with a blank message:
+        self.sendLine(1, "BATCH +123 %s #test" % (BATCH_TYPE,))
+        self.sendLine(1, "@batch=123 PRIVMSG #test :hi")
+        self.sendLine(1, "@batch=123;%s PRIVMSG #test :" % (CONCAT_TAG,))
+        self.assertMessageMatch(
+            self.getMessage(1),
+            command="FAIL",
+            params=["BATCH", "MULTILINE_INVALID", ANYSTR],
+        )
+
+    @cases.mark_specifications("Ergo")
+    def testLineLimit(self):
+        """This is an Ergo-specific test for line limit enforcement
+        in multiline messages. Right now it hardcodes the same limits as in
+        the Ergo controller; we can generalize it in future for other multiline
+        implementations.
+        """
+
+        self.connectClient(
+            "alice", capabilities=(base_caps + [CAP_NAME]), skip_if_cap_nak=False
+        )
+        self.joinChannel(1, "#test")
+
+        # line limit exceeded
+        self.sendLine(1, "BATCH +123 %s #test" % (BATCH_TYPE,))
+        for i in range(33):
+            self.sendLine(1, "@batch=123 PRIVMSG #test hi")
+        self.assertMessageMatch(
+            self.getMessage(1),
+            command="FAIL",
+            params=["BATCH", "MULTILINE_MAX_LINES", "32", ANYSTR],
+        )
+
+    @cases.mark_specifications("Ergo")
+    def testByteLimit(self):
+        """This is an Ergo-specific test for line limit enforcement
+        in multiline messages (see testLineLimit).
+        """
+
+        self.connectClient(
+            "alice", capabilities=(base_caps + [CAP_NAME]), skip_if_cap_nak=False
+        )
+        self.joinChannel(1, "#test")
+
+        # byte limit exceeded
+        self.sendLine(1, "BATCH +234 %s #test" % (BATCH_TYPE,))
+        for i in range(11):
+            self.sendLine(1, "@batch=234 PRIVMSG #test " + ("x" * 400))
+        self.assertMessageMatch(
+            self.getMessage(1),
+            command="FAIL",
+            params=["BATCH", "MULTILINE_MAX_BYTES", "4096", ANYSTR],
+        )