Fix sending Q-line notices to snomask `a` instead of snomask `x`.

[user/henk/code/inspircd.git] / src / coremods / core_xline / core_xline.cpp

diff --git a/src/coremods/core_xline/core_xline.cpp b/src/coremods/core_xline/core_xline.cpp
index d6c804748559d93678ec7f1eafca5665fc0bef8e..32c1dea3f0c4b2f4cf2449e4be724d9e5c36b890 100644 (file)
--- a/src/coremods/core_xline/core_xline.cpp
+++ b/src/coremods/core_xline/core_xline.cpp
@@ -1,7 +1,11 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2014 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ *   Copyright (C) 2019 Matt Schatz <genius3000@g3k.solutions>
+ *   Copyright (C) 2018-2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2017-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2014, 2016 Attila Molnar <attilamolnar@hush.com>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -28,7 +32,7 @@ bool InsaneBan::MatchesEveryone(const std::string& mask, MatcherBase& test, User
        if (insane->getBool(confkey))
                return false;
 
-       float itrigger = insane->getFloat("trigger", 95.5);
+       float itrigger = insane->getFloat("trigger", 95.5, 0.0, 100.0);
 
        long matches = test.Run(mask);
 
@@ -38,7 +42,7 @@ bool InsaneBan::MatchesEveryone(const std::string& mask, MatcherBase& test, User
        float percent = ((float)matches / (float)ServerInstance->Users->GetUsers().size()) * 100;
        if (percent > itrigger)
        {
-               ServerInstance->SNO->WriteToSnoMask('a', "\2WARNING\2: %s tried to set a %s-line mask of %s, which covers %.2f%% of the network!", user->nick.c_str(), bantype, mask.c_str(), percent);
+               ServerInstance->SNO->WriteToSnoMask('a', "\002WARNING\002: %s tried to set a %s-line mask of %s, which covers %.2f%% of the network!", user->nick.c_str(), bantype, mask.c_str(), percent);
                return true;
        }
        return false;
@@ -64,18 +68,37 @@ class CoreModXLine : public Module
        {
        }
 
+       void OnSetUserIP(LocalUser* user) CXX11_OVERRIDE
+       {
+               if (user->quitting)
+                       return;
+
+               user->exempt = (ServerInstance->XLines->MatchesLine("E", user) != NULL);
+               user->CheckLines(true);
+       }
+
+       void OnChangeRealHost(User* user, const std::string& newhost) CXX11_OVERRIDE
+       {
+               LocalUser* luser = IS_LOCAL(user);
+               if (!luser || luser->quitting)
+                       return;
+
+               luser->exempt = (ServerInstance->XLines->MatchesLine("E", user) != NULL);
+               luser->CheckLines(false);
+       }
+
        ModResult OnUserPreNick(LocalUser* user, const std::string& newnick) CXX11_OVERRIDE
        {
-               // Check Q-Lines (for local nick changes only, remote servers have our Q-Lines to enforce themselves)
+               // Check Q-lines (for local nick changes only, remote servers have our Q-lines to enforce themselves)
 
                XLine* xline = ServerInstance->XLines->MatchesLine("Q", newnick);
                if (!xline)
                        return MOD_RES_PASSTHRU; // No match
 
-               // A Q-Line matched the new nick, tell opers if the user is registered
+               // A Q-line matched the new nick, tell opers if the user is registered
                if (user->registered == REG_ALL)
                {
-                       ServerInstance->SNO->WriteGlobalSno('a', "Q-Lined nickname %s from %s: %s",
+                       ServerInstance->SNO->WriteGlobalSno('x', "Q-lined nickname %s from %s: %s",
                                newnick.c_str(), user->GetFullRealHost().c_str(), xline->reason.c_str());
                }
 
@@ -84,6 +107,14 @@ class CoreModXLine : public Module
                return MOD_RES_DENY;
        }
 
+       void OnGarbageCollect() CXX11_OVERRIDE
+       {
+               // HACK: ELines are not expired properly at the moment but it can't be fixed
+               // as the XLine system is a spaghetti nightmare. Instead we skip over expired
+               // ELines in XLineManager::CheckELines() and expire them here instead.
+               ServerInstance->XLines->GetAll("E");
+       }
+
        Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides the ELINE, GLINE, KLINE, QLINE, and ZLINE commands", VF_VENDOR|VF_CORE);