]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_cgiirc.cpp
Merge pull request #1321 from SaberUK/insp20+permwarn
[user/henk/code/inspircd.git] / src / modules / m_cgiirc.cpp
index a014e646174eb1fa5232eedf6894918dc1e451f7..09f6a4659d88e0d760a85d48166514ed825b68d8 100644 (file)
@@ -1,39 +1,46 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
+ *
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2007-2008 John Brooks <john.brooks@dereferenced.net>
+ *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * 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 free but copyrighted software; see
- *            the file COPYING for details.
+ * 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/>.
  */
 
-#include "inspircd.h"
 
-#ifndef WINDOWS
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#endif
+#include "inspircd.h"
+#include "xline.h"
 
 /* $ModDesc: Change user's hosts connecting from known CGI:IRC hosts */
 
-enum CGItype { INVALID, PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC };
+enum CGItype { PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC };
 
 
 /** Holds a CGI site's details
  */
-class CGIhost : public classbase
+class CGIhost
 {
 public:
        std::string hostmask;
        CGItype type;
        std::string password;
 
-       CGIhost(const std::string &mask = "", CGItype t = IDENTFIRST, const std::string &spassword ="")
+       CGIhost(const std::string &mask, CGItype t, const std::string &spassword)
        : hostmask(mask), type(t), password(spassword)
        {
        }
@@ -53,12 +60,21 @@ typedef std::vector<CGIhost> CGIHostlist;
  */
 class CommandWebirc : public Command
 {
-       CGIHostlist Hosts;
+ public:
        bool notify;
-       public:
-               CommandWebirc(InspIRCd* Instance, CGIHostlist &cHosts, bool bnotify) : Command(Instance, "WEBIRC", 0, 4, true), Hosts(cHosts), notify(bnotify)
+       StringExtItem realhost;
+       StringExtItem realip;
+       LocalStringExt webirc_hostname;
+       LocalStringExt webirc_ip;
+
+       CGIHostlist Hosts;
+       CommandWebirc(Module* Creator)
+               : Command(Creator, "WEBIRC", 4),
+                 realhost("cgiirc_realhost", Creator), realip("cgiirc_realip", Creator),
+                 webirc_hostname("cgiirc_webirc_hostname", Creator), webirc_ip("cgiirc_webirc_ip", Creator)
                {
-                       this->source = "m_cgiirc.so";
+                       allow_empty_last_param = false;
+                       works_before_reg = true;
                        this->syntax = "password client hostname ip";
                }
                CmdResult Handle(const std::vector<std::string> &parameters, User *user)
@@ -66,24 +82,43 @@ class CommandWebirc : public Command
                        if(user->registered == REG_ALL)
                                return CMD_FAILURE;
 
+                       irc::sockets::sockaddrs ipaddr;
+                       if (!irc::sockets::aptosa(parameters[3], 0, ipaddr))
+                       {
+                               IS_LOCAL(user)->CommandFloodPenalty += 5000;
+                               ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s tried to use WEBIRC but gave an invalid IP address.", user->GetFullRealHost().c_str());
+                               return CMD_FAILURE;
+                       }
+
                        for(CGIHostlist::iterator iter = Hosts.begin(); iter != Hosts.end(); iter++)
                        {
                                if(InspIRCd::Match(user->host, iter->hostmask, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(user->GetIPString(), iter->hostmask, ascii_case_insensitive_map))
                                {
                                        if(iter->type == WEBIRC && parameters[0] == iter->password)
                                        {
-                                               user->Extend("cgiirc_realhost", new std::string(user->host));
-                                               user->Extend("cgiirc_realip", new std::string(user->GetIPString()));
+                                               realhost.set(user, user->host);
+                                               realip.set(user, user->GetIPString());
+
+                                               bool host_ok = (parameters[2].length() < 64);
+                                               const std::string& newhost = (host_ok ? parameters[2] : parameters[3]);
+
                                                if (notify)
-                                                       ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", user->nick.c_str(), user->host.c_str(), parameters[2].c_str(), user->host.c_str());
-                                               user->Extend("cgiirc_webirc_hostname", new std::string(parameters[2]));
-                                               user->Extend("cgiirc_webirc_ip", new std::string(parameters[3]));
-                                               return CMD_LOCALONLY;
+                                                       ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", user->nick.c_str(), user->host.c_str(), newhost.c_str(), user->host.c_str());
+
+                                               // Check if we're happy with the provided hostname. If it's problematic then make sure we won't set a host later, just the IP
+                                               if (host_ok)
+                                                       webirc_hostname.set(user, parameters[2]);
+                                               else
+                                                       webirc_hostname.unset(user);
+
+                                               webirc_ip.set(user, parameters[3]);
+                                               return CMD_SUCCESS;
                                        }
                                }
                        }
 
-                       ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s tried to use WEBIRC, but didn't match any configured webirc blocks.", user->GetFullRealHost().c_str());
+                       IS_LOCAL(user)->CommandFloodPenalty += 5000;
+                       ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s tried to use WEBIRC, but didn't match any configured webirc blocks.", user->GetFullRealHost().c_str());
                        return CMD_FAILURE;
                }
 };
@@ -94,29 +129,30 @@ class CommandWebirc : public Command
 class CGIResolver : public Resolver
 {
        std::string typ;
-       int theirfd;
-       User* them;
+       std::string theiruid;
+       LocalIntExt& waiting;
        bool notify;
  public:
-       CGIResolver(Module* me, InspIRCd* Instance, bool NotifyOpers, const std::string &source, bool forward, User* u, int userfd, const std::string &type, bool &cached)
-               : Resolver(Instance, source, forward ? DNS_QUERY_A : DNS_QUERY_PTR4, cached, me), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { }
-
-       virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0)
+       CGIResolver(Module* me, bool NotifyOpers, const std::string &source, LocalUser* u,
+                       const std::string &type, bool &cached, LocalIntExt& ext)
+               : Resolver(source, DNS_QUERY_PTR4, cached, me), typ(type), theiruid(u->uuid),
+               waiting(ext), notify(NotifyOpers)
        {
-               if (resultnum)
-                       return;
+       }
 
+       virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
+       {
                /* Check the user still exists */
-               if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))
+               User* them = ServerInstance->FindUUID(theiruid);
+               if ((them) && (!them->quitting))
                {
                        if (notify)
-                               ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", them->nick.c_str(), them->host.c_str(), result.c_str(), typ.c_str());
+                               ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", them->nick.c_str(), them->host.c_str(), result.c_str(), typ.c_str());
 
-                       them->host.assign(result,0, 64);
-                       them->dhost.assign(result, 0, 64);
-                       if (querytype)
-                               them->SetSockAddr(them->GetProtocolFamily(), result.c_str(), them->GetPort());
-                       them->ident.assign("~cgiirc", 0, 8);
+                       if (result.length() > 64)
+                               return;
+                       them->host = result;
+                       them->dhost = result;
                        them->InvalidateCache();
                        them->CheckLines(true);
                }
