m_userip Allow querying own IP for non-opers, require the users/auspex priv for opers...

[user/henk/code/inspircd.git] / src / modules / m_userip.cpp

diff --git a/src/modules/m_userip.cpp b/src/modules/m_userip.cpp
index 033bb0ada68b127d23718893e809b158333134c8..bfac36b1a5ce2534e0a1c6a5a5b48ba616f63669 100644 (file)
--- a/src/modules/m_userip.cpp
+++ b/src/modules/m_userip.cpp
@@ -1,119 +1,114 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *   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 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/>.
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include <string>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 #include "inspircd.h"
 
 /* $ModDesc: Provides support for USERIP command */
 
-
-
-
-class cmd_userip : public command_t
+/** Handle /USERIP
+ */
+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>}";
        }
 
-       CmdResult Handle (const char** parameters, int pcnt, userrec *user)
+       CmdResult Handle (const std::vector<std::string> &parameters, User *user)
        {
-               char Return[MAXBUF],junk[MAXBUF];
-               snprintf(Return,MAXBUF,"340 %s :",user->nick);
-               for (int i = 0; i < pcnt; i++)
+               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++)
                {
-                       userrec *u = ServerInstance->FindNick(parameters[i]);
+                       User *u = ServerInstance->FindNick(parameters[i]);
                        if ((u) && (u->registered == REG_ALL))
                        {
-                               snprintf(junk,MAXBUF,"%s%s=+%s@%s ",u->nick,*u->oper ? "*" : "",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, "%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 += "-";
+                               else
+                                       retbuf += "+";
+                               retbuf += u->ident + "@" + u->GetIPString() + " ";
+                               nicks++;
                        }
                }
-               user->WriteServ(Return);
 
-               /* Dont send to the network */
-               return CMD_FAILURE;
+               if (nicks != 0)
+                       user->WriteServ(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 init()
        {
-               List[I_On005Numeric] = 1;
+               ServerInstance->Modules->AddService(cmd);
+               Implementation eventlist[] = { I_On005Numeric };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        virtual void On005Numeric(std::string &output)
        {
-               output = output + std::string(" USERIP");
+               output = output + " USERIP";
        }
-       
+
        virtual ~ModuleUserIP()
        {
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version("Provides support for USERIP command",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)