Merge remote-tracking branch 'upstream/insp4' into insp4

siniStar7 · siniStar7 · commit bef3db5fa661 · 2026-03-03T15:15:47.000-06:00
diff --git a/.github/workflows/ci-irctest.yml b/.github/workflows/ci-irctest.yml
@@ -39,7 +39,7 @@ jobs:
           tar -czf artifacts-inspircd.tar.gz inspircd
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v7
         with:
           name: installed-inspircd-for-irctest
           path: ~/artifacts-inspircd.tar.gz
@@ -54,7 +54,7 @@ jobs:
     - build
     steps:
       - name: Download build artifacts
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v8
         with:
           name: installed-inspircd-for-irctest
           path: "~"
@@ -68,7 +68,7 @@ jobs:
         uses: actions/checkout@v6
         with:
           path: irctest
-          ref: 4ee99ede9a0d6e8e88a6d7d98793f57465f9d841
+          ref: f1a1ad20dfbc2eaa27e1ecc73a9a1832f8a277f3
           repository: progval/irctest
 
       - name: Install irctest dependencies
@@ -83,7 +83,7 @@ jobs:
         uses: actions/checkout@v6
         with:
           path: anope
-          ref: 2.1.17
+          ref: 2.1.22
           repository: anope/anope
 
       - name: Build and install Anope
diff --git a/docs/conf/help.example.conf b/docs/conf/help.example.conf
@@ -465,14 +465,14 @@ Sets your real name to the specified real name.
 <helptopic key="coper" title="Oper Commands" value="
 ALLTIME        CBAN           CHECK          CHGHOST        CHGIDENT
 CHGNAME        CLEARCHAN      CLOAK          CONNECT        DIE
-ELINE          FILTER         GLINE          GLOADMODULE    GLOBOPS
-GRELOADMODULE  GUNLOADMODULE  KILL           KLINE          LOADMODULE
-NICKLOCK       NICKUNLOCK     OJOIN          OPERMOTD       QLINE
-RCONNECT       REHASH         RELOADMODULE   RESTART        RLINE
-RSQUIT         SAJOIN         SAKICK         SAMODE         SANICK
-SAPART         SAQUIT         SATOPIC        SETHOST        SETIDENT
-SETIDLE        SHUN           SQUIT          SWHOIS         TLINE
-UNLOADMODULE   WALLOPS        ZLINE
+DNSBL          ELINE          FILTER         GLINE          GLOADMODULE
+GLOBOPS        GRELOADMODULE  GUNLOADMODULE  KILL           KLINE
+LOADMODULE     NICKLOCK       NICKUNLOCK     OJOIN          OPERMOTD
+QLINE          RCONNECT       REHASH         RELOADMODULE   RESTART
+RLINE          RSQUIT         SAJOIN         SAKICK         SAMODE
+SANICK         SAPART         SAQUIT         SATOPIC        SETHOST
+SETIDENT       SETIDLE        SHUN           SQUIT          SWHOIS
+TLINE          UNLOADMODULE   WALLOPS        ZLINE
 ">
 
 <helptopic key="tline" title="/TLINE <mask>" value="
@@ -821,6 +821,12 @@ trying to get the cloak of a user from /WHOWAS and they were not
 using their cloak when they quit.
 ">
 