@@ -124,65 +160,112 @@ class CGIResolver : public Resolver
 
        virtual void OnError(ResolverError e, const std::string &errormessage)
        {
-               if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))
+               if (!notify)
+                       return;
+
+               User* them = ServerInstance->FindUUID(theiruid);
+               if ((them) && (!them->quitting))
                {
-                       if (notify)
-                               ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), but their host can't be resolved from their %s!", them->nick.c_str(), them->host.c_str(), typ.c_str());
+                       ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), but their host can't be resolved from their %s!", them->nick.c_str(), them->host.c_str(), typ.c_str());
                }
        }
 
        virtual ~CGIResolver()
        {
+               User* them = ServerInstance->FindUUID(theiruid);
+               if (!them)
+                       return;
+               int count = waiting.get(them);
+               if (count)
+                       waiting.set(them, count - 1);
        }
 };
 
 class ModuleCgiIRC : public Module
 {
-       CommandWebirc* mycommand;
-       bool NotifyOpers;
-       CGIHostlist Hosts;
-public:
-       ModuleCgiIRC(InspIRCd* Me) : Module(Me)
-       {
+       CommandWebirc cmd;
+       LocalIntExt waiting;
 
-               OnRehash(NULL,"");
-               mycommand = new CommandWebirc(Me, Hosts, NotifyOpers);
-               ServerInstance->AddCommand(mycommand);
+       static void RecheckClass(LocalUser* user)
+       {
+               user->MyClass = NULL;
+               user->SetClass();
+               user->CheckClass();
+       }
 
-               Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCleanup, I_OnSyncUserMetaData, I_OnDecodeMetaData, I_OnUserDisconnect, I_OnUserConnect };
-               ServerInstance->Modules->Attach(eventlist, this, 7);
+       static void ChangeIP(LocalUser* user, const std::string& newip)
+       {
+               ServerInstance->Users->RemoveCloneCounts(user);
+               user->SetClientIP(newip.c_str());
+               ServerInstance->Users->AddLocalClone(user);
+               ServerInstance->Users->AddGlobalClone(user);
        }
 
+       void HandleIdentOrPass(LocalUser* user, const std::string& newip, bool was_pass)
+       {
+               cmd.realhost.set(user, user->host);
+               cmd.realip.set(user, user->GetIPString());
+               ChangeIP(user, newip);
+               user->host = user->dhost = user->GetIPString();
+               user->InvalidateCache();
+               RecheckClass(user);
+               // Don't create the resolver if the core couldn't put the user in a connect class or when dns is disabled
+               if (user->quitting || ServerInstance->Config->NoUserDns)
+                       return;
 
-       virtual void Prioritize()
+               try
+               {
+                       bool cached;
+                       CGIResolver* r = new CGIResolver(this, cmd.notify, newip, user, (was_pass ? "PASS" : "IDENT"), cached, waiting);
+                       waiting.set(user, waiting.get(user) + 1);
+                       ServerInstance->AddResolver(r, cached);
+               }
+               catch (...)
+               {
+                       if (cmd.notify)
+                                ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), but I could not resolve their hostname!", user->nick.c_str(), user->host.c_str());
+               }
+       }
+
+public:
+       ModuleCgiIRC() : cmd(this), waiting("cgiirc-delay", this)
        {
-               ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_FIRST);
        }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       void init()
        {
-               ConfigReader Conf(ServerInstance);
-               Hosts.clear();
+               OnRehash(NULL);
+               ServiceProvider* providerlist[] = { &cmd, &cmd.realhost, &cmd.realip, &cmd.webirc_hostname, &cmd.webirc_ip, &waiting };
+               ServerInstance->Modules->AddServices(providerlist, sizeof(providerlist)/sizeof(ServiceProvider*));
 
-               NotifyOpers = Conf.ReadFlag("cgiirc", "opernotice", 0); // If we send an oper notice when a CGI:IRC has their host changed.
+               Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCheckReady };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+       }
+
+       void OnRehash(User* user)
+       {
+               cmd.Hosts.clear();
 
-               if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
-                       NotifyOpers = true;
+               // Do we send an oper notice when a CGI:IRC has their host changed?
+               cmd.notify = ServerInstance->Config->ConfValue("cgiirc")->getBool("opernotice", true);
 
-               for(int i = 0; i < Conf.Enumerate("cgihost"); i++)
+               ConfigTagList tags = ServerInstance->Config->ConfTags("cgihost");
+               for (ConfigIter i = tags.first; i != tags.second; ++i)
                {
-                       std::string hostmask = Conf.ReadValue("cgihost", "mask", i); // An allowed CGI:IRC host
-                       std::string type = Conf.ReadValue("cgihost", "type", i); // What type of user-munging we do on this host.
-                       std::string password = Conf.ReadValue("cgihost", "password", i);
+                       ConfigTag* tag = i->second;
+                       std::string hostmask = tag->getString("mask"); // An allowed CGI:IRC host
+                       std::string type = tag->getString("type"); // What type of user-munging we do on this host.
+                       std::string password = tag->getString("password");
 
                        if(hostmask.length())
                        {
-                               if (type == "webirc" && !password.length()) {
-                                               ServerInstance->Logs->Log("CONFIG",DEFAULT, "m_cgiirc: Missing password in config: %s", hostmask.c_str());
+                               if (type == "webirc" && password.empty())
+                               {
+                                       ServerInstance->Logs->Log("CONFIG",DEFAULT, "m_cgiirc: Missing password in config: %s", hostmask.c_str());
                                }
                                else
                                {
-                                       CGItype cgitype = INVALID;
+                                       CGItype cgitype;
                                        if (type == "pass")
                                                cgitype = PASS;
                                        else if (type == "ident")
@@ -190,14 +273,14 @@ public:
                                        else if (type == "passfirst")
                                                cgitype = PASSFIRST;
                                        else if (type == "webirc")
-                                       {
                                                cgitype = WEBIRC;
-                                       }
-
-                                       if (cgitype == INVALID)
+                                       else
+                                       {
                                                cgitype = PASS;
+                                               ServerInstance->Logs->Log("CONFIG",DEFAULT, "m_cgiirc.so: Invalid <cgihost:type> value in config: %s, setting it to \"pass\"", type.c_str());
+                                       }
 
-                                       Hosts.push_back(CGIhost(hostmask,cgitype, password.length() ? password : "" ));
+                                       cmd.Hosts.push_back(CGIhost(hostmask, cgitype, password));
                                }
                        }
                        else
@@ -208,63 +291,38 @@ public:
                }
        }
 
-       virtual void OnCleanup(int target_type, void* item)
+       ModResult OnCheckReady(LocalUser *user)
        {
-               if(target_type == TYPE_USER)
-               {
-                       User* user = (User*)item;
-                       std::string* realhost;
-                       std::string* realip;
+               if (waiting.get(user))
+                       return MOD_RES_DENY;
 
-                       if(user->GetExt("cgiirc_realhost", realhost))
-                       {
-                               delete realhost;
-                               user->Shrink("cgiirc_realhost");
-                       }
+               std::string *webirc_ip = cmd.webirc_ip.get(user);
+               if (!webirc_ip)
+                       return MOD_RES_PASSTHRU;
 
-                       if(user->GetExt("cgiirc_realip", realip))
-                       {
-                               delete realip;
-                               user->Shrink("cgiirc_realip");
-                       }
-               }
-       }
+               ChangeIP(user, *webirc_ip);
 
-       virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
-       {
-               if((extname == "cgiirc_realhost") || (extname == "cgiirc_realip"))
-               {
-                       std::string* data;
+               std::string* webirc_hostname = cmd.webirc_hostname.get(user);
+               user->host = user->dhost = (webirc_hostname ? *webirc_hostname : user->GetIPString());
+               user->InvalidateCache();
 
-                       if(user->GetExt(extname, data))
-                       {
-                               proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, *data);
-                       }
-               }
-       }
+               RecheckClass(user);
+               if (user->quitting)
+                       return MOD_RES_DENY;
 
