]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_banexception.cpp
Add support for ban exceptions on non-user extbans (e.g, +be r:*lol* r:lol?is?gay...
[user/henk/code/inspircd.git] / src / modules / m_banexception.cpp
index 2d350e93849cb9009cc5897864bfd14af1fd8084..e22ada43ded2bd23b8d5eeebcbc3804039173593 100644 (file)
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
  * ---------------------------------------------------
  */
 
-#include <string>
-#include <vector>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "mode.h"
 #include "inspircd.h"
 #include "u_listmode.h"
 #include "wildcard.h"
 class BanException : public ListModeBase
 {
  public:
-       BanException(InspIRCd* Instance) : ListModeBase(Instance, 'e', "End of Channel Exception List", "348", "349", true) { }
+       BanException(InspIRCd* Instance) : ListModeBase(Instance, 'e', "End of Channel Exception List", 348, 349, true) { }
 };
 
 
 class ModuleBanException : public Module
 {
        BanException* be;
-       
+
 
 public:
-       ModuleBanException(InspIRCd* Me)
-       : Module::Module(Me)
+       ModuleBanException(InspIRCd* Me) : Module(Me)
        {
                be = new BanException(ServerInstance);
-               if (!ServerInstance->AddMode(be, 'e'))
+               if (!ServerInstance->Modes->AddMode(be))
                        throw ModuleException("Could not add new modes!");
+               ServerInstance->Modules->PublishInterface("ChannelBanList", this);
+
+               be->DoImplements(this);
+               Implementation list[] = { I_OnRehash, I_OnRequest, I_On005Numeric, I_OnCheckBan, I_OnCheckExtBan, I_OnCheckStringExtBan };
+               Me->Modules->Attach(list, this, 6);
+
        }
-       
-       virtual void Implements(char* List)
-       {
-               be->DoImplements(List);
-               List[I_On005Numeric] = List[I_OnCheckBan] = 1;
-       }
-       
+
        virtual void On005Numeric(std::string &output)
        {
                output.append(" EXCEPTS=e");
        }
 
-       virtual int OnCheckBan(userrec* user, chanrec* chan)
+       virtual int OnCheckExtBan(User *user, Channel *chan, char type)
        {
                if (chan != NULL)
                {
-                       modelistlist;
+                       modelist *list;
                        chan->GetExt(be->GetInfoKey(), list);
-                       
-                       if (list)
+
+                       if (!list)
+                               return 0;
+
+                       std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString();
+                       for (modelist::iterator it = list->begin(); it != list->end(); it++)
                        {
-                               char mask[MAXBUF];
-                               snprintf(mask, MAXBUF, "%s!%s@%s", user->nick, user->ident, user->GetIPString());
-                               for (modelist::iterator it = list->begin(); it != list->end(); it++)
+                               if (it->mask[0] != type || it->mask[1] != ':')
+                                       continue;
+
+                               std::string maskptr = it->mask.substr(2);
+
+                               if (match(user->GetFullRealHost(), maskptr) || match(user->GetFullHost(), maskptr) || (match(mask, maskptr, true)))
                                {
-                                       if (ServerInstance->MatchText(user->GetFullRealHost(), it->mask) || ServerInstance->MatchText(user->GetFullHost(), it->mask) || (match(mask, it->mask.c_str(), true)))
-                                       {
-                                               // They match an entry on the list, so let them in.
-                                               return 1;
-                                       }
+                                       // They match an entry on the list, so let them pass this.
+                                       return 1;
                                }
+                       }
+               }
+
+               return 0;
+       }
+
+       virtual int OnCheckStringExtBan(const std::string &str, Channel *chan, char type)
+       {
+               if (chan != NULL)
+               {
+                       modelist *list;
+                       chan->GetExt(be->GetInfoKey(), list);
+
+                       if (!list)
+                               return 0;
+                       for (modelist::iterator it = list->begin(); it != list->end(); it++)
+                       {
+                               if (it->mask[0] != type || it->mask[1] != ':')
+                                       continue;
+
+                               std::string maskptr = it->mask.substr(2);
+                               if (match(maskptr, str))
+                                       return 1; // matches
+                       }
+               }
+
+               return 0;
+       }
+
+       virtual int OnCheckBan(User* user, Channel* chan)
+       {
+               if (chan != NULL)
+               {
+                       modelist* list;
+                       chan->GetExt(be->GetInfoKey(), list);
+
+                       if (!list)
+                       {
+                               // No list, proceed normally
                                return 0;
                        }
-                       // or if there wasn't a list, there can't be anyone on it, so we don't need to do anything.
+
+                       std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString();
+                       for (modelist::iterator it = list->begin(); it != list->end(); it++)
+                       {
+                               if (match(user->GetFullRealHost(), it->mask) || match(user->GetFullHost(), it->mask) || (match(mask, it->mask, true)))
+                               {
+                                       // They match an entry on the list, so let them in.
+                                       return 1;
+                               }
+                       }
                }
-               return 0;       
+               return 0;
        }
 
        virtual void OnCleanup(int target_type, void* item)
@@ -98,52 +143,56 @@ public:
                be->DoCleanup(target_type, item);
        }
 
-       virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque)
+       virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
        {
                be->DoSyncChannel(chan, proto, opaque);
        }
 
-       virtual void OnChannelDelete(chanrec* chan)
+       virtual void OnChannelDelete(Channel* chan)
        {
                be->DoChannelDelete(chan);
        }
 
-       virtual void OnRehash(userrec* user, const std::string &param)
+       virtual void OnRehash(User* user, const std::string &param)
        {
                be->DoRehash();
        }
-       
-       virtual Version GetVersion()
-       {
-               return Version(1, 1, 0, 3, VF_COMMON | VF_VENDOR, API_VERSION);
-       }
-       
-       virtual ~ModuleBanException()
-       {
-               ServerInstance->Modes->DelMode(be);
-               DELETE(be);     
-       }
-};
 
-class ModuleBanExceptionFactory : public ModuleFactory
-{
- public:
-       ModuleBanExceptionFactory()
+       virtual const char* OnRequest(Request* request)
        {
+               ListModeRequest* LM = (ListModeRequest*)request;
+               if (strcmp("LM_CHECKLIST", request->GetId()) == 0)
+               {
+                       modelist* list;
+                       LM->chan->GetExt(be->GetInfoKey(), list);
+                       if (list)
+                       {
+                               std::string mask = std::string(LM->user->nick) + "!" + LM->user->ident + "@" + LM->user->GetIPString();
+                               for (modelist::iterator it = list->begin(); it != list->end(); it++)
+                               {
+                                       if (match(LM->user->GetFullRealHost(), it->mask) || match(LM->user->GetFullHost(), it->mask) || (match(mask, it->mask, true)))
+                                       {
+                                               // They match an entry
+                                               return (char*)it->mask.c_str();
+                                       }
+                               }
+                               return NULL;
+                       }
+               }
+               return NULL;
        }
-       
-       ~ModuleBanExceptionFactory()
+
+       virtual Version GetVersion()
        {
+               return Version(1, 2, 0, 3, VF_COMMON | VF_VENDOR, API_VERSION);
        }
-       
-       virtual Module* CreateModule(InspIRCd* Me)
+
+       virtual ~ModuleBanException()
        {
-               return new ModuleBanException(Me);
+               ServerInstance->Modes->DelMode(be);
+               delete be;
+               ServerInstance->Modules->UnpublishInterface("ChannelBanList", this);
        }
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleBanExceptionFactory;
-}
+MODULE_INIT(ModuleBanException)