+<helptopic key="dnsbl" title="/DNSBL <nick> [<reason>]" value="
+Rechecks whether the specified user is in a DNSBL. You can also specify
+a reason which will be included in the message sent to other server
+operators that have the DNSBL (d) snomask enabled.
+">
+
 <helptopic key="umodes" title="User Modes" value="
  c            Blocks private messages and notices from users who do
               not share a common channel with you (requires the
diff --git a/docs/conf/modules.example.conf b/docs/conf/modules.example.conf
@@ -1359,9 +1359,10 @@
 #<module name="ircv3_ctctags">
 #
 # If you want to only allow client tags that are intended for processing
-# by the server you can disable the following setting. Doing this is not
+# by the server you can set allowclientonlytags to "none". Alternately,
+# you can set it to "known" to filter to known tags. Doing this is not
 # recommended though as it may break clients.
-#<ctctags allowclientonlytags="yes">
+#<ctctags allowclientonlytags="all">
 
 #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
 # IRCv3 echo-message module: Provides the echo-message IRCv3
diff --git a/include/ctables.h b/include/ctables.h
@@ -254,6 +254,9 @@ class CoreExport Command
 	/** Whether the command can be issued before registering. */
 	bool works_before_reg = false;
 
+	/** Whether the command is currently being loopcalled. */
+	bool loopcall = false;
+
 	/** Handle the command from a user.
 	 * @param user The user who issued the command.
 	 * @param parameters The parameters for the command.
diff --git a/include/modules/monitor.h b/include/modules/monitor.h
@@ -86,7 +86,7 @@ class Monitor::WriteWatchersWithCap
 		, ev(event)
 		, sentid(id)
 	{
-		if (monitorapi)
+		if (user->IsFullyConnected() && monitorapi)
 			monitorapi->ForEachWatcher(user, *this);
 	}
 };
diff --git a/src/commands.cpp b/src/commands.cpp
@@ -61,6 +61,7 @@ bool CommandParser::LoopCall(User* user, Command* handler, const CommandBase::Pa
 	 * for every parameter or parameter pair until there are no more
 	 * left to parse.
 	 */
+	handler->loopcall = true;
 	CommandBase::Params splitparams(parameters);
 	while (items1.GetToken(item) && (!usemax || max++ < ServerInstance->Config->MaxTargets))
 	{
@@ -86,6 +87,7 @@ bool CommandParser::LoopCall(User* user, Command* handler, const CommandBase::Pa
 			}
 		}
 	}
+	handler->loopcall = false;
 
 	return true;
 }
diff --git a/src/coremods/core_channel/cmd_names.cpp b/src/coremods/core_channel/cmd_names.cpp
@@ -31,13 +31,6 @@
 
 #include "core_channel.h"
 
-enum
-{
-	// From RFC 1459.
-	RPL_NAMREPLY = 353,
-	RPL_ENDOFNAMES = 366,
-};
-
 CommandNames::CommandNames(Module* parent)
 	: SplitCommand(parent, "NAMES")
 	, secretmode(parent, "secret")
@@ -50,18 +43,19 @@ CommandNames::CommandNames(Module* parent)
 
 CmdResult CommandNames::HandleLocal(LocalUser* user, const Params& parameters)
 {
-	Channel* c;
-
 	if (parameters.empty())
 	{
 		user->WriteNumeric(RPL_ENDOFNAMES, '*', "End of /NAMES list.");
 		return CmdResult::SUCCESS;
 	}
 
 	if (CommandParser::LoopCall(user, this, parameters, 0))
+	{
+		user->WriteNumeric(RPL_ENDOFNAMES, parameters[0], "End of /NAMES list.");
 		return CmdResult::SUCCESS;
+	}
 
-	c = ServerInstance->Channels.Find(parameters[0]);
+	auto* c = ServerInstance->Channels.Find(parameters[0]);
 	if (c)
 	{
 		// Show the NAMES list if one of the following is true:
@@ -72,14 +66,12 @@ CmdResult CommandNames::HandleLocal(LocalUser* user, const Params& parameters)
 		// If the user is inside the channel or has privs, instruct SendNames() to show invisible (+i) members
 		bool show_invisible = ((c->HasUser(user)) || (user->HasPrivPermission("channels/auspex")));
 		if ((show_invisible) || (!c->IsModeSet(secretmode)))
-		{
 			SendNames(user, c, show_invisible);
-			return CmdResult::SUCCESS;
-		}
 	}
 
-	user->WriteNumeric(RPL_ENDOFNAMES, parameters[0], "End of /NAMES list.");
-	return CmdResult::FAILURE;
+	if (!this->loopcall)
+		user->WriteNumeric(RPL_ENDOFNAMES, parameters[0], "End of /NAMES list.");
+	return c ? CmdResult::SUCCESS : CmdResult::FAILURE;
 }
 
 void CommandNames::SendNames(LocalUser* user, Channel* chan, bool show_invisible)
