Fix potential for duplicate SID if the SID is auto generated.

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

diff --git a/src/modules/m_invisible.cpp b/src/modules/m_invisible.cpp
index 29b741425601e19b9376f7b5f7930bf4e98ee50f..e8d9127b2944ea34883b322c8aa8f2cbb215eebe 100644 (file)
--- a/src/modules/m_invisible.cpp
+++ b/src/modules/m_invisible.cpp
@@ -11,10 +11,8 @@
  * ---------------------------------------------------
  */
 
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
+#include <stdarg.h>
 
 /* $ModDesc: Allows for opered clients to join channels without being seen, similar to unreal 3.1 +I mode */
 
@@ -57,7 +55,7 @@ class InvisibleMode : public ModeHandler
 
        ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
        {
-               if ((source != dest) && (!*source->oper))
+               if (source != dest)
                        return MODEACTION_DENY;
 
                if (dest->IsModeSet('Q') != adding)
@@ -82,9 +80,20 @@ class InvisibleMode : public ModeHandler
 
                        dest->SetMode('Q', adding);
 
+                       /* Fix for bug #379 reported by stealth. On +/-Q make m_watch think the user has signed on/off */
+                       Module* m = ServerInstance->FindModule("m_watch.so");
+
+                       /* This must come before setting/unsetting the handler */
+                       if (m && adding)
+                               m->OnUserQuit(dest, "Connection closed", "Connection closed");
+
                        /* Set visibility handler object */
                        dest->Visibility = adding ? qo : NULL;
 
+                       /* This has to come after setting/unsetting the handler */
+                       if (m && !adding)
+                               m->OnPostConnect(dest);
+
                        /* User appears to vanish or appear from nowhere */
                        for (UCListIter f = dest->chans.begin(); f != dest->chans.end(); f++)
                        {
@@ -98,11 +107,11 @@ class InvisibleMode : public ModeHandler
                                for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
                                {
                                        /* User only appears to vanish for non-opers */
-                                       if (IS_LOCAL(i->second) && !IS_OPER(i->second))
+                                       if (IS_LOCAL(i->first) && !IS_OPER(i->first))
                                        {
-                                               i->second->Write(out);
+                                               i->first->Write(out);
                                                if (!n.empty() && !adding)
-                                                       i->second->WriteServ("MODE %s +%s", f->first->name, n.c_str());
+                                                       i->first->WriteServ("MODE %s +%s", f->first->name, n.c_str());
                                        }
                                }
 
@@ -146,7 +155,7 @@ class ModuleInvisible : public Module
        InvisibleDeOper* ido;
  public:
        ModuleInvisible(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                conf = new ConfigReader(ServerInstance);
                qm = new InvisibleMode(ServerInstance);
@@ -155,6 +164,9 @@ class ModuleInvisible : public Module
                ido = new InvisibleDeOper(ServerInstance);
                if (!ServerInstance->AddModeWatcher(ido))
                        throw ModuleException("Could not add new mode watcher on usermode +o!");
+
+               /* Yeah i know people can take this out. I'm not about to obfuscate code just to be a pain in the ass. */
+               ServerInstance->ServerNoticeAll("*** m_invisible.so has just been loaded on this network. For more information, please visit http://inspircd.org/wiki/Modules/invisible");
        }
 
        virtual ~ModuleInvisible()
@@ -173,7 +185,7 @@ class ModuleInvisible : public Module
 
        void Implements(char* List)
        {
-               List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserQuit] = List[I_OnRehash] = 1;
+               List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserQuit] = List[I_OnRehash] = 1;
        }
        
        virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent)
@@ -182,7 +194,7 @@ class ModuleInvisible : public Module
                {
                        silent = true;
                        /* Because we silenced the event, make sure it reaches the user whos joining (but only them of course) */
-                       user->WriteFrom(user, "JOIN %s", channel->name);
+                       this->WriteCommonFrom(user, channel, "JOIN %s", channel->name);
                        ServerInstance->WriteOpers("*** \2NOTICE\2: Oper %s has joined %s invisibly (+Q)", user->GetFullHost(), channel->name);
                }
        }
@@ -199,7 +211,7 @@ class ModuleInvisible : public Module
                {
                        silent = true;
                        /* Because we silenced the event, make sure it reaches the user whos leaving (but only them of course) */
-                       user->WriteFrom(user, "PART %s%s%s", channel->name,
+                       this->WriteCommonFrom(user, channel, "PART %s%s%s", channel->name,
                                        partmessage.empty() ? "" : " :",
                                        partmessage.empty() ? "" : partmessage.c_str());
                }
@@ -226,28 +238,51 @@ class ModuleInvisible : public Module
                        }
                }
        }
-};
 
-class ModuleInvisibleFactory : public ModuleFactory
-{
- public:
-       ModuleInvisibleFactory()
+       /* No privmsg response when hiding - submitted by Eric at neowin */
+       virtual int OnUserPreNotice(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
+               if ((target_type == TYPE_USER) && (IS_LOCAL(user)))
+               {
+                       userrec* target = (userrec*)dest;
+                       if(target->IsModeSet('Q') && !*user->oper)
+                       {
+                               user->WriteServ("401 %s %s :No such nick/channel",user->nick, target->nick);
+                               return 1;
+                       }
+               }
+               return 0;
        }
        
-       ~ModuleInvisibleFactory()
+       virtual int OnUserPreMessage(userrec* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
+               return OnUserPreNotice(user, dest, target_type, text, status, exempt_list);
        }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
+
+       /* Fix by Eric @ neowin.net, thanks :) -- Brain */
+       void WriteCommonFrom(userrec *user, chanrec* channel, const char* text, ...)
        {
-               return new ModuleInvisible(Me);
-       }
+               va_list argsPtr;
+               char textbuffer[MAXBUF];
+               char tb[MAXBUF];
        
-};
+               va_start(argsPtr, text);
+               vsnprintf(textbuffer, MAXBUF, text, argsPtr);
+               va_end(argsPtr);
+               snprintf(tb,MAXBUF,":%s %s",user->GetFullHost(),textbuffer);
+               
+               CUList *ulist = channel->GetUsers();
+               
+               for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+               {
+                       /* User only appears to vanish for non-opers */
+                       if (IS_LOCAL(i->first) && IS_OPER(i->first))
+                       {
+                               i->first->Write(std::string(tb));
+                       }
+               }
+       }
 
-extern "C" void * init_module( void )
-{
-       return new ModuleInvisibleFactory;
-}
+};
 
+MODULE_INIT(ModuleInvisible)