X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_userip.cpp;h=838e129c13e529751e0952364591c29c332da1ff;hb=6214094a84f33ea80af4dac88dd1b82bd59a0b5c;hp=5a56fe576656065cce5c88c0582e959ea173f97a;hpb=2016dcbbe1dd34879179a0d72d1626c56bbbee2e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 5a56fe576..838e129c1 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -1,112 +1,104 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2013, 2017-2018 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2012-2014, 2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2009 Uli Schlachter <psychon@inspircd.org>
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2009 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007-2008 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2007 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 <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
-#include "inspircd.h"
 
-/* $ModDesc: Provides support for USERIP command */
+#include "inspircd.h"
 
 /** Handle /USERIP
  */
-class cmd_userip : public command_t
+class CommandUserip : public Command
 {
  public:
-	cmd_userip (InspIRCd* Instance) : command_t(Instance,"USERIP", 'o', 1)
+	CommandUserip(Module* Creator) : Command(Creator,"USERIP", 1)
 	{
-		this->source = "m_userip.so";
-		syntax = "<nick>{,<nick>}";
+		syntax = "<nick> [<nick>]+";
 	}
 
-	CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+	CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
 	{
-		std::string retbuf = std::string("340 ") + user->nick + " :";
+		std::string retbuf;
+		int nicks = 0;
+		bool checked_privs = false;
+		bool has_privs = false;
 
-		for (int i = 0; i < pcnt; i++)
+		for (size_t i = 0; i < parameters.size(); i++)
 		{
-			userrec *u = ServerInstance->FindNick(parameters[i]);
+			User *u = ServerInstance->FindNickOnly(parameters[i]);
 			if ((u) && (u->registered == REG_ALL))
 			{
-				retbuf = retbuf + u->nick + (IS_OPER(u) ? "*" : "") + "=+" + u->ident + "@" + u->GetIPString();
+				// Anyone may query their own IP
+				if (u != user)
+				{
+					if (!checked_privs)
+					{
+						// Do not trigger the insufficient privileges message more than once
+						checked_privs = true;
+						has_privs = user->HasPrivPermission("users/auspex");
+						if (!has_privs)
+							user->WriteNumeric(ERR_NOPRIVILEGES, "Permission Denied - You do not have the required operator privileges");
+					}
+
+					if (!has_privs)
+						continue;
+				}
+
+				retbuf = retbuf + u->nick + (u->IsOper() ? "*" : "") + "=";
+				if (u->IsAway())
+					retbuf += "-";
+				else
+					retbuf += "+";
+				retbuf += u->ident + "@" + u->GetIPString() + " ";
+				nicks++;
 			}
 		}
 
-		user->WriteServ(retbuf);
+		if (nicks != 0)
+			user->WriteNumeric(RPL_USERIP, retbuf);
 
-		/* Dont send to the network */
-		return CMD_FAILURE;
+		return CMD_SUCCESS;
 	}
 };
 
 class ModuleUserIP : public Module
 {
-	cmd_userip* mycommand;
+	CommandUserip cmd;
  public:
-	ModuleUserIP(InspIRCd* Me)
-		: Module::Module(Me)
+	ModuleUserIP()
+		: cmd(this)
 	{
-		
-		mycommand = new cmd_userip(ServerInstance);
-		ServerInstance->AddCommand(mycommand);
 	}
 
-	void Implements(char* List)
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
-		List[I_On005Numeric] = 1;
+		tokens["USERIP"];
 	}
 
-	virtual void On005Numeric(std::string &output)
-	{
-		output = output + std::string(" USERIP");
-	}
-	
-	virtual ~ModuleUserIP()
-	{
-	}
-	
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+		return Version("Adds the /USERIP command which allows users to find out the IP address of one or more connected users.", VF_VENDOR);
 	}
-	
 };
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
-
-class ModuleUserIPFactory : public ModuleFactory
-{
- public:
-	ModuleUserIPFactory()
-	{
-	}
-	
-	~ModuleUserIPFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		return new ModuleUserIP(Me);
-	}
-	
-};
-
-
-extern "C" void * init_module( void )
-{
-	return new ModuleUserIPFactory;
-}
-
+MODULE_INIT(ModuleUserIP)