X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banexception.cpp;h=e22ada43ded2bd23b8d5eeebcbc3804039173593;hb=bb7d85d51e2d51ac13f335b13dfa1f8e8ba3e23b;hp=862a6e21cf1610a1bcb79baf2923f3f839c65c67;hpb=c47776703ef551ed8eeee336d21da73aae020103;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp index 862a6e21c..e22ada43d 100644 --- a/src/modules/m_banexception.cpp +++ b/src/modules/m_banexception.cpp @@ -1,14 +1,22 @@ -#include -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "mode.h" -#include "helperfuncs.h" +/* +------------------------------------+ + * | Inspire Internet Relay Chat Daemon | + * +------------------------------------+ + * + * InspIRCd: (C) 2002-2008 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. + * + * --------------------------------------------------- + */ + +#include "inspircd.h" #include "u_listmode.h" +#include "wildcard.h" /* $ModDesc: Provides support for the +e channel mode */ +/* $ModDep: ../../include/u_listmode.h */ /* Written by Om, April 2005. */ /* Rewritten to use the listmode utility by Om, December 2005 */ @@ -16,56 +24,118 @@ // The +e channel mode takes a nick!ident@host, glob patterns allowed, // and if a user matches an entry on the +e list then they can join the channel, overriding any (+b) bans set on them +// Now supports CIDR and IP addresses -- Brain + +/** Handles +e channel mode + */ class BanException : public ListModeBase { public: - BanException(Server* serv) : ListModeBase(serv, 'e', "End of Channel Exception List", "348", "349") { } + BanException(InspIRCd* Instance) : ListModeBase(Instance, 'e', "End of Channel Exception List", 348, 349, true) { } }; class ModuleBanException : public Module { BanException* be; - Server* Srv; + public: - ModuleBanException(Server* serv) : Module(serv) - { - be = new BanException(serv); - Srv = serv; - } - - virtual void Implements(char* List) + ModuleBanException(InspIRCd* Me) : Module(Me) { - be->DoImplements(List); - List[I_On005Numeric] = List[I_OnCheckBan] = 1; + be = new BanException(ServerInstance); + 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 On005Numeric(std::string &output) { output.append(" EXCEPTS=e"); - InsertMode(output, "e", 1); } - virtual int OnCheckBan(userrec* user, chanrec* chan) + virtual int OnCheckExtBan(User *user, Channel *chan, char type) { - if(chan != NULL) + if (chan != NULL) { - modelist* list = (modelist*)chan->GetExt(be->GetInfoKey()); - Srv->Log(DEBUG, std::string(user->nick)+" is trying to join "+std::string(chan->name)+", checking for ban exceptions"); - - if(list) + modelist *list; + chan->GetExt(be->GetInfoKey(), 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++) { - for (modelist::iterator it = list->begin(); it != list->end(); it++) - if(Srv->MatchText(user->GetFullRealHost(), it->mask) || Srv->MatchText(user->GetFullHost(), it->mask)) - // They match an entry on the list, so let them in. - return 1; + 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))) + { + // 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 } - // or if there wasn't a list, there can't be anyone on it, so we don't need to do anything. } - return 0; + + 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; + } + + 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; } virtual void OnCleanup(int target_type, void* item) @@ -73,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(const std::string ¶m) + virtual void OnRehash(User* user, const std::string ¶m) { be->DoRehash(); } - - virtual Version GetVersion() - { - return Version(1, 0, 0, 3, VF_STATIC | VF_VENDOR); - } - - virtual ~ModuleBanException() - { - 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(Server* serv) + + virtual ~ModuleBanException() { - return new ModuleBanException(serv); + ServerInstance->Modes->DelMode(be); + delete be; + ServerInstance->Modules->UnpublishInterface("ChannelBanList", this); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleBanExceptionFactory; -} +MODULE_INIT(ModuleBanException)