X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_inviteexception.cpp;h=604c144e4b153ab2927a843d2bb019ffe60ee0f6;hb=HEAD;hp=0b3621af7606abff054dc85f3d4258044ef5dc04;hpb=6d57bbe05c31c79eaad02fe81cfb9c1ed6b79c58;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_inviteexception.cpp b/src/modules/m_inviteexception.cpp
index 0b3621af7..604c144e4 100644
--- a/src/modules/m_inviteexception.cpp
+++ b/src/modules/m_inviteexception.cpp
@@ -1,114 +1,94 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   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) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006, 2010 Craig Edwards <brain@inspircd.org>
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/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 <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
-#include "u_listmode.h"
-
-/* $ModDesc: Provides support for the +I channel mode */
-/* $ModDep: ../../include/u_listmode.h */
 
-/*
- * Written by Om <om@inspircd.org>, 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, Module* Creator) : ListModeBase(Instance, Creator, '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 = "<mask>";
+	}
 };
 
 class ModuleInviteException : public Module
 {
+	bool invite_bypass_key;
 	InviteException ie;
 public:
-	ModuleInviteException(InspIRCd* Me) : Module(Me), ie(Me, this)
+	ModuleInviteException() : ie(this)
 	{
-		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);
 	}
 
-	void On005Numeric(std::string &output)
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		output.append(" INVEX=I");
+		tokens["INVEX"] = ConvToStr(ie.GetModeChar());
 	}
 
-	ModResult OnCheckInvite(User* user, Channel* chan)
+	ModResult OnCheckInvite(User* user, Channel* chan) CXX11_OVERRIDE
 	{
-		if(chan != NULL)
+		ListModeBase::ModeList* list = ie.GetList(chan);
+		if (list)
 		{
-			modelist* list = ie.extItem.get(chan);
-			if (list)
+			for (ListModeBase::ModeList::iterator it = list->begin(); it != list->end(); it++)
 			{
-				std::string mask = std::string(user->nick) + "!" + user->ident + "@" + user->GetIPString();
-				for (modelist::iterator it = list->begin(); it != list->end(); it++)
+				if (chan->CheckBan(user, it->mask))
 				{
-					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 MOD_RES_DENY;
-					}
+					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 MOD_RES_PASSTHRU;
 	}
 
-	const char* OnRequest(Request* request)
-	{
-		return ie.DoOnRequest(request);
-	}
-
-	void OnCleanup(int target_type, void* item)
-	{
-		ie.DoCleanup(target_type, item);
-	}
-
-	void OnSyncChannel(Channel* chan, Module* proto, void* opaque)
+	ModResult OnCheckKey(User* user, Channel* chan, const std::string& key) CXX11_OVERRIDE
 	{
-		ie.DoSyncChannel(chan, proto, opaque);
+		if (invite_bypass_key)
+			return OnCheckInvite(user, chan);
+		return MOD_RES_PASSTHRU;
 	}
 
-	void OnRehash(User* user)
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ie.DoRehash();
+		invite_bypass_key = ServerInstance->Config->ConfValue("inviteexception")->getBool("bypasskey", true);
 	}
 
-	Version GetVersion()
-	{
-		return Version("$Id$", VF_VENDOR | VF_COMMON, API_VERSION);
-	}
-
-	~ModuleInviteException()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		ServerInstance->Modes->DelMode(&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);
 	}
 };