Fix for bug #349: NOTE there is important caveat about this in the example config...

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

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 04a56b1fafc4a3acd56d4c1cfee73efb820b0cde..290f55d22df63cbf0203e76e1abc4a09acf500f9 100644 (file)
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -11,16 +11,15 @@
  * ---------------------------------------------------
  */
 
-#include <vector>
-#include <string>
-#include <stdlib.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
+#include "inspircd.h"
 #include "users.h"
 #include "modules.h"
 #include "dns.h"
-#include "inspircd.h"
+#ifndef WINDOWS
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#endif
 
 /* $ModDesc: Change user's hosts connecting from known CGI:IRC hosts */
 
@@ -127,7 +126,7 @@ class ModuleCgiIRC : public Module
        bool NotifyOpers;
        CGIHostlist Hosts;
 public:
-       ModuleCgiIRC(InspIRCd* Me) : Module::Module(Me)
+       ModuleCgiIRC(InspIRCd* Me) : Module(Me)
        {
                
                OnRehash(NULL,"");
@@ -163,20 +162,20 @@ public:
                        
                        if(hostmask.length())
                        {
-                               Hosts.push_back(CGIhost(hostmask));
-                               
-                               if(type == "pass")
-                                       Hosts.back().type = PASS;
-                               else if(type == "ident")
-                                       Hosts.back().type = IDENT;
-                               else if(type == "passfirst")
-                                       Hosts.back().type = PASSFIRST;
-                               else if(type == "webirc") {
-                                       Hosts.back().type = WEBIRC;
-                                       if(password.length())
-                                               Hosts.back().password=password;
-                                       else
+                               if(type == "webirc" && !password.length()) {
                                                ServerInstance->Log(DEFAULT, "m_cgiirc: Missing password in config: %s", hostmask.c_str());
+                               } else {
+                                       CGItype cgitype;
+                                       if(type == "pass")
+                                               cgitype = PASS;
+                                       else if(type == "ident")
+                                               cgitype = IDENT;
+                                       else if(type == "passfirst")
+                                               cgitype = PASSFIRST;
+                                       else if(type == "webirc") {
+                                               cgitype = WEBIRC;
+                                       }
+                                       Hosts.push_back(CGIhost(hostmask,cgitype, password.length() ? password : "" ));
                                }
                        }
                        else
@@ -209,7 +208,7 @@ public:
                }
        }
        
-       virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname)
+       virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
        {
                if((extname == "cgiirc_realhost") || (extname == "cgiirc_realip"))
                {
@@ -290,6 +289,7 @@ public:
                if(user->GetExt("cgiirc_webirc_ip", webirc_ip))
                {
                        bool valid=false;
+                       user->RemoveCloneCounts();
 #ifdef IPV6
                        valid = (inet_pton(AF_INET6, webirc_ip->c_str(), &((sockaddr_in6*)user->ip)->sin6_addr) > 0); 
 
@@ -303,6 +303,9 @@ public:
                        delete webirc_ip;
                        user->InvalidateCache();
                        user->Shrink("cgiirc_webirc_ip");
+                       ServerInstance->AddLocalClone(user);
+                       ServerInstance->AddGlobalClone(user);
+                       user->CheckClass();
                }
        }
 
@@ -317,6 +320,7 @@ public:
                        user->InvalidateCache();
 
                        bool valid = false;
+                       user->RemoveCloneCounts();
 #ifdef IPV6
                        if (user->GetProtocolFamily() == AF_INET6)
                                valid = (inet_pton(AF_INET6, user->password, &((sockaddr_in6*)user->ip)->sin6_addr) > 0);
@@ -326,6 +330,10 @@ public:
                        if (inet_aton(user->password, &((sockaddr_in*)user->ip)->sin_addr))
                                valid = true;
 #endif
+                       ServerInstance->AddLocalClone(user);
+                       ServerInstance->AddGlobalClone(user);
+                       user->CheckClass();
+
                        if (valid)
                        {
                                /* We were given a IP in the password, we don't do DNS so they get this is as their host as well. */
@@ -342,7 +350,7 @@ public:
                                        CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, user->password, false, user, user->GetFd(), "PASS", cached);
                                        ServerInstance->AddResolver(r, cached);
                                }
-                               catch (ModuleException& e)
+                               catch (...)
                                {
                                        if (NotifyOpers)
                                                ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but i could not resolve their hostname!", user->nick, user->host);
@@ -382,15 +390,16 @@ public:
                        
                user->Extend("cgiirc_realhost", new std::string(user->host));
                user->Extend("cgiirc_realip", new std::string(user->GetIPString()));
+               user->RemoveCloneCounts();
 #ifdef IPV6
                if (user->GetProtocolFamily() == AF_INET6)
                        inet_pton(AF_INET6, newip, &((sockaddr_in6*)user->ip)->sin6_addr);
                else
-                       inet_aton(newip, &((sockaddr_in*)user->ip)->sin_addr);
-#else
-               inet_aton(newip, &((sockaddr_in*)user->ip)->sin_addr);
 #endif
-                                       
+               inet_aton(newip, &((sockaddr_in*)user->ip)->sin_addr);
+               ServerInstance->AddLocalClone(user);
+               ServerInstance->AddGlobalClone(user);
+               user->CheckClass();
                try
                {
                        strlcpy(user->host, newip, 16);
@@ -401,7 +410,7 @@ public:
                        CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, newip, false, user, user->GetFd(), "IDENT", cached);
                        ServerInstance->AddResolver(r, cached);
                }
-               catch (ModuleException& e)
+               catch (...)
                {
                        strlcpy(user->host, newip, 16);
                        strlcpy(user->dhost, newip, 16);
@@ -499,26 +508,4 @@ public:
        
 };
 
-class ModuleCgiIRCFactory : public ModuleFactory
-{
- public:
-       ModuleCgiIRCFactory()
-       {
-       }
-       
-       ~ModuleCgiIRCFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleCgiIRC(Me);
-       }
-       
-};
-
-
-extern "C" void * init_module( void )
-{
-       return new ModuleCgiIRCFactory;
-}
+MODULE_INIT(ModuleCgiIRC)