]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_messageflood.cpp
Untested! New m_watch that should be hundreds of times faster (im not joking either)
[user/henk/code/inspircd.git] / src / modules / m_messageflood.cpp
index c2fbe671f68125383a49c45651b7fbdae95bf43f..436e578671a1af4876a95bc8e138c5373e584ec9 100644 (file)
@@ -21,11 +21,13 @@ using namespace std;
 #include "users.h"
 #include "channels.h"
 #include "modules.h"
-#include "helperfuncs.h"
+#include "inspircd.h"
 
 /* $ModDesc: Provides channel mode +f (message flood protection) */
 
-class floodsettings
+/** Holds flood settings and state for mode +f
+ */
+class floodsettings : public classbase
 {
  public:
        bool ban;
@@ -38,7 +40,6 @@ class floodsettings
        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)
@@ -47,16 +48,13 @@ class floodsettings
                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;
                }
@@ -67,7 +65,6 @@ class floodsettings
                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;
@@ -83,13 +80,32 @@ class floodsettings
        }
 };
 
+/** 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)
+        {
+               floodsettings* x;
+               if (channel->GetExt("flood",x))
+                       return std::make_pair(true, (x->ban ? "*" : "")+ConvToStr(x->lines)+":"+ConvToStr(x->secs));
+                else
+                        return std::make_pair(false, parameter);
+        }
+
+       bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+       {
+               /* When TS is equal, the alphabetically later one wins */
+               return (their_param < our_param);
+       }
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
+               floodsettings *f;
+
                if (adding)
                {
                        char ndata[MAXBUF];
@@ -125,35 +141,47 @@ class MsgFlood : public ModeHandler
                                int nsecs = atoi(secs);
                                if ((nlines<1) || (nsecs<1))
                                {
-                                       WriteServ(source->fd,"608 %s %s :Invalid flood parameter",source->nick,channel->name);
+                                       source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
                                        parameter = "";
                                        return MODEACTION_DENY;
                                }
                                else
                                {
-                                       if (!channel->GetExt("flood"))
+                                       if (!channel->GetExt("flood", f))
                                        {
                                                parameter = ConvToStr(nlines) + ":" +ConvToStr(nsecs);
                                                floodsettings *f = new floodsettings(ban,nsecs,nlines);
-                                               channel->Extend("flood",(char*)f);
+                                               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)))
+                                               {
+                                                       delete f;
+                                                       floodsettings *f = new floodsettings(ban,nsecs,nlines);
+                                                       parameter = ConvToStr(nlines) + ":" +ConvToStr(nsecs);
+                                                       channel->Shrink("flood");
+                                                       channel->Extend("flood",f);
+                                                       channel->SetModeParam('f', parameter.c_str(), true);
+                                                       return MODEACTION_ALLOW;
+                                               }
+                                       }
                                }
                        }
                        else
                        {
-                               WriteServ(source->fd,"608 %s %s :Invalid flood parameter",source->nick,channel->name);
+                               source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
                                parameter = "";
                                return MODEACTION_DENY;
                        }
                }
                else
                {
-                       if (channel->GetExt("flood"))
+                       if (channel->GetExt("flood", f))
                        {
-                               floodsettings *f = (floodsettings*)channel->GetExt("flood");
                                DELETE(f);
                                channel->Shrink("flood");
                                channel->SetMode('f', false);
@@ -167,25 +195,25 @@ 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);
+               ServerInstance->AddMode(mf, 'f');
        }
        
        void ProcessMessages(userrec* user,chanrec* dest, const std::string &text)
        {
                if (IS_LOCAL(user))
                {
-                       floodsettings *f = (floodsettings*)dest->GetExt("flood");
-                       if (f)
+                       floodsettings *f;
+                       if (dest->GetExt("flood", f))
                        {
                                f->addmessage(user);
                                if (f->shouldkick(user))
@@ -194,19 +222,31 @@ class ModuleMsgFlood : public Module
                                        f->clear(user);
                                        if (f->ban)
                                        {
-                                               char* parameters[3];
+                                               const char* parameters[3];
                                                parameters[0] = dest->name;
                                                parameters[1] = "+b";
                                                parameters[2] = user->MakeWildHost();
-                                               Srv->SendMode(parameters,3,user);
+                                               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);
                                        }
-                                       Srv->KickUser(NULL, user, dest, "Channel flood triggered (mode +f)");
+                                       dest->ServerKickUser(user, "Channel flood triggered (mode +f)", 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)
                {
@@ -214,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)
                {
@@ -224,9 +264,9 @@ class ModuleMsgFlood : public Module
 
        void OnChannelDelete(chanrec* chan)
        {
-               if (chan->GetExt("flood"))
+               floodsettings* f;
+               if (chan->GetExt("flood", f))
                {
-                       floodsettings *f = (floodsettings*)chan->GetExt("flood");
                        DELETE(f);
                        chan->Shrink("flood");
                }
@@ -234,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);
        }
 };
 
@@ -265,7 +301,7 @@ class ModuleMsgFloodFactory : public ModuleFactory
        {
        }
        
-       virtual Module * CreateModule(Server* Me)
+       virtual Module * CreateModule(InspIRCd* Me)
        {
                return new ModuleMsgFlood(Me);
        }