X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operchans.cpp;h=0725952699c65a26b425b83c00a601ef7d118ed9;hb=3151d60c1ecc9462e4c335282ee6c31672f45111;hp=ba9a4d79fc4c1784ec51877c33cc057904da8542;hpb=23303627e1c689b825445af20d682c886a800bb6;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_operchans.cpp b/src/modules/m_operchans.cpp
index ba9a4d79f..072595269 100644
--- a/src/modules/m_operchans.cpp
+++ b/src/modules/m_operchans.cpp
@@ -1,103 +1,94 @@
-#include <stdio.h>
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2013, 2018-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) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006, 2010 Craig Edwards <brain@inspircd.org>
+ *
+ * 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 "users.h"
-#include "channels.h"
-#include "modules.h"
 
-/* $ModDesc: Provides support for oper-only chans via the +O channel mode */
+#include "inspircd.h"
 
-Server *Srv;
-	 
+enum
+{
+	// From UnrealIRCd.
+	ERR_CANTJOINOPERSONLY = 520
+};
 
 class ModuleOperChans : public Module
 {
+ private:
+	SimpleChannelModeHandler oc;
+	std::string space;
+	std::string underscore;
+
  public:
 	ModuleOperChans()
+		: oc(this, "operonly", 'O', true)
+		, space(" ")
+		, underscore("_")
 	{
-		Srv = new Server;
-
-		// Add a mode +O for channels with no parameters		
-		Srv->AddExtendedMode('O',MT_CHANNEL,false,0,0);
 	}
-	
-	virtual int OnExtendedMode(userrec* user, void* target, char modechar, int type, bool mode_on, string_list &params)
-	{
-		if ((modechar == 'O') && (type == MT_CHANNEL))
-		{
-			chanrec* chan = (chanrec*)target;
-			
-			if ((Srv->IsUlined(user->nick)) || (Srv->IsUlined(user->server)) || (!strcmp(user->server,"")) || (strchr(user->modes,'o')))
-			{
-				return 1;
-			}
-			else
-			{
-				// eat the mode change, return an error
-				WriteServ(user->fd,"468 %s %s :Only servers and opers may set channel mode +O",user->nick, chan->name);
-				return 0;
-			}
-	
-			// must return 1 to handle the mode!
-			return 1;
-		}
-		
-		return 0;
-	}
-	
-	virtual int OnUserPreJoin(userrec* user, chanrec* chan, const char* cname)
+
+	ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE
 	{
-		if (!strchr(user->modes,'o'))
+		if (chan && chan->IsModeSet(oc) && !user->IsOper())
 		{
-			if (chan)
-			{
-				if (chan->IsCustomModeSet('O'))
-				{
-					WriteServ(user->fd,"520 %s %s :Only IRC operators may join the channel %s (+O is set)",user->nick, chan->name,chan->name);
-					return 1;
-				}
-			}
+			user->WriteNumeric(ERR_CANTJOINOPERSONLY, chan->name, InspIRCd::Format("Only server operators may join %s (+O is set)", chan->name.c_str()));
+			return MOD_RES_DENY;
 		}
-		return 0;
-	}
-	
-    	virtual ~ModuleOperChans()
-	{
-		delete Srv;
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,0,0,0);
+		return MOD_RES_PASSTHRU;
 	}
-	
-	virtual void OnUserConnect(userrec* user)
+
+	ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask) CXX11_OVERRIDE
 	{
-	}
+		// Check whether the entry is an extban.
+		if (mask.length() <= 2 || mask[0] != 'O' || mask[1] != ':')
+			return MOD_RES_PASSTHRU;
 
-};
+		// If the user is not an oper they can't match this.
+		if (!user->IsOper())
+			return MOD_RES_PASSTHRU;
 
+		// Check whether the oper's type matches the ban.
+		const std::string submask = mask.substr(2);
+		if (InspIRCd::Match(user->oper->name, submask))
+			return MOD_RES_DENY;
 
-class ModuleOperChansFactory : public ModuleFactory
-{
- public:
-	ModuleOperChansFactory()
-	{
+		// If the oper's type contains spaces recheck with underscores.
+		std::string opername(user->oper->name);
+		stdalgo::string::replace_all(opername, space, underscore);
+		if (InspIRCd::Match(opername, submask))
+			return MOD_RES_DENY;
+
+		return MOD_RES_PASSTHRU;
 	}
-	
-	~ModuleOperChansFactory()
+
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
+		tokens["EXTBAN"].push_back('O');
 	}
-	
-	virtual Module * CreateModule()
+
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return new ModuleOperChans;
+		return Version("Adds channel mode O (operonly) which prevents non-server operators from joining the channel.", VF_VENDOR);
 	}
-	
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleOperChansFactory;
-}
-
+MODULE_INIT(ModuleOperChans)