X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_inviteexception.cpp;h=604c144e4b153ab2927a843d2bb019ffe60ee0f6;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=40c92363a7bbd4eb2204756cd019f11b58beb416;hpb=ff11847cea53bc63b0c489b423a4e4fa6c05184b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp index 40c92363a..604c144e4 100644 --- a/src/modules/m_inviteexception.cpp +++ b/src/modules/m_inviteexception.cpp @@ -1,141 +1,94 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * 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 * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * 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 free but copyrighted software; see - * the file COPYING for details. + * 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 +I channel mode */ -/* $ModDep: ../../include/u_listmode.h */ -/* - * Written by Om , April 2005. - * Based on m_exception, which was originally based on m_chanprotect and m_silence - * - * 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 - * Now supports CIDR and IP addresses -- Brain - */ +#include "inspircd.h" +#include "listmode.h" -class InspIRCd* ServerInstance; +enum +{ + // From RFC 2812. + RPL_INVEXLIST = 346, + RPL_ENDOFINVEXLIST = 347 +}; -/** Handles channel mode +I - */ class InviteException : public ListModeBase { public: - InviteException(InspIRCd* Instance) : ListModeBase(Instance, '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; + bool invite_bypass_key; + InviteException ie; public: - ModuleInviteException(InspIRCd* Me) : Module(Me) - { - ie = new InviteException(ServerInstance); - if (!ServerInstance->Modes->AddMode(ie)) - throw ModuleException("Could not add new modes!"); - ServerInstance->Modules->PublishInterface("ChannelBanList", this); - - ie->DoImplements(this); - Implementation eventlist[] = { I_OnRequest, I_On005Numeric, I_OnCheckInvite }; - ServerInstance->Modules->Attach(eventlist, this, 3); - } - - virtual void On005Numeric(std::string &output) + ModuleInviteException() : ie(this) { - output.append(" INVEX=I"); } - virtual int OnCheckInvite(User* user, Channel* chan) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - if(chan != NULL) - { - modelist* list; - chan->GetExt(ie->GetInfoKey(), list); - if (list) - { - 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; - } - } - } - // or if there wasn't a list, there can't be anyone on it, so we don't need to do anything. - } - - return 0; + tokens["INVEX"] = ConvToStr(ie.GetModeChar()); } - virtual const char* OnRequest(Request* request) + ModResult OnCheckInvite(User* user, Channel* chan) CXX11_OVERRIDE { - ListModeRequest* LM = (ListModeRequest*)request; - if (strcmp("LM_CHECKLIST", request->GetId()) == 0) + ListModeBase::ModeList* list = ie.GetList(chan); + if (list) { - modelist* list; - LM->chan->GetExt(ie->GetInfoKey(), list); - if (list) + for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++) { - 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 (chan->CheckBan(user, it->mask)) { - if (InspIRCd::Match(LM->user->GetFullRealHost(), it->mask) || InspIRCd::Match(LM->user->GetFullHost(), it->mask.c_str()) || (InspIRCd::MatchCIDR(mask, it->mask))) - { - // They match an entry - return it->mask.c_str(); - } + return MOD_RES_ALLOW; } - return NULL; } } - return NULL; - } - - virtual void OnCleanup(int target_type, void* item) - { - ie->DoCleanup(target_type, item); - } - virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque) - { - ie->DoSyncChannel(chan, proto, opaque); - } - - virtual void OnChannelDelete(Channel* chan) - { - ie->DoChannelDelete(chan); + return MOD_RES_PASSTHRU; } - virtual void OnRehash(User* user, const std::string ¶m) + ModResult OnCheckKey(User* user, Channel* chan, const std::string& key) CXX11_OVERRIDE { - ie->DoRehash(); + if (invite_bypass_key) + return OnCheckInvite(user, chan); + return MOD_RES_PASSTHRU; } - virtual Version GetVersion() + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION); + ie.DoRehash(); + invite_bypass_key = ServerInstance->Config->ConfValue("inviteexception")->getBool("bypasskey", true); } - ~ModuleInviteException() + Version GetVersion() CXX11_OVERRIDE { - ServerInstance->Modes->DelMode(ie); - delete ie; - ServerInstance->Modules->UnpublishInterface("ChannelBanList", this); + return Version("Adds channel mode I (invex) which allows channel operators to exempt user masks from the i (inviteonly) channel mode.", VF_VENDOR); } };