@@ -118,5 +110,4 @@ void CommandNames::SendNames(LocalUser* user, Channel* chan, bool show_invisible
 	}
 
 	reply.Flush();
-	user->WriteNumeric(RPL_ENDOFNAMES, chan->name, "End of /NAMES list.");
 }
diff --git a/src/coremods/core_channel/core_channel.cpp b/src/coremods/core_channel/core_channel.cpp
@@ -334,6 +334,7 @@ class CoreModChannel final
 
 			// Show all members of the channel, including invisible (+i) users
 			cmdnames.SendNames(localuser, chan, true);
+			localuser->WriteNumeric(RPL_ENDOFNAMES, chan->name, "End of /NAMES list.");
 		}
 	}
 
diff --git a/src/coremods/core_channel/core_channel.h b/src/coremods/core_channel/core_channel.h
@@ -25,6 +25,13 @@
 #include "modules/exemption.h"
 #include "modules/extban.h"
 
+enum
+{
+	// From RFC 1459.
+	RPL_NAMREPLY = 353,
+	RPL_ENDOFNAMES = 366,
+};
+
 namespace Topic
 {
 	void ShowTopic(LocalUser* user, Channel* chan);
diff --git a/src/coremods/core_user/cmd_user.cpp b/src/coremods/core_user/cmd_user.cpp
@@ -42,17 +42,19 @@ CommandUser::CommandUser(Module* parent)
 CmdResult CommandUser::HandleLocal(LocalUser* user, const Params& parameters)
 {
 	/* A user may only send the USER command once */
+	const auto& newuser = parameters[0];
+	const auto& newreal = parameters[3];
 	if (!(user->connected & User::CONN_USER))
 	{
-		if (!ServerInstance->IsUser(parameters[0]))
+		if (!ServerInstance->IsUser(newuser))
 		{
-			user->WriteNumeric(ERR_INVALIDUSERNAME, name, "Your username is not valid");
+			user->WriteNumeric(ERR_INVALIDUSERNAME, newuser, "Your username is not valid");
 			return CmdResult::FAILURE;
 		}
 		else
 		{
-			user->ChangeRealUser(parameters[0], true);
-			user->ChangeRealName(parameters[3]);
+			user->ChangeRealUser(newuser, true);
+			user->ChangeRealName(newreal);
 			user->connected |= User::CONN_USER;
 		}
 	}
diff --git a/src/modules/m_cloak.cpp b/src/modules/m_cloak.cpp
@@ -33,7 +33,7 @@ class CommandCloak final
 	CloakMethodList& cloakmethods;
 
 	// API for sending a FAIL message.
-	IRCv3::Replies::Note failrpl;
+	IRCv3::Replies::Fail failrpl;
 
 	// API for sending a NOTE message.
 	IRCv3::Replies::Note noterpl;
diff --git a/src/modules/m_ircv3_ctctags.cpp b/src/modules/m_ircv3_ctctags.cpp
@@ -24,6 +24,18 @@
 #include "modules/isupport.h"
 #include "numerichelper.h"
 
+enum class AllowTags
+{
+	// No client tags are allowed.
+	NONE,
+
+	// Only known client tags are allowed.
+	KNOWN,
+
+	// All client tags are allowed.
+	ALL,
+};
+
 class CommandTagMsg final
 	: public Command
 {
@@ -279,8 +291,47 @@ class C2CTags final
 private:
 	Cap::Capability& cap;
 
+	static bool ValidateChannel(LocalUser* user, const std::string& tagvalue)
+	{
+		for (const auto* memb : user->chans)
+		{
+			if (irc::equals(memb->chan->name, tagvalue))
+				return true;
+		}
+		return false;
+	}
+
+	static bool ValidateMessageId(LocalUser* user, const std::string& tagvalue)
+	{
+		// Message IDs MUST NOT start with a colon (:) and MUST NOT contain any
+		// of SPACE, CR, LF.
+		return !tagvalue.empty()
+			&& tagvalue[0] != ':'
+			&& tagvalue.find_first_of(" \n\r") != std::string::npos;
+	}
+
+	static bool ValidateTyping(LocalUser* user, const std::string& tagvalue)
+	{
+		//  A typing notification is represented by a TAGMSG command sent with a
+		// typing tag using the client-only prefix + and possible values of
+		// active, paused, and done.
+		return irc::equals(tagvalue, "active")
+			|| irc::equals(tagvalue, "paused")
+			|| irc::equals(tagvalue, "done");
+	}
+
 public:
-	bool allowclientonlytags;
+	AllowTags allowclientonlytags;
+	insp::flat_map<std::string, std::function<bool(LocalUser*, const std::string&)>, irc::insensitive_swo> knowntags = {
+		{ "+draft/channel-context", ValidateChannel   }, // https://ircv3.net/specs/client-tags/channel-context
+		{ "+draft/react",           ValidateMessageId }, // https://ircv3.net/specs/client-tags/react
+		{ "+draft/reply",           ValidateMessageId }, // https://ircv3.net/specs/client-tags/reply
+		{ "+draft/unreact",         ValidateMessageId }, // https://ircv3.net/specs/client-tags/react
+
+		{ "+reply",                 ValidateMessageId }, // https://ircv3.net/specs/client-tags/reply
+		{ "+typing",                ValidateTyping    }, // https://ircv3.net/specs/client-tags/typing
+	};
+
 	C2CTags(Module* Creator, Cap::Capability& Cap)
 		: ClientProtocol::MessageTagProvider(Creator)
 		, cap(Cap)
@@ -291,14 +342,24 @@ class C2CTags final
 	{
 		// A client-only tag is prefixed with a plus sign (+) and otherwise conforms
 		// to the format specified in IRCv3.2 tags.
-		if (tagname[0] != '+' || tagname.length() < 2 || !allowclientonlytags)
+		if (tagname[0] != '+' || tagname.length() < 2 || allowclientonlytags == AllowTags::NONE)
 			return MOD_RES_PASSTHRU;
 
 		// If the user is local then we check whether they have the message-tags cap
 		// enabled. If not then we reject all client-only tags originating from them.
-		LocalUser* lu = IS_LOCAL(user);
-		if (lu && !cap.IsEnabled(lu))
-			return MOD_RES_DENY;
+		auto* lu = IS_LOCAL(user);
+		if (lu)
+		{
+			if (!cap.IsEnabled(lu))
+				return MOD_RES_DENY; // Cap not enabled.
+
+			if (allowclientonlytags == AllowTags::KNOWN)
+			{
+				auto it = knowntags.find(tagname);
+				if (it == knowntags.end() || !it->second(lu, tagvalue))
+					return MOD_RES_DENY; // Tag not whitelisted.
+			}
+		}
 
 		// Remote users have their client-only tags checked by their local server.
 		return MOD_RES_ALLOW;
@@ -348,13 +409,39 @@ class ModuleIRCv3CTCTags final
 
 	void ReadConfig(ConfigStatus& status) override
 	{
-		c2ctags.allowclientonlytags = ServerInstance->Config->ConfValue("ctctags")->getBool("allowclientonlytags", true);
+		const auto& tag = ServerInstance->Config->ConfValue("ctctags");
+		c2ctags.allowclientonlytags = tag->getEnum("allowclientonlytags", AllowTags::ALL, {
+			{"all",   AllowTags::ALL   },
+			{"known", AllowTags::KNOWN },
+			{"none",  AllowTags::NONE  },
+
+			// Compatibility with v4.9 and older.
+			{"false", AllowTags::NONE },
+			{"no",    AllowTags::NONE },
+			{"off",   AllowTags::NONE },
+			{"on",    AllowTags::ALL  },
+			{"true",  AllowTags::ALL  },
+			{"yes",   AllowTags::ALL  },
+		});
 	}
 
 	void OnBuildISupport(ISupport::TokenMap& tokens) override
 	{
-		if (!c2ctags.allowclientonlytags)
-			tokens["CLIENTTAGDENY"] = "*";
+		switch (c2ctags.allowclientonlytags)
+		{
+			case AllowTags::NONE:
+				tokens["CLIENTTAGDENY"] = "*";
+				break;
+			case AllowTags::KNOWN:
+			{
+				auto& token = tokens["CLIENTTAGDENY"] = "*";
+				for (const auto& [tag, _] : c2ctags.knowntags)
+					token.append(",-").append(tag, 1, std::string::npos);
+				break;
+			}
+			case AllowTags::ALL:
+				break;
+		}
 	}
 
 	ModResult OnUserPreMessage(User* user, MessageTarget& target, MessageDetails& details) override
diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
diff --git a/src/modules/m_spanningtree/servercommand.h b/src/modules/m_spanningtree/servercommand.h
diff --git a/src/modules/m_spanningtree/treeserver.cpp b/src/modules/m_spanningtree/treeserver.cpp
diff --git a/src/users.cpp b/src/users.cpp
diff --git a/win/conanfile.txt b/win/conanfile.txt

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ class Monitor::WriteWatchersWithCap`
`86`	`86`	`, ev(event)`
`87`	`87`	`, sentid(id)`
`88`	`88`	`{`
`89`		`- if (monitorapi)`
	`89`	`+ if (user->IsFullyConnected() && monitorapi)`
`90`	`90`	`monitorapi->ForEachWatcher(user, *this);`
`91`	`91`	`}`
`92`	`92`	`};`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ bool CommandParser::LoopCall(User* user, Command* handler, const CommandBase::Pa`
`61`	`61`	`* for every parameter or parameter pair until there are no more`
`62`	`62`	`* left to parse.`
`63`	`63`	`*/`
	`64`	`+ handler->loopcall = true;`
`64`	`65`	`CommandBase::Params splitparams(parameters);`
`65`	`66`	`while (items1.GetToken(item) && (!usemax \|\| max++ < ServerInstance->Config->MaxTargets))`
`66`	`67`	`{`
`@@ -86,6 +87,7 @@ bool CommandParser::LoopCall(User* user, Command* handler, const CommandBase::Pa`
`86`	`87`	`}`
`87`	`88`	`}`
`88`	`89`	`}`
	`90`	`+ handler->loopcall = false;`
`89`	`91`
`90`	`92`	`return true;`
`91`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -334,6 +334,7 @@ class CoreModChannel final`
`334`	`334`
`335`	`335`	`// Show all members of the channel, including invisible (+i) users`
`336`	`336`	`cmdnames.SendNames(localuser, chan, true);`
	`337`	`+ localuser->WriteNumeric(RPL_ENDOFNAMES, chan->name, "End of /NAMES list.");`
`337`	`338`	`}`
`338`	`339`	`}`
`339`	`340`
Original file line number	Diff line number	Diff line change
`@@ -42,17 +42,19 @@ CommandUser::CommandUser(Module* parent)`
`42`	`42`	`CmdResult CommandUser::HandleLocal(LocalUser* user, const Params& parameters)`
`43`	`43`	`{`
`44`	`44`	`/* A user may only send the USER command once */`
	`45`	`+ const auto& newuser = parameters[0];`
	`46`	`+ const auto& newreal = parameters[3];`
`45`	`47`	`if (!(user->connected & User::CONN_USER))`
`46`	`48`	`{`
`47`		`- if (!ServerInstance->IsUser(parameters[0]))`
	`49`	`+ if (!ServerInstance->IsUser(newuser))`
`48`	`50`	`{`
`49`		`- user->WriteNumeric(ERR_INVALIDUSERNAME, name, "Your username is not valid");`
	`51`	`+ user->WriteNumeric(ERR_INVALIDUSERNAME, newuser, "Your username is not valid");`
`50`	`52`	`return CmdResult::FAILURE;`
`51`	`53`	`}`
`52`	`54`	`else`
`53`	`55`	`{`
`54`		`- user->ChangeRealUser(parameters[0], true);`
`55`		`- user->ChangeRealName(parameters[3]);`
	`56`	`+ user->ChangeRealUser(newuser, true);`
	`57`	`+ user->ChangeRealName(newreal);`
`56`	`58`	`user->connected \|= User::CONN_USER;`
`57`	`59`	`}`
`58`	`60`	`}`