Merge branch 'master' into join-key

.github/workflows/test-devel_release.yml

@@ -8,7 +8,7 @@ jobs:
     - name: Create directories
       run: cd ~/; mkdir -p .local/ go/
     - name: Cache dependencies
-      uses: actions/cache@v4
+      uses: actions/cache@v3
       with:
         key: 3-${{ runner.os }}-anope-devel_release
         path: '~/.cache
@@ -16,13 +16,13 @@ jobs:
           ${ github.workspace }/anope
 
           '
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
     - name: Set up Python 3.11
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
       with:
         python-version: 3.11
     - name: Checkout Anope
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         path: anope
         ref: '2.0'
@@ -37,7 +37,7 @@ jobs:
     - name: Make artefact tarball
       run: cd ~; tar -czf artefacts-anope.tar.gz .local/ go/
     - name: Upload build artefacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: installed-anope
         path: ~/artefacts-*.tar.gz
@@ -47,13 +47,13 @@ jobs:
     steps:
     - name: Create directories
       run: cd ~/; mkdir -p .local/ go/
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
     - name: Set up Python 3.11
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
       with:
         python-version: 3.11
     - name: Checkout InspIRCd
-      uses: actions/checkout@v4
+      uses: actions/checkout@v3
       with:
         path: inspircd
         ref: insp3
@@ -67,7 +67,7 @@ jobs:
     - name: Make artefact tarball
       run: cd ~; tar -czf artefacts-inspircd.tar.gz .local/ go/
     - name: Upload build artefacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: installed-inspircd
         path: ~/artefacts-*.tar.gz
@@ -81,9 +81,9 @@ jobs:
     - test-inspircd-atheme
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
     - name: Download Artifacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v3
       with:
         path: artifacts
     - name: Install dashboard dependencies
@@ -108,13 +108,13 @@ jobs:
     - build-inspircd
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
     - name: Set up Python 3.11
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
       with:
         python-version: 3.11
     - name: Download build artefacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v3
       with:
         name: installed-inspircd
         path: '~'
@@ -126,15 +126,13 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH
         make inspircd
       timeout-minutes: 30
     - if: always()
       name: Publish results
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: pytest-results_inspircd_devel_release
         path: pytest.xml
@@ -144,18 +142,18 @@ jobs:
     - build-anope
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
     - name: Set up Python 3.11
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
       with:
         python-version: 3.11
     - name: Download build artefacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v3
       with:
         name: installed-inspircd
         path: '~'
     - name: Download build artefacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v3
       with:
         name: installed-anope
         path: '~'
@@ -167,15 +165,13 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH  make
         inspircd-anope
       timeout-minutes: 30
     - if: always()
       name: Publish results
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: pytest-results_inspircd-anope_devel_release
         path: pytest.xml
@@ -184,13 +180,13 @@ jobs:
     - build-inspircd
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v3
     - name: Set up Python 3.11
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v4
       with:
         python-version: 3.11
     - name: Download build artefacts
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v3
       with:
         name: installed-inspircd
         path: '~'
@@ -202,15 +198,13 @@ jobs:
       run: |-
         python -m pip install --upgrade pip
         pip install pytest pytest-xdist pytest-timeout -r requirements.txt
-    - env:
+    - name: Test with pytest
-        IRCTEST_DEBUG_LOGS: ${{ runner.debug }}
-      name: Test with pytest
       run: PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' PATH=$HOME/.local/bin:$PATH  PATH=~/.local/inspircd/sbin:~/.local/inspircd/bin:~/.local/inspircd:$PATH
         make inspircd-atheme
       timeout-minutes: 30
     - if: always()
       name: Publish results
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v3
       with:
         name: pytest-results_inspircd-atheme_devel_release
         path: pytest.xml

irctest/basecontrollers.py

@@ -11,20 +11,7 @@ import subprocess
 import tempfile
 import textwrap
 import time
-from typing import (
+from typing import IO, Any, Callable, Dict, Iterator, List, Optional, Set, Tuple, Type
-    IO,
-    Any,
-    Callable,
-    Dict,
-    Iterator,
-    List,
-    Optional,
-    Sequence,
-    Set,
-    Tuple,
-    Type,
-    Union,
-)
 
 import irctest
 
@@ -87,7 +74,6 @@ class _BaseController:
     _port_lock = FileLock(Path(tempfile.gettempdir()) / "irctest_ports.json.lock")
 
     def __init__(self, test_config: TestCaseControllerConfig):
-        self.debug_mode = os.getenv("IRCTEST_DEBUG_LOGS", "0").lower() in ("true", "1")
         self.test_config = test_config
         self.proc = None
         self._own_ports: Set[Tuple[str, int]] = set()
@@ -144,12 +130,6 @@ class _BaseController:
                 used_ports.remove((hostname, port))
                 self._own_ports.remove((hostname, port))
 