-       virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata)
-       {
-               if(target_type == TYPE_USER)
-               {
-                       User* dest = (User*)target;
-                       std::string* bleh;
-                       if(((extname == "cgiirc_realhost") || (extname == "cgiirc_realip")) && (!dest->GetExt(extname, bleh)))
-                       {
-                               dest->Extend(extname, new std::string(extdata));
-                       }
-               }
-       }
+               user->CheckLines(true);
+               if (user->quitting)
+                       return MOD_RES_DENY;
 
-       virtual void OnUserDisconnect(User* user)
-       {
-               OnCleanup(TYPE_USER, user);
-       }
+               cmd.webirc_hostname.unset(user);
+               cmd.webirc_ip.unset(user);
 
+               return MOD_RES_PASSTHRU;
+       }
 
-       virtual int OnUserRegister(User* user)
+       ModResult OnUserRegister(LocalUser* user)
        {
-               for(CGIHostlist::iterator iter = Hosts.begin(); iter != Hosts.end(); iter++)
+               for(CGIHostlist::iterator iter = cmd.Hosts.begin(); iter != cmd.Hosts.end(); iter++)
                {
                        if(InspIRCd::Match(user->host, iter->hostmask, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(user->GetIPString(), iter->hostmask, ascii_case_insensitive_map))
                        {
@@ -295,85 +353,17 @@ public:
                                {
                                        // We don't need to do anything here
                                }
-                               return 0;
+                               return MOD_RES_PASSTHRU;
                        }
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual void OnUserConnect(User* user)
-       {
-               std::string *webirc_hostname, *webirc_ip;
-               if(user->GetExt("cgiirc_webirc_hostname", webirc_hostname))
-               {
-                       user->host.assign(*webirc_hostname, 0, 64);
-                       user->dhost.assign(*webirc_hostname, 0, 64);
-                       delete webirc_hostname;
-                       user->InvalidateCache();
-                       user->Shrink("cgiirc_webirc_hostname");
-               }
-               if(user->GetExt("cgiirc_webirc_ip", webirc_ip))
-               {
-                       ServerInstance->Users->RemoveCloneCounts(user);
-                       user->SetSockAddr(user->GetProtocolFamily(), webirc_ip->c_str(), user->GetPort());
-                       delete webirc_ip;
-                       user->InvalidateCache();
-                       user->Shrink("cgiirc_webirc_ip");
-                       ServerInstance->Users->AddLocalClone(user);
-                       ServerInstance->Users->AddGlobalClone(user);
-                       user->CheckClass();
-                       user->CheckLines(true);
-               }
-       }
-
-       bool CheckPass(User* user)
+       bool CheckPass(LocalUser* user)
        {
                if(IsValidHost(user->password))
                {
-                       user->Extend("cgiirc_realhost", new std::string(user->host));
-                       user->Extend("cgiirc_realip", new std::string(user->GetIPString()));
-                       user->host.assign(user->password, 0, 64);
-                       user->dhost.assign(user->password, 0, 64);
-                       user->InvalidateCache();
-
-                       bool valid = false;
-                       ServerInstance->Users->RemoveCloneCounts(user);
-#ifdef IPV6
-                       if (user->GetProtocolFamily() == AF_INET6)
-                               valid = (inet_pton(AF_INET6, user->password.c_str(), &((sockaddr_in6*)user->ip)->sin6_addr) > 0);
-                       else
-                               valid = (inet_aton(user->password.c_str(), &((sockaddr_in*)user->ip)->sin_addr));
-#else
-                       if (inet_aton(user->password.c_str(), &((sockaddr_in*)user->ip)->sin_addr))
-                               valid = true;
-#endif
-                       ServerInstance->Users->AddLocalClone(user);
-                       ServerInstance->Users->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. */
-                               if(NotifyOpers)
-                                       ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick.c_str(), user->host.c_str(), user->password.c_str());
-                       }
-                       else
-                       {
-                               /* We got as resolved hostname in the password. */
-                               try
-                               {
-
-                                       bool cached;
-                                       CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, user->password, false, user, user->GetFd(), "PASS", cached);
-                                       ServerInstance->AddResolver(r, cached);
-                               }
-                               catch (...)
-                               {
-                                       if (NotifyOpers)
-                                               ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), but I could not resolve their hostname!", user->nick.c_str(), user->host.c_str());
-                               }
-                       }
-
+                       HandleIdentOrPass(user, user->password, true);
                        user->password.clear();
                        return true;
                }
