Merge branch 'master' into testLineTooLong

.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.22.0
     - run: go version
     - name: Build Ergo
       run: |

.github/workflows/test-stable.yml

@@ -65,7 +65,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         path: Bahamut
-        ref: v2.2.4
+        ref: v2.2.1
         repository: DALnet/Bahamut
     - name: Build Bahamut
       run: |
@@ -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.22.0
     - run: go version
     - name: Build Ergo
       run: |
@@ -1142,7 +1140,7 @@ jobs:
       uses: actions/checkout@v4
       with:
         path: sable
-        ref: baed3ef9ac4550dc36a45b758436769e82e8ec58
+        ref: e9701e5e8d0c4f278ddd61ce7285f4918ecf99e9
         repository: Libera-Chat/sable
     - name: Install rust toolchain
       uses: actions-rs/toolchain@v1

Makefile

@@ -84,12 +84,15 @@ LIMNORIA_SELECTORS := \
 	$(EXTRA_SELECTORS)
 
 # Tests marked with arbitrary_client_tags or react_tag can't pass because Sable does not support client tags yet
+# Tests marked with private_chathistory can't pass because Sable does not implement CHATHISTORY for DMs
+
 SABLE_SELECTORS := \
 	not Ergo \
 	and not deprecated \
 	and not strict \
 	and not arbitrary_client_tags \
 	and not react_tag \
+	and not private_chathistory \
 	and not list and not lusers and not time and not info \
 	$(EXTRA_SELECTORS)
 

irctest/controllers/anope_services.py

@@ -8,7 +8,7 @@ from irctest.basecontrollers import BaseServicesController, DirectoryBasedContro
 
 TEMPLATE_CONFIG = """
 serverinfo {{
-    name = "My.Little.Services"
+    name = "services.example.org"
     description = "Anope IRC Services"
     numeric = "00A"
     pid = "services.pid"
@@ -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/atheme_services.py

@@ -24,7 +24,7 @@ loadmodule "modules/saslserv/plain";
 #loadmodule "modules/saslserv/scram";
 
 serverinfo {{
-    name = "My.Little.Services";
+    name = "services.example.org";
     desc = "Atheme IRC Services";
     numeric = "00A";
     netname = "testnet";

irctest/controllers/bahamut.py

@@ -14,7 +14,7 @@ options {{
     network_name    unconfigured;
     allow_split_ops;                # Give ops in empty channels
 
-    services_name   My.Little.Services;
+    services_name   services.example.org;
 
     // if you need to link more than 1 server, uncomment the following line
     servtype        hub;
@@ -44,7 +44,7 @@ class {{
 
 /* for services */
 super {{
-    "My.Little.Services";
+    "services.example.org";
 }};
 
 
@@ -57,7 +57,7 @@ class {{
 
 /* our services */
 connect {{
-    name        My.Little.Services;
+    name        services.example.org;
     host        *@127.0.0.1;  # unfortunately, masks aren't allowed here
     apasswd     password;
     cpasswd     password;
@@ -91,7 +91,7 @@ class BahamutController(BaseServerController, DirectoryBasedController):
     software_name = "Bahamut"
     supported_sasl_mechanisms: Set[str] = set()
     supports_sts = False
-    nickserv = "NickServ@My.Little.Services"
+    nickserv = "NickServ@services.example.org"
 
     def create_config(self) -> None:
         super().create_config()

irctest/controllers/charybdis.py

@@ -44,7 +44,7 @@ channel {{
     displayed_usercount = 0;
 }};
 
-connect "My.Little.Services" {{
+connect "services.example.org" {{
     host = "localhost";  # Used to validate incoming connection
     port = 0;  # We don't need servers to connect to services
     send_password = "password";
@@ -53,14 +53,14 @@ connect "My.Little.Services" {{
     flags = topicburst;
 }};
 service {{
-    name = "My.Little.Services";
+    name = "services.example.org";
 }};
 
 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/dlk_services.py

@@ -13,7 +13,7 @@ TEMPLATE_DLK_CONFIG = """\
 info {{
     SID "00A";
     network-name "testnetwork";
-    services-name "My.Little.Services";
+    services-name "services.example.org";
     admin-email "admin@example.org";
 }}
 