-    def execute(
-        self, command: Sequence[Union[str, Path]], **kwargs: Any
-    ) -> subprocess.Popen:
-        output_to = None if self.debug_mode else subprocess.DEVNULL
-        return subprocess.Popen(command, stderr=output_to, stdout=output_to, **kwargs)
-
 
 class DirectoryBasedController(_BaseController):
     """Helper for controllers whose software configuration is based on an

irctest/controllers/anope_services.py

@@ -136,19 +136,16 @@ class AnopeController(BaseServicesController, DirectoryBasedController):
             Path(services_path).parent.parent / "modules"
         )
 
-        extra_args = []
+        self.proc = subprocess.Popen(
-        if self.debug_mode:
-            extra_args.append("--debug")
-
-        self.proc = self.execute(
             [
                 "anope",
                 "--config=services.conf",  # can't be an absolute path in 2.0
                 "--nofork",  # don't fork
                 "--nopid",  # don't write a pid
-                *extra_args,
             ],
             cwd=self.directory,
+            # stdout=subprocess.DEVNULL,
+            # stderr=subprocess.DEVNULL,
         )
 
 

irctest/controllers/atheme_services.py

@@ -1,3 +1,4 @@
+import subprocess
 from typing import Optional, Type
 
 import irctest
@@ -74,7 +75,7 @@ class AthemeController(BaseServicesController, DirectoryBasedController):
             )
 
         assert self.directory
-        self.proc = self.execute(
+        self.proc = subprocess.Popen(
             [
                 "atheme-services",
                 "-n",  # don't fork
@@ -87,6 +88,8 @@ class AthemeController(BaseServicesController, DirectoryBasedController):
                 "-D",
                 self.directory,
             ],
+            # stdout=subprocess.DEVNULL,
+            # stderr=subprocess.DEVNULL,
         )
 
     def registerUser(

irctest/controllers/bahamut.py

@@ -1,5 +1,6 @@
 from pathlib import Path
 import shutil
+import subprocess
 from typing import Optional, Set, Type
 
 from irctest.basecontrollers import BaseServerController, DirectoryBasedController
@@ -149,7 +150,7 @@ class BahamutController(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = self.execute(
+        self.proc = subprocess.Popen(
             [
                 *faketime_cmd,
                 "ircd",

irctest/controllers/base_hybrid.py

@@ -1,5 +1,5 @@
-from pathlib import Path
 import shutil
+import subprocess
 from typing import Optional
 
 from irctest.basecontrollers import BaseServerController, DirectoryBasedController
@@ -51,8 +51,6 @@ class BaseHybridController(BaseServerController, DirectoryBasedController):
             )
         else:
             ssl_config = ""
-        binary_path = shutil.which(self.binary_name)
-        assert binary_path, f"Could not find '{binary_path}' executable"
         with self.open_file("server.conf") as fd:
             fd.write(
                 (self.template_config).format(
@@ -62,7 +60,6 @@ class BaseHybridController(BaseServerController, DirectoryBasedController):
                     services_port=services_port,
                     password_field=password_field,
                     ssl_config=ssl_config,
-                    install_prefix=Path(binary_path).parent.parent,
                 )
             )
         assert self.directory
@@ -73,7 +70,7 @@ class BaseHybridController(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = self.execute(
+        self.proc = subprocess.Popen(
             [
                 *faketime_cmd,
                 self.binary_name,
@@ -83,6 +80,7 @@ class BaseHybridController(BaseServerController, DirectoryBasedController):
                 "-pidfile",
                 self.directory / "server.pid",
             ],
+            # stderr=subprocess.DEVNULL,
         )
 
         if run_services:

irctest/controllers/dlk_services.py

@@ -200,7 +200,7 @@ class DlkController(BaseServicesController, DirectoryBasedController):
             fd.write(TEMPLATE_DLK_WP_CONFIG.format(**template_vars))
         (dlk_conf_dir / "modules.conf").symlink_to(self.dlk_path / "conf/modules.conf")
 
-        self.proc = self.execute(
+        self.proc = subprocess.Popen(
             [
                 "php",
                 "src/dalek",

irctest/controllers/ergo.py

@@ -58,11 +58,6 @@ BASE_CONFIG = {
             "enabled": True,
             "method": "strict",
         },
-        "login-throttling": {
-            "enabled": True,
-            "duration": "1m",
-            "max-attempts": 3,
-        },
     },
     "channels": {"registration": {"enabled": True}},
     "datastore": {"path": None},
@@ -213,7 +208,7 @@ class ErgoController(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = self.execute(
+        self.proc = subprocess.Popen(
             [*faketime_cmd, "ergo", "run", "--conf", self._config_path, "--quiet"]
         )
 

irctest/controllers/girc.py

@@ -1,3 +1,4 @@
+import subprocess
 from typing import Optional, Type
 
 from irctest import authentication, tls
@@ -30,7 +31,7 @@ class GircController(BaseClientController, DirectoryBasedController):
             args += ["--sasl-fail-is-ok"]
 
         # Runs a client with the config given as arguments
-        self.proc = self.execute(["girc_test", "connect"] + args)
+        self.proc = subprocess.Popen(["girc_test", "connect"] + args)
 
 
 def get_irctest_controller_class() -> Type[GircController]:

irctest/controllers/hybrid.py

@@ -3,9 +3,6 @@ from typing import Set, Type
 from .base_hybrid import BaseHybridController
 
 TEMPLATE_CONFIG = """