@@ -381,60 +371,34 @@ public:
                return false;
        }
 
-       bool CheckIdent(User* user)
+       bool CheckIdent(LocalUser* user)
        {
-               int ip[4];
                const char* ident;
-               char newip[16];
-               int len = user->ident.length();
+               in_addr newip;
 
-               if(len == 8)
+               if (user->ident.length() == 8)
                        ident = user->ident.c_str();
-               else if(len == 9 && user->ident[0] == '~')
+               else if (user->ident.length() == 9 && user->ident[0] == '~')
                        ident = user->ident.c_str() + 1;
                else
                        return false;
 
-               for(int i = 0; i < 4; i++)
-                       if(!HexToInt(ip[i], ident + i*2))
-                               return false;
-
-               snprintf(newip, 16, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
-
-               user->Extend("cgiirc_realhost", new std::string(user->host));
-               user->Extend("cgiirc_realip", new std::string(user->GetIPString()));
-               ServerInstance->Users->RemoveCloneCounts(user);
-               user->SetSockAddr(user->GetProtocolFamily(), newip, user->GetPort());
-               ServerInstance->Users->AddLocalClone(user);
-               ServerInstance->Users->AddGlobalClone(user);
-               user->CheckClass();
-               try
-               {
-                       user->host.assign(newip, 0, 16);
-                       user->dhost.assign(newip, 0, 16);
-                       user->ident.assign("~cgiirc", 0, 8);
-
-                       bool cached;
-                       CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, newip, false, user, user->GetFd(), "IDENT", cached);
-                       ServerInstance->AddResolver(r, cached);
-               }
-               catch (...)
-               {
-                       user->host.assign(newip, 0, 16);
-                       user->dhost.assign(newip, 0, 16);
-                       user->ident.assign("~cgiirc", 0, 8);
-                       user->InvalidateCache();
+               errno = 0;
+               unsigned long ipaddr = strtoul(ident, NULL, 16);
+               if (errno)
+                       return false;
+               newip.s_addr = htonl(ipaddr);
+               std::string newipstr(inet_ntoa(newip));
 
-                       if(NotifyOpers)
-                                ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), but I could not resolve their hostname!", user->nick.c_str(), user->host.c_str());
-               }
+               user->ident = "~cgiirc";
+               HandleIdentOrPass(user, newipstr, false);
 
                return true;
        }
 
        bool IsValidHost(const std::string &host)
        {
-               if(!host.size())
+               if(!host.size() || host.size() > 64)
                        return false;
 
                for(unsigned int i = 0; i < host.size(); i++)
@@ -453,62 +417,9 @@ public:
                return true;
        }
 
