X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_inviteexception.cpp;h=604c144e4b153ab2927a843d2bb019ffe60ee0f6;hb=HEAD;hp=5776b118b04e3354a62c940e6d079524aec17d4a;hpb=1dc9fc8f1a72993cd7a13ccb4db94e58ed4793a3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp index 5776b118b..604c144e4 100644 --- a/src/modules/m_inviteexception.cpp +++ b/src/modules/m_inviteexception.cpp @@ -1,125 +1,95 @@ -#include -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "mode.h" -#include "helperfuncs.h" -#include "u_listmode.h" - -/* $ModDesc: Provides support for the +I channel mode */ - /* - * Written by Om , April 2005. - * Based on m_exception, which was originally based on m_chanprotect and m_silence + * InspIRCd -- Internet Relay Chat Daemon + * + * 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) 2007 Dennis Friis + * Copyright (C) 2006, 2010 Craig Edwards + * + * 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. * - * The +I channel mode takes a nick!ident@host, glob patterns allowed, - * and if a user matches an entry on the +I list then they can join the channel, - * ignoring if +i is set on the channel + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + +#include "inspircd.h" +#include "listmode.h" + +enum +{ + // From RFC 2812. + RPL_INVEXLIST = 346, + RPL_ENDOFINVEXLIST = 347 +}; + class InviteException : public ListModeBase { public: - InviteException(Server* serv) : ListModeBase(serv, 'I', "End of Channel Invite Exception List", "346", "347", true) { } + InviteException(Module* Creator) + : ListModeBase(Creator, "invex", 'I', "End of Channel Invite Exception List", RPL_INVEXLIST, RPL_ENDOFINVEXLIST, true) + { + syntax = ""; + } }; class ModuleInviteException : public Module { - InviteException* ie; - Server* Srv; - + bool invite_bypass_key; + InviteException ie; public: - ModuleInviteException(Server* serv) : Module(serv) + ModuleInviteException() : ie(this) { - ie = new InviteException(serv); - Srv = serv; - Srv->AddMode(ie, 'I'); } - - virtual void Implements(char* List) - { - ie->DoImplements(List); - List[I_On005Numeric] = List[I_OnCheckInvite] = 1; - } - - virtual void On005Numeric(std::string &output) + + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - output.append(" INVEX=I"); - InsertMode(output, "I", 1); + tokens["INVEX"] = ConvToStr(ie.GetModeChar()); } - - virtual int OnCheckInvite(userrec* user, chanrec* chan) + + ModResult OnCheckInvite(User* user, Channel* chan) CXX11_OVERRIDE { - if(chan != NULL) + ListModeBase::ModeList* list = ie.GetList(chan); + if (list) { - modelist* list = (modelist*)chan->GetExt(ie->GetInfoKey()); - Srv->Log(DEBUG, std::string(user->nick)+" is trying to join "+std::string(chan->name)+", checking for invite exceptions"); - if (list) + for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++) { - for (modelist::iterator it = list->begin(); it != list->end(); it++) + if (chan->CheckBan(user, it->mask)) { - 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; - } + return MOD_RES_ALLOW; } } - // 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 MOD_RES_PASSTHRU; } - virtual void OnCleanup(int target_type, void* item) + ModResult OnCheckKey(User* user, Channel* chan, const std::string& key) CXX11_OVERRIDE { - ie->DoCleanup(target_type, item); + if (invite_bypass_key) + return OnCheckInvite(user, chan); + return MOD_RES_PASSTHRU; } - virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque) + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - ie->DoSyncChannel(chan, proto, opaque); + ie.DoRehash(); + invite_bypass_key = ServerInstance->Config->ConfValue("inviteexception")->getBool("bypasskey", true); } - virtual void OnChannelDelete(chanrec* chan) + Version GetVersion() CXX11_OVERRIDE { - ie->DoChannelDelete(chan); - } - - virtual void OnRehash(const std::string ¶m) - { - ie->DoRehash(); - } - - virtual Version GetVersion() - { - return Version(1, 0, 0, 3, VF_VENDOR | VF_STATIC); + return Version("Adds channel mode I (invex) which allows channel operators to exempt user masks from the i (inviteonly) channel mode.", VF_VENDOR); } }; - -class ModuleInviteExceptionFactory : public ModuleFactory -{ - public: - ModuleInviteExceptionFactory() - { - } - - ~ModuleInviteExceptionFactory() - { - } - - virtual Module * CreateModule(Server* serv) - { - return new ModuleInviteException(serv); - } - -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleInviteExceptionFactory; -} +MODULE_INIT(ModuleInviteException)