X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banexception.cpp;h=15c151aa5a086de23a57c85d499a9e76aa9a3357;hb=be609949e3ec2543d6cb16d23240870028732f36;hp=2d350e93849cb9009cc5897864bfd14af1fd8084;hpb=42d5b9571eff06b0c33093dc9118c29f9603fd2b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp index 2d350e938..15c151aa5 100644 --- a/src/modules/m_banexception.cpp +++ b/src/modules/m_banexception.cpp @@ -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 @@ -11,15 +11,8 @@ * --------------------------------------------------- */ -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "mode.h" #include "inspircd.h" #include "u_listmode.h" -#include "wildcard.h" /* $ModDesc: Provides support for the +e channel mode */ /* $ModDep: ../../include/u_listmode.h */ @@ -38,59 +31,110 @@ 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) { - modelist* list; + 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 (InspIRCd::Match(user->GetFullRealHost(), maskptr) || InspIRCd::Match(user->GetFullHost(), maskptr) || (InspIRCd::MatchCIDR(mask, maskptr))) { - 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 (InspIRCd::Match(str, maskptr)) + 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 (InspIRCd::Match(user->GetFullRealHost(), it->mask) || InspIRCd::Match(user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(mask, it->mask))) + { + // They match an entry on the list, so let them in. + return 1; + } + } + } + return 0; } virtual void OnCleanup(int target_type, void* item) @@ -98,52 +142,37 @@ 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 ¶m) + virtual void OnRehash(User* user, const std::string ¶m) { 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) { + return be->DoOnRequest(request); } - - ~ModuleBanExceptionFactory() + + virtual Version GetVersion() { + return Version("$Id$", 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)