Allow banning WebIRC users by their gateway name.

Closes #1857.

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 9ad25e6fbaec626573fe9402a8f08a3bf1f81b02..0759854a246e120ee6978c184dd40627cd28ce9e 100644 (file)
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -332,6 +332,21 @@ class ModuleCgiIRC
                ServerInstance->SNO->EnableSnomask('w', "CGIIRC");
        }
 
+       ModResult OnCheckBan(User* user, Channel*, const std::string& mask) CXX11_OVERRIDE
+       {
+               if (mask.length() <= 2 || mask[0] != 'w' || mask[1] != ':')
+                       return MOD_RES_PASSTHRU;
+
+               const std::string* gateway = cmdwebirc.gateway.get(user);
+               if (!gateway)
+                       return MOD_RES_PASSTHRU;
+
+               if (InspIRCd::Match(*gateway, mask.substr(2)))
+                       return MOD_RES_DENY;
+
+               return MOD_RES_PASSTHRU;
+       }
+
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                std::vector<IdentHost> identhosts;
@@ -516,9 +531,6 @@ class ModuleCgiIRC
 
        void OnWhois(Whois::Context& whois) CXX11_OVERRIDE
        {
-               if (!whois.IsSelfWhois() && !whois.GetSource()->HasPrivPermission("users/auspex"))
-                       return;
-
                // If these fields are not set then the client is not using a gateway.
                const std::string* realhost = cmdwebirc.realhost.get(whois.GetTarget());
                const std::string* realip = cmdwebirc.realip.get(whois.GetTarget());