X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_sethost.cpp;h=b97b00d43c290191cff51c6f15c8690952c9b0b0;hb=HEAD;hp=cdcbbde9e6b98a28a280aa92962b0a775f05e231;hpb=b817341e2149af163011cce47605ae17b4f67eeb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_sethost.cpp b/src/modules/m_sethost.cpp
index cdcbbde9e..b97b00d43 100644
--- a/src/modules/m_sethost.cpp
+++ b/src/modules/m_sethost.cpp
@@ -1,58 +1,65 @@
-/*       +------------------------------------+
- *       | 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-2018, 2020-2021 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 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2004, 2006, 2010 Craig Edwards <brain@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"
 
-/* $ModDesc: Provides support for the SETHOST command */
+#include "inspircd.h"
 
 /** Handle /SETHOST
  */
 class CommandSethost : public Command
 {
- private:
-	char* hostmap;
  public:
-	CommandSethost (InspIRCd* Instance, char* hmap) : Command(Instance,"SETHOST","o",1), hostmap(hmap)
+	std::bitset<UCHAR_MAX + 1> hostmap;
+
+	CommandSethost(Module* Creator)
+		: Command(Creator,"SETHOST", 1)
 	{
-		this->source = "m_sethost.so";
-		syntax = "<new-hostname>";
-		TRANSLATE2(TR_TEXT, TR_END);
+		allow_empty_last_param = false;
+		flags_needed = 'o';
+		syntax = "<host>";
 	}
 
-	CmdResult Handle (const std::vector<std::string>& parameters, User *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
-		size_t len = 0;
-		for (std::string::const_iterator x = parameters[0].begin(); x != parameters[0].end(); x++, len++)
+		if (parameters[0].length() > ServerInstance->Config->Limits.MaxHost)
 		{
-			if (!hostmap[(const unsigned char)*x])
-			{
-				user->WriteServ("NOTICE "+std::string(user->nick)+" :*** SETHOST: Invalid characters in hostname");
-				return CMD_FAILURE;
-			}
-		}
-		if (len == 0)
-		{
-			user->WriteServ("NOTICE %s :*** SETHOST: Host must be specified", user->nick);
+			user->WriteNotice("*** SETHOST: Host too long");
 			return CMD_FAILURE;
 		}
-		if (len > 64)
+
+		for (std::string::const_iterator x = parameters[0].begin(); x != parameters[0].end(); x++)
 		{
-			user->WriteServ("NOTICE %s :*** SETHOST: Host too long",user->nick);
-			return CMD_FAILURE;
+			if (!hostmap.test(static_cast<unsigned char>(*x)))
+			{
+				user->WriteNotice("*** SETHOST: Invalid characters in hostname");
+				return CMD_FAILURE;
+			}
 		}
-		if (user->ChangeDisplayedHost(parameters[0].c_str()))
+
+		if (user->ChangeDisplayedHost(parameters[0]))
 		{
-			ServerInstance->SNO->WriteToSnoMask('A', std::string(user->nick)+" used SETHOST to change their displayed host to "+user->dhost);
+			ServerInstance->SNO->WriteGlobalSno('a', user->nick+" used SETHOST to change their displayed host to "+user->GetDisplayedHost());
 			return CMD_SUCCESS;
 		}
 
@@ -63,42 +70,28 @@ class CommandSethost : public Command
 
 class ModuleSetHost : public Module
 {
-	CommandSethost* mycommand;
-	char hostmap[256];
+	CommandSethost cmd;
+
  public:
-	ModuleSetHost(InspIRCd* Me)
-		: Module(Me)
-	{	
-		OnRehash(NULL,"");
-		mycommand = new CommandSethost(ServerInstance, hostmap);
-		ServerInstance->AddCommand(mycommand);
-		Implementation eventlist[] = { I_OnRehash };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
+	ModuleSetHost()
+		: cmd(this)
+	{
 	}
 
-
-	void OnRehash(User* user, const std::string &parameter)
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		ConfigReader Conf(ServerInstance);
-		std::string hmap = Conf.ReadValue("hostname", "charmap", 0);
-
-		if (hmap.empty())
-			hmap = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789";
+		ConfigTag* tag = ServerInstance->Config->ConfValue("hostname");
+		const std::string hmap = tag->getString("charmap", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.-_/0123456789", 1);
 
-		memset(&hostmap, 0, 255);
-		for (std::string::iterator n = hmap.begin(); n != hmap.end(); n++)
-			hostmap[(unsigned char)*n] = 1;
+		cmd.hostmap.reset();
+		for (std::string::const_iterator n = hmap.begin(); n != hmap.end(); n++)
+			cmd.hostmap.set(static_cast<unsigned char>(*n));
 	}
 
-	virtual ~ModuleSetHost()
-	{
-	}
-	
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+		return Version("Adds the /SETHOST command which allows server operators to change their displayed hostname.", VF_VENDOR);
 	}
-	
 };
 
 MODULE_INIT(ModuleSetHost)