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

diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 9e547d106..b2206220d 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -21,8 +21,6 @@
 
 #include "inspircd.h"
 
-/* $ModDesc: Provides support for USERIP command */
-
 /** Handle /USERIP
  */
 class CommandUserip : public Command
@@ -30,21 +28,39 @@ class CommandUserip : public Command
  public:
 	CommandUserip(Module* Creator) : Command(Creator,"USERIP", 1)
 	{
-		flags_needed = 'o'; syntax = "<nick>{,<nick>}";
+		syntax = "<nick>{,<nick>}";
 	}
 
 	CmdResult Handle (const std::vector<std::string> &parameters, User *user)
 	{
 		std::string retbuf = "340 " + user->nick + " :";
 		int nicks = 0;
+		bool checked_privs = false;
+		bool has_privs;
 
 		for (int i = 0; i < (int)parameters.size(); i++)
 		{
 			User *u = ServerInstance->FindNick(parameters[i]);
 			if ((u) && (u->registered == REG_ALL))
 			{
-				retbuf = retbuf + u->nick + (IS_OPER(u) ? "*" : "") + "=";
-				if (IS_AWAY(u))
+				// 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, "%s :Permission Denied - You do not have the required operator privileges",user->nick.c_str());
+					}
+
+					if (!has_privs)
+						continue;
+				}
+
+				retbuf = retbuf + u->nick + (u->IsOper() ? "*" : "") + "=";
+				if (u->IsAway())
 					retbuf += "-";
 				else
 					retbuf += "+";
@@ -56,7 +72,6 @@ class CommandUserip : public Command
 		if (nicks != 0)
 			user->WriteServ(retbuf);
 
-		/* Dont send to the network */
 		return CMD_SUCCESS;
 	}
 };
@@ -70,28 +85,22 @@ class ModuleUserIP : public Module
 	{
 	}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
-		ServerInstance->AddCommand(&cmd);
+		ServerInstance->Modules->AddService(cmd);
 		Implementation eventlist[] = { I_On005Numeric };
-		ServerInstance->Modules->Attach(eventlist, this, 1);
-	}
-
-	virtual void On005Numeric(std::string &output)
-	{
-		output = output + " USERIP";
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
-	virtual ~ModuleUserIP()
+	void On005Numeric(std::map<std::string, std::string>& tokens) CXX11_OVERRIDE
 	{
+		tokens["USERIP"];
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides support for USERIP command",VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleUserIP)
-