Fix support for Anope >= Anope 2.1.12

Anope now rejects passwords too long for bcrypt to handle:
d460b267e3

.github/workflows/lint.yml

@@ -19,7 +19,7 @@ jobs:
         python-version: 3.11
 
     - name: Cache dependencies
-      uses: actions/cache@v4
+      uses: actions/cache@v2
       with:
         path: |
           ~/.cache

.github/workflows/test-devel.yml

@@ -120,8 +120,6 @@ jobs:
         path: ircd-hybrid
         ref: 8.2.x
         repository: ircd-hybrid/ircd-hybrid
-    - name: Install system dependencies
-      run: sudo apt-get install atheme-services faketime libjansson-dev
     - name: Build Hybrid
       run: |
         cd $GITHUB_WORKSPACE/ircd-hybrid/
@@ -560,7 +558,7 @@ jobs:
         repository: ergochat/ergo
     - uses: actions/setup-go@v3
       with:
-        go-version: ^1.24.0
+        go-version: ^1.23.0
     - run: go version
     - name: Build Ergo
       run: |

.github/workflows/test-stable.yml

@@ -161,8 +161,6 @@ jobs:
         path: ircd-hybrid
         ref: 8.2.39
         repository: ircd-hybrid/ircd-hybrid
-    - name: Install system dependencies
-      run: sudo apt-get install atheme-services faketime libjansson-dev
     - name: Build Hybrid
       run: |
         cd $GITHUB_WORKSPACE/ircd-hybrid/
@@ -638,7 +636,7 @@ jobs:
         repository: ergochat/ergo
     - uses: actions/setup-go@v3
       with:
-        go-version: ^1.24.0
+        go-version: ^1.23.0
     - run: go version
     - name: Build Ergo
       run: |

irctest/controllers/anope_services.py

@@ -66,13 +66,8 @@ options {{
     warningtimeout = 4h
 }}
 
-module {{ name = "ns_sasl" }} # since 2.1.13
-module {{ name = "sasl" }}    # 2.1.2 to 2.1.12
-module {{ name = "m_sasl" }}  # 2.0 to 2.1.1
-
-module {{ name = "enc_sha2" }}   # 2.1
-module {{ name = "enc_sha256" }} # 2.0
-
+module {{ name = "{module_prefix}sasl" }}
+module {{ name = "enc_bcrypt" }}
 module {{ name = "ns_cert" }}
 
 """
@@ -128,6 +123,7 @@ class AnopeController(BaseServicesController, DirectoryBasedController):
                     protocol=protocol,
                     server_hostname=server_hostname,
                     server_port=server_port,
+                    module_prefix="" if self.software_version >= (2, 1, 2) else "m_",
                 )
             )
 

irctest/controllers/charybdis.py

@@ -60,7 +60,7 @@ privset "omnioper" {{
     privs = oper:general, oper:privs, oper:testline, oper:kill, oper:operwall, oper:message,
             oper:routing, oper:kline, oper:unkline, oper:xline,
             oper:resv, oper:cmodes, oper:mass_notice, oper:wallops,
-            oper:remoteban, oper:local_kill,
+            oper:remoteban,
             usermode:servnotice, auspex:oper, auspex:hostname, auspex:umodes, auspex:cmodes,
             oper:admin, oper:die, oper:rehash, oper:spy, oper:grant;
 }};

irctest/controllers/inspircd.py

@@ -19,7 +19,7 @@ TEMPLATE_CONFIG = """
 
 <class
     name="ServerOperators"
-    commands="WALLOPS GLOBOPS KILL"
+    commands="WALLOPS GLOBOPS"
     privs="channels/auspex users/auspex channels/auspex servers/auspex"
     >
 <type

irctest/controllers/irc2.py

@@ -24,7 +24,7 @@ Y:10:90::100:512000:100.100:100.100:
 I::{password_field}:::10::
 
 # O:<TARGET Host NAME>:<Password>:<Nickname>:<Port>:<Class>:<Flags>:
-O:*:operpassword:operuser:::K:
+O:*:operpassword:operuser::::
 """
 
 

irctest/controllers/sable.py

@@ -14,7 +14,6 @@ from irctest.basecontrollers import (
     NotImplementedByController,
 )
 from irctest.cases import BaseServerTestCase
-from irctest.client_mock import ClientMock
 from irctest.exceptions import NoMessageException
 from irctest.patma import ANYSTR
 
@@ -497,53 +496,6 @@ class SableServicesController(BaseServicesController):
         os.killpg(self.pgroup_id, signal.SIGKILL)
         super().kill_proc()
 
-    def wait_for_services(self) -> None:
-        # by default, wait_for_services() connects a user that sends a HELP command
-        # to NickServ and assumes services are up when it receives a non-ERR_NOSUCHNICK
-        # reply.
-        # However, with Sable, NickServ is always up, even when services are not linked,
-        # so we need to check a different way. We check presence of a non-EXTERNAL
-        # value to the sasl capability, but LINKS would
-        if self.services_up:
-            # Don't check again if they are already available
-            return
-        self.server_controller.wait_for_port()
-
-        c = ClientMock(name="chkSvs", show_io=True)
-        c.connect(self.server_controller.hostname, self.server_controller.port)
-        c.sendLine("NICK chkSvs")
-        c.sendLine("USER chk chk chk chk")
-        time.sleep(self.server_controller.sync_sleep_time)
-        got_end_of_motd = False
-        while not got_end_of_motd:
-            for msg in c.getMessages(synchronize=False):
-                if msg.command == "PING":
-                    # Hi Unreal
-                    c.sendLine("PONG :" + msg.params[0])
-                if msg.command in ("376", "422"):  # RPL_ENDOFMOTD / ERR_NOMOTD
-                    got_end_of_motd = True
-
-        timeout = time.time() + 10
-        while not self.services_up:
-            if time.time() > timeout:
-                raise Exception("Timeout while waiting for services")
-            c.sendLine("CAP LS 302")
-
-            msgs = self.getNickServResponse(c, timeout=1)
-            for msg in msgs:
-                if msg.command == "CAP":
-                    pass
-                for token in msg.params[-1].split():
-                    if token.startswith("sasl="):
-                        if "PLAIN" in token.removeprefix("sasl=").split(","):
-                            # SASL PLAIN is available, so services are linked.
-                            self.services_up = True
-                            break
-
-        c.sendLine("QUIT")
-        c.getMessages()
-        c.disconnect()
-
 
 def get_irctest_controller_class() -> Type[SableController]:
     return SableController

irctest/server_tests/kill.py

@@ -1,67 +0,0 @@
-"""
-The KILL command  (`Modern <https://modern.ircdocs.horse/#kill-message>`__)
-"""
-
-
-from irctest import cases
-from irctest.numerics import ERR_NOPRIVILEGES, RPL_YOUREOPER
-
-
-class KillTestCase(cases.BaseServerTestCase):
-    @cases.mark_specifications("Modern")
-    @cases.xfailIfSoftware(["Sable"], "https://github.com/Libera-Chat/sable/issues/154")
-    def testKill(self):
-        self.connectClient("ircop", name="ircop")
-        self.connectClient("alice", name="alice")
-        self.connectClient("bob", name="bob")
-
-        self.sendLine("ircop", "OPER operuser operpassword")
-        self.assertIn(
-            RPL_YOUREOPER,
-            [m.command for m in self.getMessages("ircop")],
-            fail_msg="OPER failed",
-        )
-
-        self.sendLine("alice", "KILL bob :some arbitrary reason")
-        self.assertIn(
-            ERR_NOPRIVILEGES,
-            [m.command for m in self.getMessages("alice")],
-            fail_msg="unprivileged KILL not rejected",
-        )
-        # bob is not killed
-        self.getMessages("bob")
-
-        self.sendLine("alice", "KILL alice :some arbitrary reason")
-        self.assertIn(
-            ERR_NOPRIVILEGES,
-            [m.command for m in self.getMessages("alice")],
-            fail_msg="unprivileged KILL not rejected",
-        )
-        # alice is not killed
-        self.getMessages("alice")
-
-        # privileged KILL should succeed
-        self.sendLine("ircop", "KILL alice :some arbitrary reason")
-        self.getMessages("ircop")
-        self.assertDisconnected("alice")
-
-        self.sendLine("ircop", "KILL bob :some arbitrary reason")
-        self.getMessages("ircop")
-        self.assertDisconnected("bob")
-
-    @cases.mark_specifications("Ergo")
-    def testKillOneArgument(self):
-        self.connectClient("ircop", name="ircop")
-        self.connectClient("alice", name="alice")
-
-        self.sendLine("ircop", "OPER operuser operpassword")
-        self.assertIn(
-            RPL_YOUREOPER,
-            [m.command for m in self.getMessages("ircop")],
-            fail_msg="OPER failed",
-        )
-
-        # 1-argument kill command, accepted by Ergo and some implementations
-        self.sendLine("ircop", "KILL alice")
-        self.getMessages("ircop")
-        self.assertDisconnected("alice")

irctest/server_tests/sasl.py

@@ -82,7 +82,7 @@ class SaslTestCase(cases.BaseServerTestCase):
     @cases.mark_specifications("IRCv3")
     @cases.skipUnlessHasMechanism("PLAIN")
     def testPlainNonAscii(self):
-        password = "é" * 100
+        password = "é" * 30
         authstring = base64.b64encode(
             b"\x00".join([b"foo", b"foo", password.encode()])
         ).decode()

mypy.ini

@@ -1,5 +1,5 @@
 [mypy]
-python_version = 3.9
+python_version = 3.8
 warn_return_any = True
 warn_unused_configs = True
 

workflows.yml

@@ -33,9 +33,6 @@ software:
             devel: "8.2.x"
             devel_release: null
         path: ircd-hybrid
-        pre_deps:
-            - name: "Install system dependencies"
-              run: "sudo apt-get install atheme-services faketime libjansson-dev"
         separate_build_job: true
         build_script: |
             cd $GITHUB_WORKSPACE/ircd-hybrid/
@@ -139,7 +136,7 @@ software:
         pre_deps:
             - uses: actions/setup-go@v3
               with:
-                  go-version: '^1.24.0'
+                  go-version: '^1.23.0'
             - run: go version
         separate_build_job: false
         build_script: |