]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_messageflood.cpp
Now really add +f to <options:chanopsexempt>. Previous add was m_chanfilter (+g).
[user/henk/code/inspircd.git] / src / modules / m_messageflood.cpp
index 53c9500db44901f6682298faa0fd058cbb2b95c8..6f3beb5125593ac3149bed117baf5c1f0b969498 100644 (file)
@@ -2,30 +2,26 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
 #include <stdio.h>
 #include <map>
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
 #include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +f (message flood protection) */
 
+/** Holds flood settings and state for mode +f
+ */
 class floodsettings : public classbase
 {
  public:
@@ -39,7 +35,6 @@ class floodsettings : public classbase
        floodsettings(bool a, int b, int c) : ban(a), secs(b), lines(c)
        {
                reset = time(NULL) + secs;
-               log(DEBUG,"Create new floodsettings: %lu %lu",time(NULL),reset);
        };
 
        void addmessage(userrec* who)
@@ -48,16 +43,13 @@ class floodsettings : public classbase
                if (iter != counters.end())
                {
                        iter->second++;
-                       log(DEBUG,"Count for %s is now %d",who->nick,iter->second);
                }
                else
                {
                        counters[who] = 1;
-                       log(DEBUG,"Count for %s is now *1*",who->nick);
                }
                if (time(NULL) > reset)
                {
-                       log(DEBUG,"floodsettings timer Resetting.");
                        counters.clear();
                        reset = time(NULL) + secs;
                }
@@ -68,7 +60,6 @@ class floodsettings : public classbase
                std::map<userrec*,int>::iterator iter = counters.find(who);
                if (iter != counters.end())
                {
-                       log(DEBUG,"should kick? %d, %d",iter->second,this->lines);
                        return (iter->second >= this->lines);
                }
                else return false;
@@ -84,10 +75,12 @@ class floodsettings : public classbase
        }
 };
 
+/** Handles channel mode +f
+ */
 class MsgFlood : public ModeHandler
 {
  public:
-       MsgFlood() : ModeHandler('f', 1, 0, false, MODETYPE_CHANNEL, false) { }
+       MsgFlood(InspIRCd* Instance) : ModeHandler(Instance, 'f', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
         ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
         {
@@ -151,13 +144,26 @@ class MsgFlood : public ModeHandler
                                {
                                        if (!channel->GetExt("flood", f))
                                        {
-                                               parameter = ConvToStr(nlines) + ":" +ConvToStr(nsecs);
+                                               parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs);
                                                floodsettings *f = new floodsettings(ban,nsecs,nlines);
                                                channel->Extend("flood",f);
                                                channel->SetMode('f', true);
                                                channel->SetModeParam('f', parameter.c_str(), true);
                                                return MODEACTION_ALLOW;
                                        }
+                                       else
+                                       {
+                                               if (((nlines != f->lines) || (nsecs != f->secs)) && ((nsecs > 0) && (nlines > 0)) || (ban != f->ban))
+                                               {
+                                                       delete f;
+                                                       floodsettings *f = new floodsettings(ban,nsecs,nlines);
+                                                       parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs);
+                                                       channel->Shrink("flood");
+                                                       channel->Extend("flood",f);
+                                                       channel->SetModeParam('f', parameter.c_str(), true);
+                                                       return MODEACTION_ALLOW;
+                                               }
+                                       }
                                }
                        }
                        else
