X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_userip.cpp;h=c64f536844285e1942463a0e3bf46ce72d7c5ad9;hb=de4e4860091fe5a9a530acdb25f9a17e22323acf;hp=9c0aa12a85b51c7e8ad68063213a0285246cb1ff;hpb=ec2106579c77a98dfdb209864a1e1b5ae1f07e7f;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 9c0aa12a8..c64f53684 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -1,112 +1,99 @@
-/*       +------------------------------------+
- *       | 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) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2005, 2007 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2006 Robin Burchell <robin+git@viroteck.net>
  *
- * 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
 	{
-		char Return[MAXBUF],junk[MAXBUF];
-		snprintf(Return,MAXBUF,"340 %s :",user->nick);
-		for (int i = 0; i < pcnt; i++)
+		std::string retbuf;
+		int nicks = 0;
+		bool checked_privs = false;
+		bool has_privs = false;
+
+		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))
 			{
-				snprintf(junk,MAXBUF,"%s%s=+%s@%s ",u->nick,IS_OPER(u) ? "*" : "",u->ident,u->GetIPString());
-				strlcat(Return,junk,MAXBUF);
+				// Anyone may query their own IP
+				if (u != user)
+				{
+					if (!checked_privs)
+					{
+						// Do not trigger the insufficient priviliges 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(Return);
 
-		/* Dont send to the network */
-		return CMD_FAILURE;
+		if (nicks != 0)
+			user->WriteNumeric(RPL_USERIP, retbuf);
+
+		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)
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		output = output + std::string(" USERIP");
+		return Version("Provides support for USERIP command",VF_VENDOR);
 	}
-	
-	virtual ~ModuleUserIP()
-	{
-	}
-	
-	virtual Version GetVersion()
-	{
-		return Version(1,1,0,1,VF_VENDOR,API_VERSION);
-	}
-	
 };
 
-// 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)