From c70a6b5699ef905c05bc669fb6cc9c16f33c6787 Mon Sep 17 00:00:00 2001
From: attilamolnar <attilamolnar@hush.com>
Date: Thu, 16 May 2013 19:49:56 +0200
Subject: m_userip Allow querying own IP for non-opers, require the
 users/auspex priv for opers to query the IP of others

Issue #513 suggested by @CuleX
---
 src/modules/m_userip.cpp | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index a28c12444..bfac36b1a 100644
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -30,19 +30,37 @@ 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))
 			{
+				// 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 + (IS_OPER(u) ? "*" : "") + "=";
 				if (IS_AWAY(u))
 					retbuf += "-";
@@ -56,7 +74,6 @@ class CommandUserip : public Command
 		if (nicks != 0)
 			user->WriteServ(retbuf);
 
-		/* Dont send to the network */
 		return CMD_SUCCESS;
 	}
 };
-- 
cgit v1.2.3