]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_joinflood.cpp
Fix an extremely low risk crash bug in m_connectban.
[user/henk/code/inspircd.git] / src / modules / m_joinflood.cpp
index b5cf0c02cab8cdd43659233dde5514cb784dbe9c..0c68da1fb42445433e7777b1ef75cfe0d1190aab 100644 (file)
@@ -1,42 +1,45 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2006-2007 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * 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
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides channel mode +j (join flood protection) */
 
 /** Holds settings and state associated with channel mode +j
  */
-class joinfloodsettings : public classbase
+class joinfloodsettings
 {
  public:
-
        int secs;
        int joins;
        time_t reset;
        time_t unlocktime;
        int counter;
        bool locked;
-       InspIRCd* ServerInstance;
-
-       joinfloodsettings() : secs(0), joins(0) {};
 
        joinfloodsettings(int b, int c) : secs(b), joins(c)
        {
-               reset = time(NULL) + secs;
+               reset = ServerInstance->Time() + secs;
                counter = 0;
                locked = false;
        };
@@ -44,10 +47,10 @@ class joinfloodsettings : public classbase
        void addjoin()
        {
                counter++;
-               if (time(NULL) > reset)
+               if (ServerInstance->Time() > reset)
                {
                        counter = 0;
-                       reset = time(NULL) + secs;
+                       reset = ServerInstance->Time() + secs;
                }
        }
 
@@ -65,7 +68,7 @@ class joinfloodsettings : public classbase
        {
                if (locked)
                {
-                       if (time(NULL) > unlocktime)
+                       if (ServerInstance->Time() > unlocktime)
                        {
                                locked = false;
                                return false;
@@ -81,7 +84,7 @@ class joinfloodsettings : public classbase
        void lock()
        {
                locked = true;
-               unlocktime = time(NULL) + 60;
+               unlocktime = ServerInstance->Time() + 60;
        }
 
 };
@@ -91,27 +94,12 @@ class joinfloodsettings : public classbase
 class JoinFlood : public ModeHandler
 {
  public:
-       JoinFlood(InspIRCd* Instance) : ModeHandler(Instance, 'j', 1, 0, false, MODETYPE_CHANNEL, false) { }
+       SimpleExtItem<joinfloodsettings> ext;
+       JoinFlood(Module* Creator) : ModeHandler(Creator, "joinflood", 'j', PARAM_SETONLY, MODETYPE_CHANNEL),
+               ext("joinflood", Creator) { }
 
-       ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
-               joinfloodsettings* x;
-               if (channel->GetExt("joinflood",x))
-                       return std::make_pair(true, ConvToStr(x->joins)+":"+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)
-       {
-               joinfloodsettings* dummy;
-
                if (adding)
                {
                        char ndata[MAXBUF];
@@ -138,19 +126,19 @@ class JoinFlood : public ModeHandler
                                int nsecs = atoi(secs);
                                if ((njoins<1) || (nsecs<1))
                                {
-                                       source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
+                                       source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
                                        parameter.clear();
                                        return MODEACTION_DENY;
                                }
                                else
                                {
-                                       if (!channel->GetExt("joinflood", dummy))
+                                       joinfloodsettings* f = ext.get(channel);
+                                       if (!f)
                                        {
                                                parameter = ConvToStr(njoins) + ":" +ConvToStr(nsecs);
-                                               joinfloodsettings *f = new joinfloodsettings(nsecs,njoins);
-                                               channel->Extend("joinflood", f);
-                                               channel->SetMode('j', true);
-                                               channel->SetModeParam('j', parameter.c_str(), true);
+                                               f = new joinfloodsettings(nsecs, njoins);
+                                               ext.set(channel, f);
+                                               channel->SetModeParam('j', parameter);
                                                return MODEACTION_ALLOW;
                                        }
                                        else
@@ -167,14 +155,9 @@ class JoinFlood : public ModeHandler
                                                        // new mode param, replace old with new
                                                        if ((nsecs > 0) && (njoins > 0))
                                                        {
-                                                               joinfloodsettings* f;
-                                                               channel->GetExt("joinflood", f);
-                                                               delete f;
-                                                               f = new joinfloodsettings(nsecs,njoins);
-                                                               channel->Shrink("joinflood");
-                                                               channel->Extend("joinflood", f);
-                                                               channel->SetModeParam('j', cur_param.c_str(), false);
-                                                               channel->SetModeParam('j', parameter.c_str(), true);
+                                                               f = new joinfloodsettings(nsecs, njoins);
+                                                               ext.set(channel, f);
+                                                               channel->SetModeParam('j', parameter);
                                                                return MODEACTION_ALLOW;
                                                        }
                                                        else
@@ -187,19 +170,17 @@ class JoinFlood : public ModeHandler
                        }
                        else
                        {
-                               source->WriteServ("608 %s %s :Invalid flood parameter",source->nick,channel->name);
+                               source->WriteNumeric(608, "%s %s :Invalid flood parameter",source->nick.c_str(),channel->name.c_str());
                                return MODEACTION_DENY;
                        }
                }
                else
                {
-                       if (channel->GetExt("joinflood", dummy))
+                       joinfloodsettings* f = ext.get(channel);
+                       if (f)
                        {
-                               joinfloodsettings *f;
-                               channel->GetExt("joinflood", f);
-                               DELETE(f);
-                               channel->Shrink("joinflood");
-                               channel->SetMode('j', false);
+                               ext.unset(channel);
+                               channel->SetModeParam('j', "");
                                return MODEACTION_ALLOW;
                        }
                }
@@ -209,101 +190,67 @@ class JoinFlood : public ModeHandler
 
 class ModuleJoinFlood : public Module
 {
-       
-       JoinFlood* jf;
-       
+
+       JoinFlood jf;
+
  public:
-       ModuleJoinFlood(InspIRCd* Me)
-               : Module(Me)
+
+       ModuleJoinFlood()
+               : jf(this)
        {
-               
-               jf = new JoinFlood(ServerInstance);
-               if (!ServerInstance->AddMode(jf, 'j'))
-                       throw ModuleException("Could not add new modes!");
        }
-       
-       virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname, std::string &privs)
+
+       void init()
+       {
+               ServerInstance->Modules->AddService(jf);
+               ServerInstance->Modules->AddService(jf.ext);
+               Implementation eventlist[] = { I_OnUserPreJoin, I_OnUserJoin };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+       }
+
+       ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
                if (chan)
                {
-                       joinfloodsettings *f;
-                       if (chan->GetExt("joinflood", f))
+                       joinfloodsettings *f = jf.ext.get(chan);
+                       if (f && f->islocked())
                        {
-                               if (f->islocked())
-                               {
-                                       user->WriteServ("609 %s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick,chan->name);
-                                       return 1;
-                               }
+                               user->WriteNumeric(609, "%s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick.c_str(),chan->name.c_str());
+                               return MOD_RES_DENY;
                        }
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent)
+       void OnUserJoin(Membership* memb, bool sync, bool created, CUList& excepts)
        {
-               joinfloodsettings *f;
-               if (channel->GetExt("joinflood",f))
+               /* We arent interested in JOIN events caused by a network burst */
+               if (sync)
+                       return;
+
+               joinfloodsettings *f = jf.ext.get(memb->chan);
+
+               /* But all others are OK */
+               if (f)
                {
                        f->addjoin();
                        if (f->shouldlock())
                        {
                                f->clear();
                                f->lock();
-                               channel->WriteChannelWithServ((char*)ServerInstance->Config->ServerName, "NOTICE %s :This channel has been closed to new users for 60 seconds because there have been more than %d joins in %d seconds.", channel->name, f->joins, f->secs);
+                               memb->chan->WriteChannelWithServ((char*)ServerInstance->Config->ServerName.c_str(), "NOTICE %s :This channel has been closed to new users for 60 seconds because there have been more than %d joins in %d seconds.", memb->chan->name.c_str(), f->joins, f->secs);
                        }
                }
        }
 
-       void OnChannelDelete(chanrec* chan)
+       ~ModuleJoinFlood()
        {
-               joinfloodsettings *f;
-               if (chan->GetExt("joinflood",f))
-               {
-                       DELETE(f);
-                       chan->Shrink("joinflood");
-               }
-       }
-
-       void Implements(char* List)
-       {
-               List[I_OnChannelDelete] = List[I_OnUserPreJoin] = List[I_OnUserJoin] = 1;
        }
 
-       virtual ~ModuleJoinFlood()
+       Version GetVersion()
        {
-               ServerInstance->Modes->DelMode(jf);
-               DELETE(jf);
-       }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides channel mode +j (join flood protection)", VF_VENDOR);
        }
 };
 
-
-class ModuleJoinFloodFactory : public ModuleFactory
-{
- public:
-       ModuleJoinFloodFactory()
-       {
-       }
-       
-       ~ModuleJoinFloodFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleJoinFlood(Me);
-       }
-       
-};
-
-
-extern "C" DllExport void * init_module( void )
-{
-       return new ModuleJoinFloodFactory;
-}
-
+MODULE_INIT(ModuleJoinFlood)