Use FindNickOnly in a few commands to prevent enumerating users via UID walking

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

diff --git a/src/modules/m_showwhois.cpp b/src/modules/m_showwhois.cpp
index 2b83243c110499d2ca74d6df3decbc0949670b05..c8b4f6219fcc2eab2ec66bea320333bf02e580fb 100644 (file)
--- a/src/modules/m_showwhois.cpp
+++ b/src/modules/m_showwhois.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,9 +11,6 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Allows opers to set +W to see when a user uses WHOIS on them */
@@ -23,14 +20,13 @@
 class SeeWhois : public ModeHandler
 {
  public:
-       SeeWhois(InspIRCd* Instance) : ModeHandler(Instance, 'W', 0, 0, false, MODETYPE_USER, true) { }
-
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       SeeWhois(Module* Creator, bool IsOpersOnly) : ModeHandler(Creator, "showwhois", 'W', PARAM_NONE, MODETYPE_USER)
        {
-               /* Only opers can change other users modes */
-               if (source != dest)
-                       return MODEACTION_DENY;
+               oper = IsOpersOnly;
+       }
 
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       {
                if (adding)
                {
                        if (!dest->IsModeSet('W'))
@@ -52,79 +48,88 @@ class SeeWhois : public ModeHandler
        }
 };
 
-class ModuleShowwhois : public Module
+class WhoisNoticeCmd : public Command
 {
-       
-       SeeWhois* sw;
-
  public:
+       WhoisNoticeCmd(Module* Creator) : Command(Creator,"WHOISNOTICE", 1)
+       {
+               flags_needed = FLAG_SERVERONLY;
+       }
 
-       ModuleShowwhois(InspIRCd* Me) : Module::Module(Me)
+       void HandleFast(User* dest, User* src)
        {
-               
-               sw = new SeeWhois(ServerInstance);
-               if (!ServerInstance->AddMode(sw, 'W'))
-                       throw ModuleException("Could not add new modes!");
+               dest->WriteServ("NOTICE %s :*** %s (%s@%s) did a /whois on you",
+                       dest->nick.c_str(), src->nick.c_str(), src->ident.c_str(),
+                       dest->HasPrivPermission("users/auspex") ? src->host.c_str() : src->dhost.c_str());
        }
 
-       ~ModuleShowwhois()
+       CmdResult Handle(const std::vector<std::string> &parameters, User *user)
        {
-               ServerInstance->Modes->DelMode(sw);
-               DELETE(sw);
+               User* dest = ServerInstance->FindNick(parameters[0]);
+               User* source = ServerInstance->FindNick(parameters[1]);
+
+               if (IS_LOCAL(dest) && source)
+                       HandleFast(dest, source);
+
+               return CMD_SUCCESS;
        }
+};
+
+class ModuleShowwhois : public Module
+{
+       bool ShowWhoisFromOpers;
+       SeeWhois* sw;
+       WhoisNoticeCmd cmd;
+
+ public:
 
-       void Implements(char* List)
+       ModuleShowwhois() : cmd(this)
        {
-               List[I_OnWhois] = 1;
+               ConfigReader conf;
+               bool OpersOnly = conf.ReadFlag("showwhois", "opersonly", "yes", 0);
+               ShowWhoisFromOpers = conf.ReadFlag("showwhois", "showfromopers", "yes", 0);
+
+               sw = new SeeWhois(this, OpersOnly);
+               if (!ServerInstance->Modes->AddMode(sw))
+                       throw ModuleException("Could not add new modes!");
+               ServerInstance->AddCommand(&cmd);
+               Implementation eventlist[] = { I_OnWhois };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       virtual Version GetVersion()
+       ~ModuleShowwhois()
        {
-               return Version(1,1,0,3,VF_COMMON|VF_VENDOR,API_VERSION);
+               delete sw;
        }
 
-       virtual void OnWhois(userrec* source, userrec* dest)
+       Version GetVersion()
        {
-               if ((dest->IsModeSet('W')) && (source != dest))
-               {
-                       if (IS_LOCAL(dest))
-                       {
-                               dest->WriteServ("NOTICE %s :*** %s (%s@%s) did a /whois on you.",dest->nick,source->nick,source->ident,source->host);
-                       }
-                       else
-                       {
-                               std::deque<std::string> params;
-                               params.push_back(dest->nick);
-                               std::string msg = ":";
-                               msg = msg + dest->server + " NOTICE " + dest->nick + " :*** " + source->nick + " (" + source->ident + "@" + source->host + ") did a /whois on you.";
-                               params.push_back(msg);
-                               Event ev((char *) &params, NULL, "send_push");
-                               ev.Send(ServerInstance);
-                       }
-               }
+               return Version("Allows opers to set +W to see when a user uses WHOIS on them",VF_OPTCOMMON|VF_VENDOR);
        }
 
-};
+       void OnWhois(User* source, User* dest)
+       {
+               if (!dest->IsModeSet('W') || source == dest)
+                       return;
 
-class ModuleShowwhoisFactory : public ModuleFactory
-{
-       public:
-               ModuleShowwhoisFactory()
-               {
-               }
+               if (!ShowWhoisFromOpers && (!IS_OPER(source) != !IS_OPER(dest)))
+                       return;
 
-               ~ModuleShowwhoisFactory()
+               if (IS_LOCAL(dest))
                {
+                       cmd.HandleFast(dest, source);
                }
-
-               virtual Module* CreateModule(InspIRCd* Me)
+               else
                {
-                       return new ModuleShowwhois(Me);
+                       std::vector<std::string> params;
+                       params.push_back(dest->server);
+                       params.push_back("WHOISNOTICE");
+                       params.push_back(dest->uuid);
+                       params.push_back(source->uuid);
+                       ServerInstance->PI->SendEncapsulatedData(params);
                }
+       }
 
 };
 
-extern "C" void* init_module()
-{
-       return new ModuleShowwhoisFactory;
-}
+MODULE_INIT(ModuleShowwhois)