-module_base_path = "{install_prefix}/lib/ircd-hybrid/modules";
-.include "./reference.modules.conf"
-
 serverinfo {{
     name = "My.Little.Server";
     sid = "42X";

irctest/controllers/inspircd.py

@@ -48,7 +48,9 @@ TEMPLATE_CONFIG = """
     sendpass="password"
     >
 <module name="spanningtree">
+<module name="services_account">
 <module name="hidechans">  # Anope errors when missing
+<module name="svshold">  # Atheme raises a warning when missing
 <sasl requiressl="no"
       target="services.example.org">
 
@@ -69,10 +71,14 @@ TEMPLATE_CONFIG = """
 <module name="ircv3_servertime">
 <module name="monitor">
 <module name="m_muteban">  # for testing mute extbans
+<module name="namesx"> # For multi-prefix
 <module name="sasl">
 <module name="uhnames">  # For userhost-in-names
+
+# HELP/HELPOP
 <module name="alias">  # for the HELP alias
-{version_config}
+<module name="{help_module_name}">
+<include file="examples/{help_module_name}.conf.example">
 
 # Misc:
 <log method="file" type="*" level="debug" target="/tmp/ircd-{port}.log">
@@ -84,26 +90,6 @@ TEMPLATE_SSL_CONFIG = """
 <openssl certfile="{pem_path}" keyfile="{key_path}" dhfile="{dh_path}" hash="sha1">
 """
 
-TEMPLATE_V3_CONFIG = """
-<module name="namesx"> # For multi-prefix
-<module name="services_account">
-<module name="svshold">  # Atheme raises a warning when missing
-
-# HELP/HELPOP
-<module name="helpop">
-<include file="examples/helpop.conf.example">
-"""
-
-TEMPLATE_V4_CONFIG = """
-<module name="account">
-<module name="multiprefix"> # For multi-prefix
-<module name="services">
-
-# HELP/HELPOP
-<module name="help">
-<include file="examples/help.example.conf">
-"""
-
 
 @functools.lru_cache()
 def installed_version() -> int:
@@ -112,9 +98,8 @@ def installed_version() -> int:
         return 3
     if output.startswith("InspIRCd-4"):
         return 4
-    if output.startswith("InspIRCd-5"):
+    else:
-        return 5
+        assert False, f"unexpected version: {output}"
-    assert False, f"unexpected version: {output}"
 
 
 class InspircdController(BaseServerController, DirectoryBasedController):
@@ -156,9 +141,9 @@ class InspircdController(BaseServerController, DirectoryBasedController):
             ssl_config = ""
 
         if installed_version() == 3:
-            version_config = TEMPLATE_V3_CONFIG
+            help_module_name = "helpop"
-        elif installed_version() >= 4:
+        elif installed_version() == 4:
-            version_config = TEMPLATE_V4_CONFIG
+            help_module_name = "help"
         else:
             assert False, f"unexpected version: {installed_version()}"
 
@@ -171,7 +156,7 @@ class InspircdController(BaseServerController, DirectoryBasedController):
                     services_port=services_port,
                     password_field=password_field,
                     ssl_config=ssl_config,
-                    version_config=version_config,
+                    help_module_name=help_module_name,
                 )
             )
         assert self.directory