@@ -184,58 +190,63 @@ class MsgFlood : public ModeHandler
 
 class ModuleMsgFlood : public Module
 {
-       Server *Srv;
+       
        MsgFlood* mf;
        
  public:
  
-       ModuleMsgFlood(Server* Me)
+       ModuleMsgFlood(InspIRCd* Me)
                : Module::Module(Me)
        {
-               Srv = Me;
-               mf = new MsgFlood();
-               Srv->AddMode(mf, 'f');
+               
+               mf = new MsgFlood(ServerInstance);
+               if (!ServerInstance->AddMode(mf, 'f'))
+                       throw ModuleException("Could not add new modes!");
        }
        
        void ProcessMessages(userrec* user,chanrec* dest, const std::string &text)
        {
-               if (IS_LOCAL(user))
+               if (!IS_LOCAL(user) || CHANOPS_EXEMPT(ServerInstance, 'f') && dest->GetStatus(user) == STATUS_OP)
                {
-                       floodsettings *f;
-                       if (dest->GetExt("flood", f))
+                       return;
+               }
+
+               floodsettings *f;
+               if (dest->GetExt("flood", f))
+               {
+                       f->addmessage(user);
+                       if (f->shouldkick(user))
                        {
-                               f->addmessage(user);
-                               if (f->shouldkick(user))
+                               /* Youre outttta here! */
+                               f->clear(user);
+                               if (f->ban)
                                {
-                                       /* Youre outttta here! */
-                                       f->clear(user);
-                                       if (f->ban)
-                                       {
-                                               const char* parameters[3];
-                                               parameters[0] = dest->name;
-                                               parameters[1] = "+b";
-                                               parameters[2] = user->MakeWildHost();
-                                               Srv->SendMode(parameters,3,user);
-                                               std::deque<std::string> n;
-                                               /* Propogate the ban to other servers.
-                                                * We dont know what protocol we may be using,
-                                                * so this event is picked up by our protocol
-                                                * module and formed into a ban command that
-                                                * suits the protocol in use.
-                                                */
-                                               n.push_back(dest->name);
-                                               n.push_back("+b");
-                                               n.push_back(user->MakeWildHost());
-                                               Event rmode((char *)&n, NULL, "send_mode");
-                                               rmode.Send();
-                                       }
-                                       dest->ServerKickUser(user, "Channel flood triggered (mode +f)", true);
+                                       const char* parameters[3];
+                                       parameters[0] = dest->name;
+                                       parameters[1] = "+b";
+                                       parameters[2] = user->MakeWildHost();
+                                       ServerInstance->SendMode(parameters,3,user);
+                                       std::deque<std::string> n;
+                                       /* Propogate the ban to other servers.
+                                        * We dont know what protocol we may be using,
+                                        * so this event is picked up by our protocol
+                                        * module and formed into a ban command that
+                                        * suits the protocol in use.
+                                        */
+                                       n.push_back(dest->name);
+                                       n.push_back("+b");
+                                       n.push_back(user->MakeWildHost());
+                                       Event rmode((char *)&n, NULL, "send_mode");
+                                       rmode.Send(ServerInstance);
                                }
+                               char kickmessage[MAXBUF];
+                               snprintf(kickmessage, MAXBUF, "Channel flood triggered (limit is %d lines in %d secs)", f->lines, f->secs);
+                               dest->ServerKickUser(user, kickmessage, true);
                        }
                }
        }
 
-       virtual void OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status)
+       virtual void OnUserMessage(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
        {
                if (target_type == TYPE_CHANNEL)
                {
@@ -243,7 +254,7 @@ class ModuleMsgFlood : public Module
                }
        }
 
-       virtual void OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status)
+       virtual void OnUserNotice(userrec* user, void* dest, int target_type, const std::string &text, char status, const CUList &exempt_list)
        {
                if (target_type == TYPE_CHANNEL)
                {
@@ -263,22 +274,18 @@ class ModuleMsgFlood : public Module
 
        void Implements(char* List)
        {
-               List[I_On005Numeric] = List[I_OnChannelDelete] = List[I_OnUserNotice] = List[I_OnUserMessage] = 1;
-       }
-
-       virtual void On005Numeric(std::string &output)
-       {
-               InsertMode(output, "f", 3);
+               List[I_OnChannelDelete] = List[I_OnUserNotice] = List[I_OnUserMessage] = 1;
        }
 
        virtual ~ModuleMsgFlood()
        {
+               ServerInstance->Modes->DelMode(mf);
                DELETE(mf);
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };
 
@@ -294,7 +301,7 @@ class ModuleMsgFloodFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleMsgFlood(Me);
        }