-/* +------------------------------------+
- * | 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 <sadie@witchery.services>
+ * Copyright (C) 2012-2013 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2006-2007 Craig Edwards <brain@inspircd.org>
+ * Copyright (C) 2006 Oliver Lupton <om@inspircd.org>
*
- * 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 <http://www.gnu.org/licenses/>.
*/
-#include "inspircd.h"
-#include "u_listmode.h"
-
-/* $ModDesc: Provides support for the +e channel mode */
-/* $ModDep: ../../include/u_listmode.h */
-/* Written by Om<om@inspircd.org>, 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 = "<mask>";
+ }
};
-
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<std::string, std::string>& 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) || InspIRCd::Match(user->GetFullHost(), maskptr) || (InspIRCd::MatchCIDR(mask, maskptr)))
- {
- // 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) || InspIRCd::Match(user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(mask, it->mask)))
- {
- // 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) || InspIRCd::Match(LM->user->GetFullHost(), it->mask) || (InspIRCd::MatchCIDR(mask, it->mask)))
- {
- // 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);
}
};
projects / user / henk / code / inspircd.git / blobdiff