]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_cgiirc.cpp
m_cgiirc Don't apply resolved host or send notifications when the user is quitting...
[user/henk/code/inspircd.git] / src / modules / m_cgiirc.cpp
index 64fd6c69fb6ee062b89bb47dc3fdf6803ec8c98f..f6ad5992a78df10e66c3e3353fa1f599892e0dcb 100644 (file)
@@ -1 +1,416 @@
-/*       +------------------------------------+\r *       | Inspire Internet Relay Chat Daemon |\r *       +------------------------------------+\r *\r *  InspIRCd: (C) 2002-2007 InspIRCd Development Team\r * See: http://www.inspircd.org/wiki/index.php/Credits\r *\r * This program is free but copyrighted software; see\r *            the file COPYING for details.\r *\r * ---------------------------------------------------\r */\r\r#include "inspircd.h"\r#include "users.h"\r#include "modules.h"\r#include "dns.h"\r#ifndef WINDOWS\r#include <sys/socket.h>\r#include <netinet/in.h>\r#include <arpa/inet.h>\r#endif\r\r/* $ModDesc: Change user's hosts connecting from known CGI:IRC hosts */\r\renum CGItype { PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC };\r\r\r/** Holds a CGI site's details\r */\rclass CGIhost : public classbase\r{\rpublic:\r       std::string hostmask;\r  CGItype type;\r  std::string password;\r\r CGIhost(const std::string &mask = "", CGItype t = IDENTFIRST, const std::string &password ="")\r : hostmask(mask), type(t), password(password)\r  {\r      }\r};\rtypedef std::vector<CGIhost> CGIHostlist;\r\rclass cmd_webirc : public command_t\r{\r  InspIRCd* Me;\r  CGIHostlist Hosts;\r     bool notify;\r   public:\r                cmd_webirc(InspIRCd* Me, CGIHostlist &Hosts, bool notify) : command_t(Me, "WEBIRC", 0, 4, true), Hosts(Hosts), notify(notify)\r          {\r                      this->source = "m_cgiirc.so";\r                  this->syntax = "password client hostname ip";\r          }\r              CmdResult Handle(const char** parameters, int pcnt, userrec *user)\r             {\r                      if(user->registered == REG_ALL)\r                                return CMD_FAILURE;\r                    \r                       for(CGIHostlist::iterator iter = Hosts.begin(); iter != Hosts.end(); iter++)\r                   {\r                              if(ServerInstance->MatchText(user->host, iter->hostmask) || ServerInstance->MatchText(user->GetIPString(), iter->hostmask))\r                            {\r                                      if(iter->type == WEBIRC && parameters[0] == iter->password)\r                                    {\r                                              user->Extend("cgiirc_realhost", new std::string(user->host));\r                                          user->Extend("cgiirc_realip", new std::string(user->GetIPString()));\r                                           if (notify)\r                                                    ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", user->nick, user->host, parameters[2], user->host);\r                                              user->Extend("cgiirc_webirc_hostname", new std::string(parameters[2]));\r                                                user->Extend("cgiirc_webirc_ip", new std::string(parameters[3]));\r                                              return CMD_LOCALONLY;\r                                  }\r                              }\r                      }\r                      return CMD_FAILURE;\r            }\r};\r\r\r/** Resolver for CGI:IRC hostnames encoded in ident/GECOS\r */\rclass CGIResolver : public Resolver\r{\r     std::string typ;\r       int theirfd;\r   userrec* them;\r bool notify;\r public:\r  CGIResolver(Module* me, InspIRCd* ServerInstance, bool NotifyOpers, const std::string &source, bool forward, userrec* u, int userfd, const std::string &type, bool &cached)\r            : Resolver(ServerInstance, source, forward ? DNS_QUERY_A : DNS_QUERY_PTR4, cached, me), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { }\r\r  virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)\r        {\r              /* Check the user still exists */\r              if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))\r           {\r                      if (notify)\r                            ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from %s", them->nick, them->host, result.c_str(), typ.c_str());\r\r                   strlcpy(them->host, result.c_str(), 63);\r                       strlcpy(them->dhost, result.c_str(), 63);\r                      strlcpy(them->ident, "~cgiirc", 8);\r                    them->InvalidateCache();\r               }\r      }\r\r     virtual void OnError(ResolverError e, const std::string &errormessage)\r {\r              if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))\r           {\r                      if (notify)\r                            ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but their host can't be resolved from their %s!", them->nick, them->host,typ.c_str());\r              }\r      }\r\r     virtual ~CGIResolver()\r {\r      }\r};\r\rclass ModuleCgiIRC : public Module\r{\r     cmd_webirc* mycommand;\r bool NotifyOpers;\r      CGIHostlist Hosts;\rpublic:\r     ModuleCgiIRC(InspIRCd* Me) : Module(Me)\r        {\r              \r               OnRehash(NULL,"");\r             mycommand=new cmd_webirc(Me, Hosts, NotifyOpers);\r              ServerInstance->AddCommand(mycommand);\r }\r\r     void Implements(char* List)\r    {\r              List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCleanup] = List[I_OnSyncUserMetaData] = List[I_OnDecodeMetaData] = List[I_OnUserQuit] = List[I_OnUserConnect] = 1;\r        }\r      \r       virtual Priority Prioritize()\r  {\r              // We want to get here before m_cloaking and m_hostchange etc\r          return PRIORITY_FIRST;\r }\r\r     virtual void OnRehash(userrec* user, const std::string &parameter)\r     {\r              ConfigReader Conf(ServerInstance);\r             \r               NotifyOpers = Conf.ReadFlag("cgiirc", "opernotice", 0); // If we send an oper notice when a CGI:IRC has their host changed.\r            \r               if(Conf.GetError() == CONF_VALUE_NOT_FOUND)\r                    NotifyOpers = true;\r            \r               for(int i = 0; i < Conf.Enumerate("cgihost"); i++)\r             {\r                      std::string hostmask = Conf.ReadValue("cgihost", "mask", i); // An allowed CGI:IRC host\r                        std::string type = Conf.ReadValue("cgihost", "type", i); // What type of user-munging we do on this host.\r                      std::string password = Conf.ReadValue("cgihost", "password", i);\r                       \r                       if(hostmask.length())\r                  {\r                              if(type == "webirc" && !password.length()) {\r                                           ServerInstance->Log(DEFAULT, "m_cgiirc: Missing password in config: %s", hostmask.c_str());\r                            } else {\r                                       CGItype cgitype;\r                                       if(type == "pass")\r                                             cgitype = PASS;\r                                        else if(type == "ident")\r                                               cgitype = IDENT;\r                                       else if(type == "passfirst")\r                                           cgitype = PASSFIRST;\r                                   else if(type == "webirc") {\r                                            cgitype = WEBIRC;\r                                      }\r                                      Hosts.push_back(CGIhost(hostmask,cgitype, password.length() ? password : "" ));\r                                }\r                      }\r                      else\r                   {\r                              ServerInstance->Log(DEFAULT, "m_cgiirc.so: Invalid <cgihost:mask> value in config: %s", hostmask.c_str());\r                             continue;\r                      }\r              }\r      }\r\r     virtual void OnCleanup(int target_type, void* item)\r    {\r              if(target_type == TYPE_USER)\r           {\r                      userrec* user = (userrec*)item;\r                        std::string* realhost;\r                 std::string* realip;\r                   \r                       if(user->GetExt("cgiirc_realhost", realhost))\r                  {\r                              delete realhost;\r                               user->Shrink("cgiirc_realhost");\r                       }\r                      \r                       if(user->GetExt("cgiirc_realip", realip))\r                      {\r                              delete realip;\r                         user->Shrink("cgiirc_realip");\r                 }\r              }\r      }\r      \r       virtual void OnSyncUserMetaData(userrec* user, Module* proto, void* opaque, const std::string &extname, bool displayable)\r      {\r              if((extname == "cgiirc_realhost") || (extname == "cgiirc_realip"))\r             {\r                      std::string* data;\r                     \r                       if(user->GetExt(extname, data))\r                        {\r                              proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, *data);\r                     }\r              }\r      }\r\r     virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata)\r   {\r              if(target_type == TYPE_USER)\r           {\r                      userrec* dest = (userrec*)target;\r                      std::string* bleh;\r                     if(((extname == "cgiirc_realhost") || (extname == "cgiirc_realip")) && (!dest->GetExt(extname, bleh)))\r                 {\r                              dest->Extend(extname, new std::string(extdata));\r                       }\r              }\r      }\r\r     virtual void OnUserQuit(userrec* user, const std::string &message, const std::string &oper_message)\r    {\r              OnCleanup(TYPE_USER, user);\r    }\r      \r\r      virtual int OnUserRegister(userrec* user)\r      {       \r               for(CGIHostlist::iterator iter = Hosts.begin(); iter != Hosts.end(); iter++)\r           {                       \r                       if(ServerInstance->MatchText(user->host, iter->hostmask) || ServerInstance->MatchText(user->GetIPString(), iter->hostmask))\r                    {\r                              // Deal with it...\r                             if(iter->type == PASS)\r                         {\r                                      CheckPass(user); // We do nothing if it fails so...\r                            }\r                              else if(iter->type == PASSFIRST && !CheckPass(user))\r                           {\r                                      // If the password lookup failed, try the ident\r                                        CheckIdent(user);       // If this fails too, do nothing\r                               }\r                              else if(iter->type == IDENT)\r                           {\r                                      CheckIdent(user); // Nothing on failure.\r                               }\r                              else if(iter->type == IDENTFIRST && !CheckIdent(user))\r                         {\r                                      // If the ident lookup fails, try the password.\r                                        CheckPass(user);\r                               }\r                              else if(iter->type == WEBIRC)\r                          {\r                                      // We don't need to do anything here\r                           }\r                              return 0;\r                      }\r              }\r              return 0;\r      }\r\r     virtual void OnUserConnect(userrec* user)\r      {\r              std::string *webirc_hostname, *webirc_ip;\r              if(user->GetExt("cgiirc_webirc_hostname", webirc_hostname))\r            {\r                      strlcpy(user->host,webirc_hostname->c_str(),63);\r                       strlcpy(user->dhost,webirc_hostname->c_str(),63);\r                      delete webirc_hostname;\r                        user->InvalidateCache();\r                       user->Shrink("cgiirc_webirc_hostname");\r                }\r              if(user->GetExt("cgiirc_webirc_ip", webirc_ip))\r                {\r                      bool valid=false;\r                      user->RemoveCloneCounts();\r#ifdef IPV6\r                 valid = (inet_pton(AF_INET6, webirc_ip->c_str(), &((sockaddr_in6*)user->ip)->sin6_addr) > 0); \r\r                        if(!valid)\r                             valid = (inet_aton(webirc_ip->c_str(), &((sockaddr_in*)user->ip)->sin_addr));\r#else\r                    if (inet_aton(webirc_ip->c_str(), &((sockaddr_in*)user->ip)->sin_addr))\r                                valid = true;\r#endif\r\r                  delete webirc_ip;\r                      user->InvalidateCache();\r                       user->Shrink("cgiirc_webirc_ip");\r                      ServerInstance->AddLocalClone(user);\r                   ServerInstance->AddGlobalClone(user);\r                  user->CheckClass();\r            }\r      }\r\r     bool CheckPass(userrec* user)\r  {\r              if(IsValidHost(user->password))\r                {\r                      user->Extend("cgiirc_realhost", new std::string(user->host));\r                  user->Extend("cgiirc_realip", new std::string(user->GetIPString()));\r                   strlcpy(user->host, user->password, 64);\r                       strlcpy(user->dhost, user->password, 64);\r                      user->InvalidateCache();\r\r                      bool valid = false;\r                    user->RemoveCloneCounts();\r#ifdef IPV6\r                 if (user->GetProtocolFamily() == AF_INET6)\r                             valid = (inet_pton(AF_INET6, user->password, &((sockaddr_in6*)user->ip)->sin6_addr) > 0);\r                      else\r                           valid = (inet_aton(user->password, &((sockaddr_in*)user->ip)->sin_addr));\r#else\r                        if (inet_aton(user->password, &((sockaddr_in*)user->ip)->sin_addr))\r                            valid = true;\r#endif\r                   ServerInstance->AddLocalClone(user);\r                   ServerInstance->AddGlobalClone(user);\r                  user->CheckClass();\r\r                   if (valid)\r                     {\r                              /* We were given a IP in the password, we don't do DNS so they get this is as their host as well. */\r                           if(NotifyOpers)\r                                        ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick, user->host, user->password);\r                       }\r                      else\r                   {\r                              /* We got as resolved hostname in the password. */\r                             try\r                            {\r\r                                     bool cached;\r                                   CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, user->password, false, user, user->GetFd(), "PASS", cached);\r                                       ServerInstance->AddResolver(r, cached);\r                                }\r                              catch (...)\r                            {\r                                      if (NotifyOpers)\r                                               ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but i could not resolve their hostname!", user->nick, user->host);\r                          }\r                      }\r                      \r                       *user->password = 0;\r\r                  /*if(NotifyOpers)\r                              ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick, user->host, user->password);*/\r\r                    return true;\r           }\r              \r               return false;\r  }\r      \r       bool CheckIdent(userrec* user)\r {\r              int ip[4];\r             char* ident;\r           char newip[16];\r                int len = strlen(user->ident);\r         \r               if(len == 8)\r                   ident = user->ident;\r           else if(len == 9 && *user->ident == '~')\r                       ident = user->ident+1;\r         else\r                   return false;\r  \r               for(int i = 0; i < 4; i++)\r                     if(!HexToInt(ip[i], ident + i*2))\r                              return false;\r\r         snprintf(newip, 16, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);\r                        \r               user->Extend("cgiirc_realhost", new std::string(user->host));\r          user->Extend("cgiirc_realip", new std::string(user->GetIPString()));\r           user->RemoveCloneCounts();\r#ifdef IPV6\r         if (user->GetProtocolFamily() == AF_INET6)\r                     inet_pton(AF_INET6, newip, &((sockaddr_in6*)user->ip)->sin6_addr);\r             else\r#endif\r            inet_aton(newip, &((sockaddr_in*)user->ip)->sin_addr);\r         ServerInstance->AddLocalClone(user);\r           ServerInstance->AddGlobalClone(user);\r          user->CheckClass();\r            try\r            {\r                      strlcpy(user->host, newip, 16);\r                        strlcpy(user->dhost, newip, 16);\r                       strlcpy(user->ident, "~cgiirc", 8);\r\r                   bool cached;\r                   CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, newip, false, user, user->GetFd(), "IDENT", cached);\r                       ServerInstance->AddResolver(r, cached);\r                }\r              catch (...)\r            {\r                      strlcpy(user->host, newip, 16);\r                        strlcpy(user->dhost, newip, 16);\r                       strlcpy(user->ident, "~cgiirc", 8);\r                    user->InvalidateCache();\r\r                      if(NotifyOpers)\r                                 ServerInstance->WriteOpers("*** Connecting user %s detected as using CGI:IRC (%s), but i could not resolve their hostname!", user->nick, user->host);\r         }\r              /*strlcpy(user->host, newip, 16);\r              strlcpy(user->dhost, newip, 16);\r               strlcpy(user->ident, "~cgiirc", 8);*/\r\r         return true;\r   }\r      \r       bool IsValidHost(const std::string &host)\r      {\r              if(!host.size())\r                       return false;\r  \r               for(unsigned int i = 0; i < host.size(); i++)\r          {\r                      if(     ((host[i] >= '0') && (host[i] <= '9')) ||\r                                      ((host[i] >= 'A') && (host[i] <= 'Z')) ||\r                                      ((host[i] >= 'a') && (host[i] <= 'z')) ||\r                                      ((host[i] == '-') && (i > 0) && (i+1 < host.size()) && (host[i-1] != '.') && (host[i+1] != '.')) ||\r                                    ((host[i] == '.') && (i > 0) && (i+1 < host.size())) )\r                                 \r                               continue;\r                      else\r                           return false;\r          }\r              \r               return true;\r   }\r\r     bool IsValidIP(const std::string &ip)\r  {\r              if(ip.size() < 7 || ip.size() > 15)\r                    return false;\r  \r               short sincedot = 0;\r            short dots = 0;\r        \r               for(unsigned int i = 0; i < ip.size(); i++)\r            {\r                      if((dots <= 3) && (sincedot <= 3))\r                     {\r                              if((ip[i] >= '0') && (ip[i] <= '9'))\r                           {\r                                      sincedot++;\r                            }\r                              else if(ip[i] == '.')\r                          {\r                                      sincedot = 0;\r                                  dots++;\r                                }\r                      }\r                      else\r                   {\r                              return false;\r                  \r                       }\r              }\r              \r               if(dots != 3)\r                  return false;\r          \r               return true;\r   }\r      \r       bool HexToInt(int &out, const char* in)\r        {\r              char ip[3];\r            ip[0] = in[0];\r         ip[1] = in[1];\r         ip[2] = 0;\r             out = strtol(ip, NULL, 16);\r            \r               if(out > 255 || out < 0)\r                       return false;\r\r         return true;\r   }\r      \r       virtual ~ModuleCgiIRC()\r        {\r      }\r       \r      virtual Version GetVersion()\r   {\r              return Version(1,1,0,0,VF_VENDOR,API_VERSION);\r }\r      \r};\r\rMODULE_INIT(ModuleCgiIRC)\r
\ No newline at end of file
+/*
+ * 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>
+ *
+ * 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/>.
+ */
+
+
+#include "inspircd.h"
+#include "xline.h"
+
+/* $ModDesc: Change user's hosts connecting from known CGI:IRC hosts */
+
+enum CGItype { PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC };
+
+
+/** Holds a CGI site's details
+ */
+class CGIhost
+{
+public:
+       std::string hostmask;
+       CGItype type;
+       std::string password;
+
+       CGIhost(const std::string &mask, CGItype t, const std::string &spassword)
+       : hostmask(mask), type(t), password(spassword)
+       {
+       }
+};
+typedef std::vector<CGIhost> CGIHostlist;
+
+/*
+ * WEBIRC
+ *  This is used for the webirc method of CGIIRC auth, and is (really) the best way to do these things.
+ *  Syntax: WEBIRC password client hostname ip
+ *  Where password is a shared key, client is the name of the "client" and version (e.g. cgiirc), hostname
+ *  is the resolved host of the client issuing the command and IP is the real IP of the client.
+ *
+ * How it works:
+ *  To tie in with the rest of cgiirc module, and to avoid race conditions, /webirc is only processed locally
+ *  and simply sets metadata on the user, which is later decoded on full connect to give something meaningful.
+ */
+class CommandWebirc : public Command
+{
+ public:
+       bool notify;
+       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)
+               {
+                       works_before_reg = true;
+                       this->syntax = "password client hostname ip";
+               }
+               CmdResult Handle(const std::vector<std::string> &parameters, User *user)
+               {
+                       if(user->registered == REG_ALL)
+                               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)
+                                       {
+                                               realhost.set(user, user->host);
+                                               realip.set(user, user->GetIPString());
+                                               if (notify)
+                                                       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(), parameters[2].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 (parameters[2].length() < 64)
+                                                       webirc_hostname.set(user, parameters[2]);
+                                               else
+                                                       webirc_hostname.unset(user);
+
+                                               webirc_ip.set(user, parameters[3]);
+                                               return CMD_SUCCESS;
+                                       }
+                               }
+                       }
+
+                       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;
+               }
+};
+
+
+/** Resolver for CGI:IRC hostnames encoded in ident/GECOS
+ */
+class CGIResolver : public Resolver
+{
+       std::string typ;
+       std::string theiruid;
+       LocalIntExt& waiting;
+       bool notify;
+ public:
+       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)
+       {
+       }
+
+       virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
+       {
+               /* Check the user still exists */
+               User* them = ServerInstance->FindUUID(theiruid);
+               if ((them) && (!them->quitting))
+               {
+                       if (notify)
+                               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());
+
+                       if (result.length() > 64)
+                               return;
+                       them->host = result;
+                       them->dhost = result;
+                       them->InvalidateCache();
+                       them->CheckLines(true);
+               }
+       }
+
+       virtual void OnError(ResolverError e, const std::string &errormessage)
+       {
+               if (!notify)
+                       return;
+
+               User* them = ServerInstance->FindUUID(theiruid);
+               if ((them) && (!them->quitting))
+               {
+                       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 cmd;
+       LocalIntExt waiting;
+
+       static void RecheckElineAndClass(LocalUser* user)
+       {
+               user->exempt = (ServerInstance->XLines->MatchesLine("E", user) != NULL);
+               user->SetClass();
+               user->CheckClass();
+       }
+
+       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();
+               RecheckElineAndClass(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;
+
+               try
+               {
+                       bool cached;
+                       CGIResolver* r = new CGIResolver(this, cmd.notify, newip, user, (was_pass ? "PASS" : "IDENT"), cached, waiting);
+                       ServerInstance->AddResolver(r, cached);
+                       waiting.set(user, waiting.get(user) + 1);
+               }
+               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)
+       {
+       }
+
+       void init()
+       {
+               OnRehash(NULL);
+               ServerInstance->AddCommand(&cmd);
+               ServerInstance->Extensions.Register(&cmd.realhost);
+               ServerInstance->Extensions.Register(&cmd.realip);
+               ServerInstance->Extensions.Register(&cmd.webirc_hostname);
+               ServerInstance->Extensions.Register(&cmd.webirc_ip);
+               ServerInstance->Extensions.Register(&waiting);
+
+               Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCheckReady };
+               ServerInstance->Modules->Attach(eventlist, this, 3);
+       }
+
+       void OnRehash(User* user)
+       {
+               cmd.Hosts.clear();
+
+               // Do we send an oper notice when a CGI:IRC has their host changed?
+               cmd.notify = ServerInstance->Config->ConfValue("cgiirc")->getBool("opernotice", true);
+
+               ConfigTagList tags = ServerInstance->Config->ConfTags("cgihost");
+               for (ConfigIter i = tags.first; i != tags.second; ++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.empty())
+                               {
+                                       ServerInstance->Logs->Log("CONFIG",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;
+                                       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());
+                                       }
+
+                                       cmd.Hosts.push_back(CGIhost(hostmask, cgitype, password));
+                               }
+                       }
+                       else
+                       {
+                               ServerInstance->Logs->Log("CONFIG",DEFAULT, "m_cgiirc.so: Invalid <cgihost:mask> value in config: %s", hostmask.c_str());
+                               continue;
+                       }
+               }
+       }
+
+       ModResult OnCheckReady(LocalUser *user)
+       {
+               if (waiting.get(user))
+                       return MOD_RES_DENY;
+
+               std::string *webirc_ip = cmd.webirc_ip.get(user);
+               if (!webirc_ip)
+                       return MOD_RES_PASSTHRU;
+
+               ChangeIP(user, *webirc_ip);
+
+               std::string* webirc_hostname = cmd.webirc_hostname.get(user);
+               user->host = user->dhost = (webirc_hostname ? *webirc_hostname : user->GetIPString());
+
+               RecheckElineAndClass(user);
+               if (user->quitting)
+                       return MOD_RES_DENY;
+
+               user->CheckLines(true);
+               if (user->quitting)
+                       return MOD_RES_DENY;
+
+               cmd.webirc_hostname.unset(user);
+               cmd.webirc_ip.unset(user);
+
+               return MOD_RES_PASSTHRU;
+       }
+
+       ModResult OnUserRegister(LocalUser* user)
+       {
+               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))
+                       {
+                               // Deal with it...
+                               if(iter->type == PASS)
+                               {
+                                       CheckPass(user); // We do nothing if it fails so...
+                                       user->CheckLines(true);
+                               }
+                               else if(iter->type == PASSFIRST && !CheckPass(user))
+                               {
+                                       // If the password lookup failed, try the ident
+                                       CheckIdent(user);       // If this fails too, do nothing
+                                       user->CheckLines(true);
+                               }
+                               else if(iter->type == IDENT)
+                               {
+                                       CheckIdent(user); // Nothing on failure.
+                                       user->CheckLines(true);
+                               }
+                               else if(iter->type == IDENTFIRST && !CheckIdent(user))
+                               {
+                                       // If the ident lookup fails, try the password.
+                                       CheckPass(user);
+                                       user->CheckLines(true);
+                               }
+                               else if(iter->type == WEBIRC)
+                               {
+                                       // We don't need to do anything here
+                               }
+                               return MOD_RES_PASSTHRU;
+                       }
+               }
+               return MOD_RES_PASSTHRU;
+       }
+
+       bool CheckPass(LocalUser* user)
+       {
+               if(IsValidHost(user->password))
+               {
+                       HandleIdentOrPass(user, user->password, true);
+                       user->password.clear();
+                       return true;
+               }
+
+               return false;
+       }
+
+       bool CheckIdent(LocalUser* user)
+       {
+               const char* ident;
+               in_addr newip;
+
+               if (user->ident.length() == 8)
+                       ident = user->ident.c_str();
+               else if (user->ident.length() == 9 && user->ident[0] == '~')
+                       ident = user->ident.c_str() + 1;
+               else
+                       return false;
+
+               errno = 0;
+               unsigned long ipaddr = strtoul(ident, NULL, 16);
+               if (errno)
+                       return false;
+               newip.s_addr = htonl(ipaddr);
+               std::string newipstr(inet_ntoa(newip));
+
+               user->ident = "~cgiirc";
+               HandleIdentOrPass(user, newipstr, false);
+
+               return true;
+       }
+
+       bool IsValidHost(const std::string &host)
+       {
+               if(!host.size() || host.size() > 64)
+                       return false;
+
+               for(unsigned int i = 0; i < host.size(); i++)
+               {
+                       if(     ((host[i] >= '0') && (host[i] <= '9')) ||
+                                       ((host[i] >= 'A') && (host[i] <= 'Z')) ||
+                                       ((host[i] >= 'a') && (host[i] <= 'z')) ||
+                                       ((host[i] == '-') && (i > 0) && (i+1 < host.size()) && (host[i-1] != '.') && (host[i+1] != '.')) ||
+                                       ((host[i] == '.') && (i > 0) && (i+1 < host.size())) )
+
+                               continue;
+                       else
+                               return false;
+               }
+
+               return true;
+       }
+
+       virtual Version GetVersion()
+       {
+               return Version("Change user's hosts connecting from known CGI:IRC hosts",VF_VENDOR);
+       }
+
+};
+
+MODULE_INIT(ModuleCgiIRC)