-       bool IsValidIP(const std::string &ip)
-       {
-               if(ip.size() < 7 || ip.size() > 15)
-                       return false;
-
-               short sincedot = 0;
-               short dots = 0;
-
-               for(unsigned int i = 0; i < ip.size(); i++)
-               {
-                       if((dots <= 3) && (sincedot <= 3))
-                       {
-                               if((ip[i] >= '0') && (ip[i] <= '9'))
-                               {
-                                       sincedot++;
-                               }
-                               else if(ip[i] == '.')
-                               {
-                                       sincedot = 0;
-                                       dots++;
-                               }
-                       }
-                       else
-                       {
-                               return false;
-
-                       }
-               }
-
-               if(dots != 3)
-                       return false;
-
-               return true;
-       }
-
-       bool HexToInt(int &out, const char* in)
-       {
-               char ip[3];
-               ip[0] = in[0];
-               ip[1] = in[1];
-               ip[2] = 0;
-               out = strtol(ip, NULL, 16);
-
-               if(out > 255 || out < 0)
-                       return false;
-
-               return true;
-       }
-
-       virtual ~ModuleCgiIRC()
-       {
-       }
-
        virtual Version GetVersion()
        {
-               return Version("$Id$",VF_VENDOR,API_VERSION);
+               return Version("Change user's hosts connecting from known CGI:IRC hosts",VF_VENDOR);
        }
 
 };