X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_banexception.cpp;h=2ed17a9144b878a6d34c233bc897f99e43f19362;hb=HEAD;hp=fc7e3db50bfb0aed905b5fd655ab26a56c95a4f9;hpb=517a26252a091eaee0149458a86fc43731bce618;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_banexception.cpp b/src/modules/m_banexception.cpp index fc7e3db50..2ed17a914 100644 --- a/src/modules/m_banexception.cpp +++ b/src/modules/m_banexception.cpp @@ -1,196 +1,112 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2013, 2017-2020 Sadie Powell + * Copyright (C) 2012-2013 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007-2008 Dennis Friis + * Copyright (C) 2006-2007 Craig Edwards + * Copyright (C) 2006 Oliver Lupton * - * 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 . */ -#include "inspircd.h" -#include "u_listmode.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 */ -/* Adapted from m_exception, which was originally based on m_chanprotect and m_silence */ - -// 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 +#include "inspircd.h" +#include "listmode.h" +enum +{ + // From RFC 2812. + RPL_EXCEPTLIST = 348, + RPL_ENDOFEXCEPTLIST = 349 +}; -/** Handles +e channel mode - */ class BanException : public ListModeBase { public: - BanException(InspIRCd* Instance) : ListModeBase(Instance, 'e', "End of Channel Exception List", 348, 349, true) { } + BanException(Module* Creator) + : ListModeBase(Creator, "banexception", 'e', "End of Channel Exception List", RPL_EXCEPTLIST, RPL_ENDOFEXCEPTLIST, true) + { + syntax = ""; + } }; - class ModuleBanException : public Module { - BanException* be; - + BanException be; -public: - ModuleBanException(InspIRCd* Me) : Module(Me) + public: + ModuleBanException() : be(this) { - 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) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - output.append(" EXCEPTS=e"); + tokens["EXCEPTS"] = ConvToStr(be.GetModeChar()); } - virtual int OnCheckExtBan(User *user, Channel *chan, char type) + ModResult OnExtBanCheck(User *user, Channel *chan, char type) CXX11_OVERRIDE { - if (chan != NULL) - { - 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++) - { - if (it->mask[0] != type || it->mask[1] != ':') - continue; - - std::string maskptr = it->mask.substr(2); - - if (InspIRCd::Match(user->GetFullRealHost(), maskptr) || match(user->GetFullHost(), maskptr) || (InspIRCd::Match(mask, maskptr, true))) - { - // They match an entry on the list, so let them pass this. - return 1; - } - } - } + ListModeBase::ModeList* list = be.GetList(chan); + if (!list) + return MOD_RES_PASSTHRU; - return 0; - } - - virtual int OnCheckStringExtBan(const std::string &str, Channel *chan, char type) - { - if (chan != NULL) + for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++) { - modelist *list; - chan->GetExt(be->GetInfoKey(), list); + if (it->mask.length() <= 2 || it->mask[0] != type || it->mask[1] != ':') + continue; - if (!list) - return 0; - for (modelist::iterator it = list->begin(); it != list->end(); it++) + if (chan->CheckBan(user, it->mask.substr(2))) { - if (it->mask[0] != type || it->mask[1] != ':') - continue; - - std::string maskptr = it->mask.substr(2); - if (InspIRCd::Match(str, maskptr)) - return 1; // matches + // They match an entry on the list, so let them pass this. + return MOD_RES_ALLOW; } } - return 0; + return MOD_RES_PASSTHRU; } - virtual int OnCheckBan(User* user, Channel* chan) + ModResult OnCheckChannelBan(User* user, Channel* chan) CXX11_OVERRIDE { - if (chan != NULL) + ListModeBase::ModeList* list = be.GetList(chan); + if (!list) { - 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) || match(user->GetFullHost(), it->mask) || (InspIRCd::Match(mask, it->mask, true))) - { - // They match an entry on the list, so let them in. - return 1; - } - } + // No list, proceed normally + return MOD_RES_PASSTHRU; } - return 0; - } - virtual void OnCleanup(int target_type, void* item) - { - be->DoCleanup(target_type, item); - } - - virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque) - { - be->DoSyncChannel(chan, proto, opaque); - } - - virtual void OnChannelDelete(Channel* chan) - { - be->DoChannelDelete(chan); - } - - virtual void OnRehash(User* user, const std::string ¶m) - { - be->DoRehash(); - } - - virtual const char* OnRequest(Request* request) - { - ListModeRequest* LM = (ListModeRequest*)request; - if (strcmp("LM_CHECKLIST", request->GetId()) == 0) + for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++) { - modelist* list; - LM->chan->GetExt(be->GetInfoKey(), list); - if (list) + if (chan->CheckBan(user, it->mask)) { - 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 (InspIRCd::Match(LM->user->GetFullRealHost(), it->mask) || match(LM->user->GetFullHost(), it->mask) || (InspIRCd::Match(mask, it->mask, true))) - { - // They match an entry - return (char*)it->mask.c_str(); - } - } - return NULL; + // They match an entry on the list, so let them in. + return MOD_RES_ALLOW; } } - return NULL; + return MOD_RES_PASSTHRU; } - virtual Version GetVersion() + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - return Version(1, 2, 0, 3, VF_COMMON | VF_VENDOR, API_VERSION); + be.DoRehash(); } - virtual ~ModuleBanException() + Version GetVersion() CXX11_OVERRIDE { - ServerInstance->Modes->DelMode(be); - delete be; - ServerInstance->Modules->UnpublishInterface("ChannelBanList", this); + return Version("Adds channel mode e (banexception) which allows channel operators to exempt user masks from the b (ban) channel mode.", VF_VENDOR); } };