irctest/controllers/hybrid.py

@@ -42,7 +42,7 @@ class {{
     connectfreq = 5 minutes;
 }};
 connect {{
-    name = "My.Little.Services";
+    name = "services.example.org";
     host = "127.0.0.1";  # Used to validate incoming connection
     port = 0;  # We don't need servers to connect to services
     send_password = "password";
@@ -50,7 +50,7 @@ connect {{
     class = "server";
 }};
 service {{
-    name = "My.Little.Services";
+    name = "services.example.org";
 }};
 
 auth {{

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
@@ -33,15 +33,14 @@ TEMPLATE_CONFIG = """
       class="ServerOperators"
       >
 
-<options casemapping="ascii"
-         extbanformat="any">
+<options casemapping="ascii">
 
 # Disable 'NOTICE #chan :*** foo invited bar into the channel-
 <security announceinvites="none">
 
 # Services:
 <bind address="{services_hostname}" port="{services_port}" type="servers">
-<link name="My.Little.Services"
+<link name="services.example.org"
     ipaddr="{services_hostname}"
     port="{services_port}"
     allowmask="*"
@@ -51,7 +50,7 @@ TEMPLATE_CONFIG = """
 <module name="spanningtree">
 <module name="hidechans">  # Anope errors when missing
 <sasl requiressl="no"
-      target="My.Little.Services">
+      target="services.example.org">
 
 # Protocol:
 <module name="banexception">

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/ngircd.py

@@ -14,7 +14,7 @@ TEMPLATE_CONFIG = """
     {password_field}
 
 [Server]
-    Name = My.Little.Services
+    Name = services.example.org
     MyPassword = password
     PeerPassword = password
     Passive = yes  # don't connect to it

irctest/controllers/plexus4.py

@@ -44,7 +44,7 @@ class {{
     connectfreq = 5 minutes;
 }};
 connect {{
-    name = "My.Little.Services";
+    name = "services.example.org";
     host = "127.0.0.1";  # Used to validate incoming connection
     port = 0;  # We don't need servers to connect to services
     send_password = "password";
@@ -52,7 +52,7 @@ connect {{
     class = "server";
 }};
 service {{
-    name = "My.Little.Services";
+    name = "services.example.org";
 }};
 
 auth {{

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
 
@@ -108,8 +107,6 @@ NETWORK_CONFIG = """
 
 NETWORK_CONFIG_CONFIG = """
 {
-    "object_expiry": 300,
-
     "opers": [
         {
             "name": "operuser",
@@ -497,53 +494,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/controllers/unrealircd.py

@@ -64,7 +64,7 @@ listen {{
     options {{ serversonly; }}
 }}
 
-link My.Little.Services {{
+link services.example.org {{
     incoming {{
         mask *;
     }}
@@ -72,11 +72,11 @@ link My.Little.Services {{
     class servers;
 }}
 ulines {{
-    My.Little.Services;
+    services.example.org;
 }}
 
 set {{
-    sasl-server My.Little.Services;
+    sasl-server services.example.org;
     kline-address "example@example.org";
     network-name "ExampleNET";
     default-server "irc.example.org";

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/links.py

@@ -3,13 +3,6 @@ from irctest.numerics import ERR_UNKNOWNCOMMAND, RPL_ENDOFLINKS, RPL_LINKS
 from irctest.patma import ANYSTR, StrRe
 
 
-def _server_info_regexp(case: cases.BaseServerTestCase) -> str:
-    if case.controller.software_name == "Sable":
-        return ".+"
-    else:
-        return "test server"
-
-
 class LinksTestCase(cases.BaseServerTestCase):
     @cases.mark_specifications("RFC1459", "RFC2812", "Modern")
     def testLinksSingleServer(self):
@@ -63,7 +56,7 @@ class LinksTestCase(cases.BaseServerTestCase):
                 "nick",
                 "My.Little.Server",
                 "My.Little.Server",
-                StrRe(f"0 (0042 )?{_server_info_regexp(self)}"),
+                StrRe("0 (0042 )?test server"),
             ],
         )
 
@@ -117,7 +110,7 @@ class ServicesLinksTestCase(cases.BaseServerTestCase):
             # This server redacts links
             return
 
-        messages.sort(key=lambda m: tuple(m.params))
+        messages.sort(key=lambda m: m.params[-1])
 
         self.assertMessageMatch(
             messages.pop(0),
@@ -126,7 +119,7 @@ class ServicesLinksTestCase(cases.BaseServerTestCase):
                 "nick",
                 "My.Little.Server",
                 "My.Little.Server",
-                StrRe(f"0 (0042 )?{_server_info_regexp(self)}"),
+                StrRe("0 (0042 )?test server"),
             ],
         )
         self.assertMessageMatch(
@@ -134,9 +127,9 @@ class ServicesLinksTestCase(cases.BaseServerTestCase):
             command=RPL_LINKS,
             params=[
                 "nick",
-                "My.Little.Services",
+                "services.example.org",
                 "My.Little.Server",
-                StrRe("[01] .+"),  # SID instead of description for Anope...
+                StrRe("1 .+"),  # SID instead of description for Anope...
             ],
         )
 

irctest/server_tests/messages.py

@@ -2,6 +2,8 @@
 The PRIVMSG and NOTICE commands.
 """
 
+import pytest
+
 from irctest import cases
 from irctest.numerics import ERR_INPUTTOOLONG
 from irctest.patma import ANYSTR
@@ -123,26 +125,31 @@ class NoticeTestCase(cases.BaseServerTestCase):
 
 
 class TagsTestCase(cases.BaseServerTestCase):
+    @pytest.mark.parametrize("tag_length", [4096, 10000])
     @cases.mark_capabilities("message-tags")
     @cases.xfailIf(
-        lambda self: bool(
+        lambda self, tag_length: bool(
             self.controller.software_name == "UnrealIRCd"
             and self.controller.software_version == 5
         ),
         "UnrealIRCd <6.0.7 dropped messages with excessively large tags: "
         "https://bugs.unrealircd.org/view.php?id=5947",
     )
-    def testLineTooLong(self):
+    def testLineTooLong(self, tag_length):
         self.connectClient("bar", capabilities=["message-tags"], skip_if_cap_nak=True)
         self.connectClient(
             "recver", capabilities=["message-tags"], skip_if_cap_nak=True
         )
         self.joinChannel(1, "#xyz")
-        monsterMessage = "@+clientOnlyTagExample=" + "a" * 4096 + " PRIVMSG #xyz hi!"
+
+        monsterMessage = (
+            "@+clientOnlyTagExample=" + "a" * tag_length + " PRIVMSG #xyz hi!"
+        )
         self.sendLine(1, monsterMessage)
         replies = self.getMessages(1)
-        self.assertIn(ERR_INPUTTOOLONG, set(reply.command for reply in replies))
         self.assertEqual(self.getMessages(2), [], "overflowing message was relayed")
+        if len(replies) > 0:
+            self.assertIn(ERR_INPUTTOOLONG, set(reply.command for reply in replies))
 
 
 class LengthLimitTestCase(cases.BaseServerTestCase):

irctest/server_tests/whois.py

@@ -221,6 +221,7 @@ class WhoisTestCase(_WhoisTestMixin, cases.BaseServerTestCase):
         )
 
     @cases.mark_specifications("RFC2812")
+    @cases.xfailIfSoftware(["Sable"], "https://github.com/Libera-Chat/sable/issues/101")
     def testWhoisMissingUser(self):
         """Test WHOIS on a nonexistent nickname."""
         self.connectClient("qux", name="qux")

mypy.ini

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

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

@@ -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/
@@ -100,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
@@ -139,7 +136,7 @@ software:
         pre_deps:
             - uses: actions/setup-go@v3
               with:
-                  go-version: '^1.24.0'
+                  go-version: '^1.22.0'
             - run: go version
         separate_build_job: false
         build_script: |
@@ -252,7 +249,7 @@ software:
         name: Sable
         repository: Libera-Chat/sable
         refs:
-            stable: baed3ef9ac4550dc36a45b758436769e82e8ec58
+            stable: e9701e5e8d0c4f278ddd61ce7285f4918ecf99e9
             release: null
             devel: master
             devel_release: null