@@ -182,22 +167,15 @@ class InspircdController(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        extra_args = []
+        self.proc = subprocess.Popen(
-        if self.debug_mode:
-            if installed_version() >= 4:
-                extra_args.append("--protocoldebug")
-            else:
-                extra_args.append("--debug")
-
-        self.proc = self.execute(
             [
                 *faketime_cmd,
                 "inspircd",
                 "--nofork",
                 "--config",
                 self.directory / "server.conf",
-                *extra_args,
             ],
+            stdout=subprocess.DEVNULL,
         )
 
         if run_services:

irctest/controllers/irc2.py

@@ -1,4 +1,5 @@
 import shutil
+import subprocess
 from typing import Optional, Type
 
 from irctest.basecontrollers import (
@@ -77,7 +78,7 @@ class Irc2Controller(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = self.execute(
+        self.proc = subprocess.Popen(
             [
                 *faketime_cmd,
                 "ircd",
@@ -87,6 +88,7 @@ class Irc2Controller(BaseServerController, DirectoryBasedController):
                 "-f",
                 self.directory / "server.conf",
             ],
+            # stderr=subprocess.DEVNULL,
         )
 
 

irctest/controllers/ircu2.py

@@ -1,4 +1,5 @@
 import shutil
+import subprocess
 from typing import Optional, Type
 
 from irctest.basecontrollers import (
@@ -96,7 +97,7 @@ class Ircu2Controller(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = self.execute(
+        self.proc = subprocess.Popen(
             [
                 *faketime_cmd,
                 "ircd",
@@ -106,6 +107,7 @@ class Ircu2Controller(BaseServerController, DirectoryBasedController):
                 "-x",
                 "DEBUG",
             ],
+            # stderr=subprocess.DEVNULL,
         )
 
 

irctest/controllers/limnoria.py

@@ -1,3 +1,4 @@
+import subprocess
 from typing import Optional, Type
 
 from irctest import authentication, tls
@@ -83,7 +84,7 @@ class LimnoriaController(BaseClientController, DirectoryBasedController):
                 )
             )
         assert self.directory
-        self.proc = self.execute(["supybot", self.directory / "bot.conf"])
+        self.proc = subprocess.Popen(["supybot", self.directory / "bot.conf"])
 
 
 def get_irctest_controller_class() -> Type[LimnoriaController]:

irctest/controllers/mammon.py

@@ -1,4 +1,5 @@
 import shutil
+import subprocess
 from typing import Optional, Set, Type
 
 from irctest.basecontrollers import (
@@ -115,7 +116,7 @@ class MammonController(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = self.execute(
+        self.proc = subprocess.Popen(
             [
                 *faketime_cmd,
                 "mammond",

irctest/controllers/ngircd.py

@@ -1,4 +1,5 @@
 import shutil
+import subprocess
 from typing import Optional, Set, Type
 
 from irctest.basecontrollers import BaseServerController, DirectoryBasedController
@@ -27,9 +28,6 @@ TEMPLATE_CONFIG = """
 [Operator]
     Name = operuser
     Password = operpassword
-
-[Limits]
-    MaxNickLength = 32  # defaults to 9
 """
 
 
@@ -94,7 +92,7 @@ class NgircdController(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = self.execute(
+        self.proc = subprocess.Popen(
             [
                 *faketime_cmd,
                 "ngircd",
@@ -102,6 +100,7 @@ class NgircdController(BaseServerController, DirectoryBasedController):
                 "--config",
                 self.directory / "server.conf",
             ],
+            # stdout=subprocess.DEVNULL,
         )
 
         if run_services:

irctest/controllers/sable.py

@@ -107,8 +107,6 @@ NETWORK_CONFIG = """
 
 NETWORK_CONFIG_CONFIG = """
 {
-    "object_expiry": 300,
-
     "opers": [
         {
             "name": "operuser",
@@ -396,7 +394,7 @@ class SableController(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = self.execute(
+        self.proc = subprocess.Popen(
             [
                 *faketime_cmd,
                 "sable_ircd",
@@ -410,7 +408,6 @@ class SableController(BaseServerController, DirectoryBasedController):
             ],
             cwd=self.directory,
             preexec_fn=os.setsid,
-            env={"RUST_BACKTRACE": "1", **os.environ},
         )
         self.pgroup_id = os.getpgid(self.proc.pid)
 
@@ -477,7 +474,7 @@ class SableServicesController(BaseServicesController):
         with self.server_controller.open_file("configs/services.conf") as fd:
             fd.write(SERVICES_CONFIG % self.server_controller.template_vars)
 
-        self.proc = self.execute(
+        self.proc = subprocess.Popen(
             [
                 "sable_services",
                 "--foreground",
@@ -488,7 +485,6 @@ class SableServicesController(BaseServicesController):
             ],
             cwd=self.server_controller.directory,
             preexec_fn=os.setsid,
-            env={"RUST_BACKTRACE": "1", **os.environ},
         )
         self.pgroup_id = os.getpgid(self.proc.pid)
 

irctest/controllers/snircd.py

@@ -1,4 +1,5 @@
 import shutil
+import subprocess
 from typing import Optional, Type
 
 from irctest.basecontrollers import (
@@ -95,7 +96,7 @@ class SnircdController(BaseServerController, DirectoryBasedController):
         else:
             faketime_cmd = []
 
-        self.proc = self.execute(
+        self.proc = subprocess.Popen(
             [
                 *faketime_cmd,
                 "ircd",
@@ -105,6 +106,7 @@ class SnircdController(BaseServerController, DirectoryBasedController):
                 "-x",
                 "DEBUG",
             ],
+            # stderr=subprocess.DEVNULL,
         )
 
 

irctest/controllers/sopel.py

@@ -1,4 +1,5 @@
 from pathlib import Path
+import subprocess
 import tempfile
 from typing import Optional, TextIO, Type, cast
 
@@ -72,7 +73,7 @@ class SopelController(BaseClientController):
                     auth_method="auth_method = sasl" if auth else "",
                 )
             )
-        self.proc = self.execute(["sopel", "-c", self.filename])
+        self.proc = subprocess.Popen(["sopel", "-c", self.filename])
 
 
 def get_irctest_controller_class() -> Type[SopelController]:

irctest/controllers/thelounge.py

@@ -1,5 +1,6 @@
 import json
 import os
+import subprocess
 from typing import Optional, Type
 
 from irctest import authentication, tls
@@ -95,7 +96,7 @@ class TheLoungeController(BaseClientController, DirectoryBasedController):
             )
         with self.open_file("users/testuser.json", "r") as fd:
             print("config", json.load(fd)["networks"][0]["saslPassword"])
-        self.proc = self.execute(
+        self.proc = subprocess.Popen(
             [os.environ.get("THELOUNGE_BIN", "thelounge"), "start"],
             env={**os.environ, "THELOUNGE_HOME": str(self.directory)},
         )

irctest/controllers/unrealircd.py

@@ -261,7 +261,7 @@ class UnrealircdController(BaseServerController, DirectoryBasedController):
             faketime_cmd = []
 
         with _STARTSTOP_LOCK():
-            self.proc = self.execute(
+            self.proc = subprocess.Popen(
                 [
                     *faketime_cmd,
                     "unrealircd",
@@ -270,6 +270,7 @@ class UnrealircdController(BaseServerController, DirectoryBasedController):
                     "-f",
                     self.directory / "unrealircd.conf",
                 ],
+                # stdout=subprocess.DEVNULL,
             )
             self.wait_for_port()
 

irctest/server_tests/buffering.py

@@ -86,10 +86,10 @@ class BufferingTestCase(cases.BaseServerTestCase):
             if messages and ERR_INPUTTOOLONG in (m.command for m in messages):
                 # https://defs.ircdocs.horse/defs/numerics.html#err-inputtoolong-417
                 self.assertGreater(
-                    len((line + payload + "\r\n").encode()),
+                    len(line + payload + "\r\n"),
                     512 - overhead,
-                    "Got ERR_INPUTTOOLONG for a message that should fit "
+                    "Got ERR_INPUTTOOLONG for a messag that should fit "
-                    "within 512 characters.",
+                    "withing 512 characters.",
                 )
                 continue
 
@@ -125,24 +125,11 @@ class BufferingTestCase(cases.BaseServerTestCase):
                     f"expected payload to be a prefix of {payload!r}, "
                     f"but got {payload!r}",
                 )
-            if self.controller.software_name == "Ergo":
-                self.assertTrue(
-                    payload_intact,
-                    f"Ergo should not truncate messages: {repr(line + payload)}, {repr(received_line)}",
-                )
 
     def get_overhead(self, client1, client2, colon):
-        """Compute the overhead added to client1's message:
+        self.sendLine(client1, f"PRIVMSG nick2 {colon}a\r\n")
-                          PRIVMSG nick2 a\r\n
-        :nick1!~user@host PRIVMSG nick2 :a\r\n
-        So typically client1's NUH length plus either 2 or 3 bytes
-        (the initial colon, the space between source and command, and possibly
-        a colon preceding the trailing).
-        """
-        outgoing = f"PRIVMSG nick2 {colon}a\r\n"
-        self.sendLine(client1, outgoing)
         line = self._getLine(client2)
-        return len(line) - len(outgoing.encode())
+        return len(line) - len(f"PRIVMSG nick2 {colon}a\r\n")
 
     def _getLine(self, client) -> bytes:
         line = b""

irctest/server_tests/chmodes/modeis.py

@@ -1,67 +0,0 @@
-from irctest import cases
-from irctest.numerics import RPL_CHANNELCREATED, RPL_CHANNELMODEIS
-from irctest.patma import ANYSTR, ListRemainder, StrRe
-
-
-class RplChannelModeIsTestCase(cases.BaseServerTestCase):
-    @cases.mark_specifications("Modern")
-    def testChannelModeIs(self):
-        """Test RPL_CHANNELMODEIS and RPL_CHANNELCREATED as responses to
-        `MODE #channel`:
-        <https://modern.ircdocs.horse/#rplcreationtime-329>
-        <https://modern.ircdocs.horse/#rplchannelmodeis-324>
-        """
-        expected_numerics = {RPL_CHANNELMODEIS, RPL_CHANNELCREATED}
-        if self.controller.software_name in ("irc2", "Sable"):
-            # irc2 and Sable don't use timestamps for conflict resolution,
-            # consequently they don't store the channel creation timestamp
-            # and don't send RPL_CHANNELCREATED
-            expected_numerics = {RPL_CHANNELMODEIS}
-
-        self.connectClient("chanop", name="chanop")
-        self.joinChannel("chanop", "#chan")
-        # i, n, and t are specified by RFC1459; some of them may be on by default,
-        # but after this, at least those three should be enabled:
-        self.sendLine("chanop", "MODE #chan +int")
-        self.getMessages("chanop")
-
-        self.sendLine("chanop", "MODE #chan")
-        messages = self.getMessages("chanop")
-        self.assertEqual(expected_numerics, {msg.command for msg in messages})
-        for message in messages:
-            if message.command == RPL_CHANNELMODEIS:
-                # the final parameters are the mode string (e.g. `+int`),
-                # and then optionally any mode parameters (in case the ircd
-                # lists a mode that takes a parameter)
-                self.assertMessageMatch(
-                    message,
-                    command=RPL_CHANNELMODEIS,
-                    params=["chanop", "#chan", ListRemainder(ANYSTR, min_length=1)],
-                )
-                final_param = message.params[2]
-                self.assertEqual(final_param[0], "+")
-                enabled_modes = list(final_param[1:])
-                break
-
-        self.assertLessEqual({"i", "n", "t"}, set(enabled_modes))
-
-        # remove all the modes listed by RPL_CHANNELMODEIS
-        self.sendLine("chanop", f"MODE #chan -{''.join(enabled_modes)}")
-        response = self.getMessage("chanop")
-        # we should get something like: MODE #chan -int
-        self.assertMessageMatch(
-            response, command="MODE", params=["#chan", StrRe("^-.*")]
-        )
-        self.assertEqual(set(response.params[1][1:]), set(enabled_modes))
-
-        self.sendLine("chanop", "MODE #chan")
-        messages = self.getMessages("chanop")
-        self.assertEqual(expected_numerics, {msg.command for msg in messages})
-        # all modes have been disabled; the correct representation of this is `+`
-        for message in messages:
-            if message.command == RPL_CHANNELMODEIS:
-                self.assertMessageMatch(
-                    message,
-                    command=RPL_CHANNELMODEIS,
-                    params=["chanop", "#chan", "+"],
-                )

irctest/server_tests/chmodes/operator.py

@@ -1,159 +0,0 @@
-from irctest import cases
-from irctest.numerics import (
-    ERR_CHANOPRIVSNEEDED,
-    ERR_NOSUCHCHANNEL,
-    ERR_NOSUCHNICK,
-    ERR_NOTONCHANNEL,
-    ERR_USERNOTINCHANNEL,
-)
-
-
-class ChannelOperatorModeTestCase(cases.BaseServerTestCase):
-    """Test various error and success cases around the channel operator mode:
-    <https://modern.ircdocs.horse/#channel-operators>
-    <https://modern.ircdocs.horse/#mode-message>
-    """
-
-    def setupNicks(self):
-        """Set up a standard set of three nicknames and two channels
-        for testing channel-user MODE interactions."""
-        # first nick to join the channel is privileged:
-        self.connectClient("chanop", name="chanop")
-        self.joinChannel("chanop", "#chan")
-
-        self.connectClient("unprivileged", name="unprivileged")
-        self.joinChannel("unprivileged", "#chan")
-        self.getMessages("chanop")
-
-        self.connectClient("unrelated", name="unrelated")
-        self.joinChannel("unrelated", "#unrelated")
-        self.joinChannel("unprivileged", "#unrelated")
-        self.getMessages("unrelated")
-
-    @cases.mark_specifications("Modern")
-    @cases.xfailIfSoftware(["irc2"], "broken in irc2")
-    def testChannelOperatorModeSenderPrivsNeeded(self):
-        """Test that +o from a channel member without the necessary privileges
-        fails as expected."""
-        self.setupNicks()
-        # sender is a channel member but without the necessary privileges:
-        self.sendLine("unprivileged", "MODE #chan +o unprivileged")
-        messages = self.getMessages("unprivileged")
-        self.assertEqual(len(messages), 1)
-        self.assertMessageMatch(messages[0], command=ERR_CHANOPRIVSNEEDED)
-
-    @cases.mark_specifications("Modern")
-    def testChannelOperatorModeTargetNotInChannel(self):
-        """Test that +o targeting a user not present in the channel fails
-        as expected."""
-        self.setupNicks()
-        # sender is a chanop, but target nick is not in the channel:
-        self.sendLine("chanop", "MODE #chan +o unrelated")
-        messages = self.getMessages("chanop")
-        self.assertEqual(len(messages), 1)
-        self.assertMessageMatch(messages[0], command=ERR_USERNOTINCHANNEL)
-
-    @cases.mark_specifications("Modern")
-    def testChannelOperatorModeTargetDoesNotExist(self):
-        """Test that +o targeting a nonexistent nick fails as expected."""
-        self.setupNicks()
-        # sender is a chanop, but target nick does not exist:
-        self.sendLine("chanop", "MODE #chan +o nobody")
-        messages = self.getMessages("chanop")
-        # ERR_NOSUCHNICK is typical, Bahamut additionally sends ERR_USERNOTINCHANNEL
-        if self.controller.software_name != "Bahamut":
-            self.assertEqual(len(messages), 1)
-            self.assertMessageMatch(messages[0], command=ERR_NOSUCHNICK)
-        else:
-            self.assertLessEqual(len(messages), 2)
-            commands = {message.command for message in messages}
-            self.assertLessEqual({ERR_NOSUCHNICK}, commands)
-            self.assertLessEqual(commands, {ERR_NOSUCHNICK, ERR_USERNOTINCHANNEL})
-
-    @cases.mark_specifications("Modern")
-    @cases.xfailIf(
-        lambda self: bool(
-            self.controller.software_name == "UnrealIRCd"
-            and self.controller.software_version == 5
-        ),
-        "UnrealIRCd <6.1.7 returns ERR_NOSUCHNICK on non-existent channel",
-    )
-    def testChannelOperatorModeChannelDoesNotExist(self):
-        """Test that +o targeting a nonexistent channel fails as expected.
-
-        "If <target> is a channel that does not exist on the network,
-        # the ERR_NOSUCHCHANNEL (403) numeric is returned."
-        """
-        self.setupNicks()
-        # target channel does not exist, but target nick does:
-        self.sendLine("chanop", "MODE #nonexistentchan +o chanop")
-        messages = self.getMessages("chanop")
-        self.assertEqual(len(messages), 1)
-        self.assertMessageMatch(messages[0], command=ERR_NOSUCHCHANNEL)
-
-    @cases.mark_specifications("Modern")
-    @cases.xfailIf(
-        lambda self: bool(
-            self.controller.software_name == "UnrealIRCd"
-            and self.controller.software_version == 5
-        ),
-        "UnrealIRCd <6.1.7 returns ERR_NOSUCHNICK on non-existent channel",
-    )
-    def testChannelOperatorModeChannelAndTargetDoNotExist(self):
-        """Test that +o targeting a nonexistent channel and nickname
-        fails as expected."""
-        self.setupNicks()
-        # neither target channel nor target nick exist:
-        self.sendLine("chanop", "MODE #nonexistentchan +o nobody")
-        messages = self.getMessages("chanop")
-        self.assertEqual(len(messages), 1)
-        self.assertIn(
-            messages[0].command,
-            [ERR_NOSUCHCHANNEL, ERR_NOTONCHANNEL, ERR_USERNOTINCHANNEL],
-        )
-
-    @cases.mark_specifications("Modern")
-    def testChannelOperatorModeSenderNonMember(self):
-        """Test that +o where the sender is not a channel member
-        fails as expected."""
-        self.setupNicks()
-        # sender is not a channel member, target nick exists and is a channel member:
-        self.sendLine("chanop", "MODE #unrelated +o unprivileged")
-        messages = self.getMessages("chanop")
-        self.assertEqual(len(messages), 1)
-        self.assertIn(messages[0].command, [ERR_NOTONCHANNEL, ERR_CHANOPRIVSNEEDED])
-
-    @cases.mark_specifications("Modern")
-    def testChannelOperatorModeSenderAndTargetNonMembers(self):
-        """Test that +o where neither the sender nor the target is a channel
-        member fails as expected."""
-        self.setupNicks()
-        # sender is not a channel member, target nick exists but is not a channel member:
-        self.sendLine("chanop", "MODE #unrelated +o chanop")
-        messages = self.getMessages("chanop")
-        self.assertEqual(len(messages), 1)
-        self.assertIn(
-            messages[0].command,
-            [ERR_NOTONCHANNEL, ERR_CHANOPRIVSNEEDED, ERR_USERNOTINCHANNEL],
-        )
-
-    @cases.mark_specifications("Modern")
-    def testChannelOperatorModeSuccess(self):
-        """Tests a successful grant of +o in a channel."""
-        self.setupNicks()
-
-        self.sendLine("chanop", "MODE #chan +o unprivileged")
-        messages = self.getMessages("chanop")
-        self.assertEqual(len(messages), 1)
-        self.assertMessageMatch(
-            messages[0],
-            command="MODE",
-            params=["#chan", "+o", "unprivileged"],
-        )
-        messages = self.getMessages("unprivileged")
-        self.assertEqual(len(messages), 1)
-        self.assertMessageMatch(
-            messages[0],
-            command="MODE",
-            params=["#chan", "+o", "unprivileged"],
-        )

irctest/server_tests/messages.py

@@ -140,9 +140,9 @@ class TagsTestCase(cases.BaseServerTestCase):
         self.joinChannel(1, "#xyz")
         monsterMessage = "@+clientOnlyTagExample=" + "a" * 4096 + " PRIVMSG #xyz hi!"
         self.sendLine(1, monsterMessage)
+        self.assertEqual(self.getMessages(2), [], "overflowing message was relayed")
         replies = self.getMessages(1)
         self.assertIn(ERR_INPUTTOOLONG, set(reply.command for reply in replies))
-        self.assertEqual(self.getMessages(2), [], "overflowing message was relayed")
 
 
 class LengthLimitTestCase(cases.BaseServerTestCase):

irctest/server_tests/multiline.py

@@ -3,7 +3,7 @@
 """
 
 from irctest import cases
-from irctest.patma import ANYDICT, ANYSTR, StrRe
+from irctest.patma import ANYDICT, StrRe
 
 CAP_NAME = "draft/multiline"
 BATCH_TYPE = "draft/multiline"
@@ -135,86 +135,3 @@ 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],
-        )

make_workflows.py

@@ -65,7 +65,7 @@ def get_install_steps(*, software_config, software_id, version_flavor):
         install_steps = [
             {
                 "name": f"Checkout {name}",
-                "uses": "actions/checkout@v4",
+                "uses": "actions/checkout@v3",
                 "with": {
                     "repository": software_config["repository"],
                     "ref": ref,
@@ -94,7 +94,7 @@ def get_build_job(*, software_config, software_id, version_flavor):
         cache = [
             {
                 "name": "Cache dependencies",
-                "uses": "actions/cache@v4",
+                "uses": "actions/cache@v3",
                 "with": {
                     "path": f"~/.cache\n${{ github.workspace }}/{path}\n",
                     "key": "3-${{ runner.os }}-"
@@ -123,10 +123,10 @@ def get_build_job(*, software_config, software_id, version_flavor):
                 "run": "cd ~/; mkdir -p .local/ go/",
             },
             *cache,
-            {"uses": "actions/checkout@v4"},
+            {"uses": "actions/checkout@v3"},
             {
                 "name": "Set up Python 3.11",
-                "uses": "actions/setup-python@v5",
+                "uses": "actions/setup-python@v4",
                 "with": {"python-version": 3.11},
             },
             *install_steps,
@@ -160,7 +160,7 @@ def get_test_job(*, config, test_config, test_id, version_flavor, jobs):
             downloads.append(
                 {
                     "name": "Download build artefacts",
-                    "uses": "actions/download-artifact@v4",
+                    "uses": "actions/download-artifact@v3",
                     "with": {"name": f"installed-{software_id}", "path": "~"},
                 }
             )
@@ -195,10 +195,10 @@ def get_test_job(*, config, test_config, test_id, version_flavor, jobs):
         "runs-on": "ubuntu-22.04",
         "needs": needs,
         "steps": [
-            {"uses": "actions/checkout@v4"},
+            {"uses": "actions/checkout@v3"},
             {
                 "name": "Set up Python 3.11",
-                "uses": "actions/setup-python@v5",
+                "uses": "actions/setup-python@v4",
                 "with": {"python-version": 3.11},
             },
             *downloads,
@@ -223,9 +223,6 @@ def get_test_job(*, config, test_config, test_id, version_flavor, jobs):
             {
                 "name": "Test with pytest",
                 "timeout-minutes": 30,
-                "env": {
-                    "IRCTEST_DEBUG_LOGS": "${{ runner.debug }}",
-                },
                 "run": (
                     f"PYTEST_ARGS='--junit-xml pytest.xml --timeout 300' "
                     f"PATH=$HOME/.local/bin:$PATH "
@@ -235,7 +232,7 @@ def get_test_job(*, config, test_config, test_id, version_flavor, jobs):
             {
                 "name": "Publish results",
                 "if": "always()",
-                "uses": "actions/upload-artifact@v4",
+                "uses": "actions/upload-artifact@v3",
                 "with": {
                     "name": f"pytest-results_{test_id}_{version_flavor.value}",
                     "path": "pytest.xml",
@@ -254,7 +251,7 @@ def upload_steps(software_id):
         },
         {
             "name": "Upload build artefacts",
-            "uses": "actions/upload-artifact@v4",
+            "uses": "actions/upload-artifact@v3",
             "with": {
                 "name": f"installed-{software_id}",
                 "path": "~/artefacts-*.tar.gz",
@@ -315,10 +312,10 @@ def generate_workflow(config: dict, version_flavor: VersionFlavor):
         # this job then
         "if": "success() || failure()",
         "steps": [
-            {"uses": "actions/checkout@v4"},
+            {"uses": "actions/checkout@v3"},
             {
                 "name": "Download Artifacts",
-                "uses": "actions/download-artifact@v4",
+                "uses": "actions/download-artifact@v3",
                 "with": {"path": "artifacts"},
             },
             {

patches/bahamut_localhost.patch

@@ -8,13 +8,13 @@ index 317b00e..adfcfcf 100644
  	    dots = 1;
  	}
  
--	if (!dots)
+-	if (!dots) 
 -        {
 -            sendto_realops("Invalid hostname for %s, dumping user %s",
 -                           sptr->hostip, sptr->name);
 -            return exit_client(cptr, sptr, &me, "Invalid hostname");
 -        }
--
+-        
-         if (bad_dns)
+         if (bad_dns) 
          {
              sendto_one(sptr, ":%s NOTICE %s :*** Notice -- You have a bad "

workflows.yml

@@ -97,7 +97,7 @@ software:
         name: Bahamut
         repository: DALnet/Bahamut
         refs:
-            stable: "v2.2.4"
+            stable: "v2.2.1"
             release: null
             devel: "master"
             devel_release: null
@@ -136,7 +136,7 @@ software:
         pre_deps:
             - uses: actions/setup-go@v3
               with:
-                  go-version: '^1.23.0'
+                  go-version: '^1.22.0'
             - run: go version
         separate_build_job: false
         build_script: |
@@ -148,7 +148,7 @@ software:
         name: InspIRCd
         repository: inspircd/inspircd
         refs: &inspircd_refs
-            stable: v3.17.1
+            stable: v3.17.0
             release: null
             devel: master
             devel_release: insp3
@@ -230,7 +230,7 @@ software:
         name: ngircd
         repository: ngircd/ngircd
         refs:
-            stable: acf8409c60ccc96beed0a1f990c4f9374823c0ce # three months ahead of v27
+            stable: 3e3f6cbeceefd9357b53b27c2386bb39306ab353 # three years ahead of rel-26.1
             release: null
             devel: master
             devel_release: null
@@ -300,8 +300,8 @@ software:
         name: UnrealIRCd 6
         repository: unrealircd/unrealircd
         refs:
-            stable: a68625454078641ce984eeb197f7e02b1857ab6c # 6.1.7.1
+            stable: da3c1c654481a33035b9c703957e1c25d0158259  # 6.0.7
-            release: a68625454078641ce984eeb197f7e02b1857ab6c # 6.1.7.1
+            release: da3c1c654481a33035b9c703957e1c25d0158259  # 6.0.7
             devel: unreal60_dev
             devel_release: null
         path: unrealircd