]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_ident.cpp
Include explicit routing information in Command, will replace CMD_LOCALONLY return...
[user/henk/code/inspircd.git] / src / modules / m_ident.cpp
index bf71f81898eedbcc71e75e1288877138651cde49..80f2c0b996ab847ae31578578b1da65984b08d45 100644 (file)
@@ -1 +1,425 @@
-/*       +------------------------------------+\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 "channels.h"\r#include "modules.h"\r\r/* $ModDesc: Provides support for RFC 1413 ident lookups */\r\r// Version 1.5.0.0 - Updated to use InspSocket, faster and neater.\r\r/** Handles RFC1413 ident connections to users\r */\rclass RFC1413 : public InspSocket\r{\r protected:\r  socklen_t uslen;         // length of our port number\r  socklen_t themlen;       // length of their port number\r        char ident_request[128]; // buffer used to make up the request string\r public:\r\r        userrec* u;              // user record that the lookup is associated with\r     int ufd;\r\r      RFC1413(InspIRCd* SI, userrec* user, int maxtime, const std::string &bindto) : InspSocket(SI, user->GetIPString(), 113, false, maxtime, bindto), u(user)\r       {\r              ufd = user->GetFd();\r   }\r\r     virtual void OnTimeout()\r       {\r              // When we timeout, the connection failed within the allowed timeframe,\r                // so we just display a notice, and tidy off the ident_data.\r           if (u && (Instance->SE->GetRef(ufd) == u))\r             {\r                      u->Shrink("ident_data");\r                       Instance->next_call = Instance->Time();\r                }\r      }\r\r     virtual bool OnDataReady()\r     {\r              char* ibuf = this->Read();\r             if (ibuf)\r              {\r                      char* savept;\r                  char* section = strtok_r(ibuf,":",&savept);\r                    while (section)\r                        {\r                              if (strstr(section,"USERID"))\r                          {\r                                      section = strtok_r(NULL,":",&savept);\r                                  if (section)\r                                   {\r                                              // ID type, usually UNIX or OTHER... we dont want it, so read the next token\r                                           section = strtok_r(NULL,":",&savept);\r                                          if (section)\r                                           {\r                                                      while (*section == ' ') section++; // strip leading spaces\r                                                     for (char* j = section; *j; j++)\r                                                       if ((*j < 33) || (*j > 126))\r                                                           *j = '\0'; // truncate at invalid chars\r                                                        if (*section)\r                                                  {\r                                                              if (u && (Instance->SE->GetRef(ufd) == u))\r                                                             {\r                                                                      if (this->Instance->IsIdent(section))\r                                                                  {\r                                                                              u->Extend("IDENT", new std::string(std::string(section) + "," + std::string(u->ident)));\r                                                                               strlcpy(u->ident,section,IDENTMAX);\r                                                                            u->WriteServ("NOTICE "+std::string(u->nick)+" :*** Found your ident: "+std::string(u->ident));\r                                                                 }\r                                                              }\r                                                      }\r                                                      return false;\r                                          }\r                                      }\r                              }\r                              section = strtok_r(NULL,":",&savept);\r                  }\r              }\r              return false;\r  }\r\r     virtual void OnClose()\r {\r              // tidy up after ourselves when the connection is done.\r                // We receive this event straight after a timeout, too.\r                //\r             //\r             // OK, now listen up. The weird looking check here is\r          // REQUIRED. Don't try and optimize it away.\r           //\r             // When a socket is closed, it is not immediately removed\r              // from the socket list, there can be a short delay\r            // before it is culled from the list. This means that\r          // without this check, there is a chance that a user\r           // may not exist when we come to ::Shrink them, which\r          // results in a segfault. The value of "u" may not\r             // always be NULL at this point, so, what we do is\r             // check against the fd_ref_table, to see if (1) the user\r              // exists, and (2) its the SAME user, on the same file\r         // descriptor that they were when the lookup began.\r            //\r             // Fixes issue reported by webs, 7 Jun 2006\r            if (u && (Instance->SE->GetRef(ufd) == u))\r             {\r                      Instance->next_call = Instance->Time();\r                        u->Shrink("ident_data");\r               }\r      }\r\r     virtual void OnError(InspSocketError e)\r        {\r              if (u && (Instance->SE->GetRef(ufd) == u))\r             {\r                      if (*u->ident == '~')\r                          u->WriteServ("NOTICE "+std::string(u->nick)+" :*** Could not find your ident, using "+std::string(u->ident)+" instead.");\r\r                     Instance->next_call = Instance->Time();\r                        u->Shrink("ident_data");\r               }\r      }\r\r     virtual bool OnConnected()\r     {\r              if (u && (Instance->SE->GetRef(ufd) == u))\r             {\r                      sockaddr* sock_us = new sockaddr[2];\r                   sockaddr* sock_them = new sockaddr[2];\r                 bool success = false;\r                  uslen = sizeof(sockaddr_in);\r                   themlen = sizeof(sockaddr_in);\r#ifdef IPV6\r                     if (this->u->GetProtocolFamily() == AF_INET6)\r                  {\r                              themlen = sizeof(sockaddr_in6);\r                                uslen = sizeof(sockaddr_in6);\r                  }\r#endif\r                       success = ((getsockname(this->u->GetFd(),sock_us,&uslen) || getpeername(this->u->GetFd(), sock_them, &themlen)));\r                      if (success)\r                   {\r                              delete[] sock_us;\r                              delete[] sock_them;\r                            return false;\r                  }\r                      else\r                   {\r                              // send the request in the following format: theirsocket,oursocket\r#ifdef IPV6\r                         if (this->u->GetProtocolFamily() == AF_INET6)\r                                  snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in6*)sock_them)->sin6_port),ntohs(((sockaddr_in6*)sock_us)->sin6_port));\r                               else\r#endif\r                            snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in*)sock_them)->sin_port),ntohs(((sockaddr_in*)sock_us)->sin_port));\r                           this->Write(ident_request);\r                            delete[] sock_us;\r                              delete[] sock_them;\r                            return true;\r                   }\r              }\r              else\r           {\r                      Instance->next_call = Instance->Time();\r                        return true;\r           }\r      }\r};\r\rclass ModuleIdent : public Module\r{\r\r     ConfigReader* Conf;\r    int IdentTimeout;\r      std::string PortBind;\r\r public:\r        void ReadSettings()\r    {\r              Conf = new ConfigReader(ServerInstance);\r               IdentTimeout = Conf->ReadInteger("ident", "timeout", 0, true);\r         PortBind = Conf->ReadValue("ident", "bind", 0);\r                if (!IdentTimeout)\r                     IdentTimeout = 1;\r              DELETE(Conf);\r  }\r\r     ModuleIdent(InspIRCd* Me)\r              : Module(Me)\r   {\r\r             ReadSettings();\r        }\r\r     void Implements(char* List)\r    {\r              List[I_OnCleanup] = List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnUserDisconnect] = 1;\r   }\r\r     void OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable)\r       {\r              if ((displayable) && (extname == "IDENT"))\r             {\r                      std::string* ident;\r                    if (GetExt("IDENT", ident))\r                            proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, *ident);\r            }\r      }\r\r\r    virtual void OnRehash(userrec* user, const std::string &parameter)\r     {\r              ReadSettings();\r        }\r\r     virtual int OnUserRegister(userrec* user)\r      {\r              /*\r              * when the new user connects, before they authenticate with USER/NICK/PASS, we do\r              * their ident lookup. We do this by instantiating an object of type RFC1413, which\r             * is derived from InspSocket, and inserting it into the socket engine using the\r                * Server::AddSocket() call.\r            */\r            char newident[MAXBUF];\r         strcpy(newident,"~");\r          strlcat(newident,user->ident,IDENTMAX);\r                strlcpy(user->ident,newident,IDENTMAX);\r                \r\r              user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Looking up your ident...");\r           RFC1413* ident = new RFC1413(ServerInstance, user, IdentTimeout, PortBind);\r            if ((ident->GetState() == I_CONNECTING) || (ident->GetState() == I_CONNECTED))\r         {\r                      user->Extend("ident_data", (char*)ident);\r              }\r              else\r           {\r                      user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not find your ident, using "+std::string(user->ident)+" instead.");\r                     ServerInstance->next_call = ServerInstance->Time();\r            }\r              return 0;\r      }\r\r     virtual bool OnCheckReady(userrec* user)\r       {\r              /*\r              * The socket engine will clean up their ident request for us when it completes,\r                * either due to timeout or due to closing, so, we just hold them until they dont\r               * have an ident field any more.\r                */\r            RFC1413* ident;\r                return (!user->GetExt("ident_data", ident));\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                        RFC1413* ident;\r                        std::string* identstr;\r                 if (user->GetExt("ident_data", ident))\r                 {\r                              // FIX: If the user record is deleted, the socket wont be removed\r                              // immediately so there is chance of the socket trying to write to\r                             // a user which has now vanished! To prevent this, set ident::u\r                                // to NULL and check it so that we dont write users who have gone away.\r                                ident->u = NULL;\r                               ServerInstance->SE->DelFd(ident);\r                              //delete ident;\r                        }\r                      if (user->GetExt("IDENT", identstr))\r                   {\r                              delete identstr;\r                       }\r              }\r      }\r\r     virtual void OnUserDisconnect(userrec* user)\r   {\r              /*\r              * when the user quits tidy up any ident lookup they have pending to keep things tidy.\r          * When we call RemoveSocket, the abstractions tied into the system evnetually work their\r               * way to RFC1459::OnClose(), which shrinks off the ident_data for us, so we dont need\r          * to do it here. If we don't tidy this up, there may still be lingering idents for users\r               * who have quit, as class RFC1459 is only loosely bound to userrec* via a pair of pointers\r             * and this would leave at least one of the invalid ;)\r          */\r            RFC1413* ident;\r                std::string* identstr;\r         if (user->GetExt("ident_data", ident))\r         {\r                      ident->u = NULL;\r                       ServerInstance->SE->DelFd(ident);\r              }\r              if (user->GetExt("IDENT", identstr))\r           {\r                      delete identstr;\r               }\r      }\r\r     virtual ~ModuleIdent()\r {\r              ServerInstance->next_call = ServerInstance->Time();\r    }\r\r     virtual Version GetVersion()\r   {\r              return Version(1,1,0,0,VF_VENDOR,API_VERSION);\r }\r\r};\r\rMODULE_INIT(ModuleIdent)\r
\ No newline at end of file
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ *         the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
+
+/* $ModDesc: Provides support for RFC1413 ident lookups */
+
+/* --------------------------------------------------------------
+ * Note that this is the third incarnation of m_ident. The first
+ * two attempts were pretty crashy, mainly due to the fact we tried
+ * to use InspSocket/BufferedSocket to make them work. This class
+ * is ok for more heavyweight tasks, it does a lot of things behind
+ * the scenes that are not good for ident sockets and it has a huge
+ * memory footprint!
+ *
+ * To fix all the issues that we had in the old ident modules (many
+ * nasty race conditions that would cause segfaults etc) we have
+ * rewritten this module to use a simplified socket object based
+ * directly off EventHandler. As EventHandler only has low level
+ * readability, writeability and error events tied directly to the
+ * socket engine, this makes our lives easier as nothing happens to
+ * our ident lookup class that is outside of this module, or out-
+ * side of the control of the class. There are no timers, internal
+ * events, or such, which will cause the socket to be deleted,
+ * queued for deletion, etc. In fact, theres not even any queueing!
+ *
+ * Using this framework we have a much more stable module.
+ *
+ * A few things to note:
+ *
+ *   O  The only place that may *delete* an active or inactive
+ *      ident socket is OnUserDisconnect in the module class.
+ *      Because this is out of scope of the socket class there is
+ *      no possibility that the socket may ever try to delete
+ *      itself.
+ *
+ *   O  Closure of the ident socket with the Close() method will
+ *      not cause removal of the socket from memory or detatchment
+ *      from its 'parent' User class. It will only flag it as an
+ *      inactive socket in the socket engine.
+ *
+ *   O  Timeouts are handled in OnCheckReaady at the same time as
+ *      checking if the ident socket has a result. This is done
+ *      by checking if the age the of the class (its instantiation
+ *      time) plus the timeout value is greater than the current time.
+ *
+ *  O   The ident socket is able to but should not modify its
+ *      'parent' user directly. Instead the ident socket class sets
+ *      a completion flag and during the next call to OnCheckReady,
+ *      the completion flag will be checked and any result copied to
+ *      that user's class. This again ensures a single point of socket
+ *      deletion for safer, neater code.
+ *
+ *  O   The code in the constructor of the ident socket is taken from
+ *      BufferedSocket but majorly thinned down. It works for both
+ *      IPv4 and IPv6.
+ *
+ *  O   In the event that the ident socket throws a ModuleException,
+ *      nothing is done. This is counted as total and complete
+ *      failure to create a connection.
+ * --------------------------------------------------------------
+ */
+
+class IdentRequestSocket : public EventHandler
+{
+ private:
+       User *user;                     /* User we are attached to */
+       InspIRCd* ServerInstance;       /* Server instance */
+       bool done;                      /* True if lookup is finished */
+       std::string result;             /* Holds the ident string if done */
+ public:
+
+       IdentRequestSocket(InspIRCd *Server, User* u) : user(u), ServerInstance(Server), result(u->ident)
+       {
+               socklen_t size = 0;
+
+               SetFd(socket(user->server_sa.sa.sa_family, SOCK_STREAM, 0));
+
+               if (GetFd() == -1)
+                       throw ModuleException("Could not create socket");
+
+               done = false;
+
+               irc::sockets::sockaddrs bindaddr;
+               irc::sockets::sockaddrs connaddr;
+
+               memcpy(&bindaddr, &user->server_sa, sizeof(bindaddr));
+               memcpy(&connaddr, &user->client_sa, sizeof(connaddr));
+
+               if (connaddr.sa.sa_family == AF_INET6)
+               {
+                       bindaddr.in6.sin6_port = 0;
+                       connaddr.in6.sin6_port = htons(113);
+               }
+               else
+               {
+                       bindaddr.in4.sin_port = 0;
+                       connaddr.in4.sin_port = htons(113);
+               }
+
+               /* Attempt to bind (ident requests must come from the ip the query is referring to */
+               if (ServerInstance->SE->Bind(GetFd(), &bindaddr.sa, size) < 0)
+               {
+                       this->Close();
+                       throw ModuleException("failed to bind()");
+               }
+
+               ServerInstance->SE->NonBlocking(GetFd());
+
+               /* Attempt connection (nonblocking) */
+               if (ServerInstance->SE->Connect(this, &connaddr.sa, size) == -1 && errno != EINPROGRESS)
+               {
+                       this->Close();
+                       throw ModuleException("connect() failed");
+               }
+
+               /* Add fd to socket engine */
+               if (!ServerInstance->SE->AddFd(this))
+               {
+                       this->Close();
+                       throw ModuleException("out of fds");
+               }
+
+               /* Important: We set WantWrite immediately after connect()
+                * because a successful connection will trigger a writability event
+                */
+               ServerInstance->SE->WantWrite(this);
+       }
+
+       virtual void OnConnected()
+       {
+               ServerInstance->Logs->Log("m_ident",DEBUG,"OnConnected()");
+
+               char req[32];
+
+               /* Build request in the form 'localport,remoteport\r\n' */
+               int req_size;
+               if (user->client_sa.sa.sa_family == AF_INET6)
+                       req_size = snprintf(req, sizeof(req), "%d,%d\r\n",
+                               ntohs(user->client_sa.in6.sin6_port), ntohs(user->server_sa.in6.sin6_port));
+               else
+                       req_size = snprintf(req, sizeof(req), "%d,%d\r\n",
+                               ntohs(user->client_sa.in4.sin_port), ntohs(user->server_sa.in4.sin_port));
+
+               /* Send failed if we didnt write the whole ident request --
+                * might as well give up if this happens!
+                */
+               if (ServerInstance->SE->Send(this, req, req_size, 0) < req_size)
+                       done = true;
+       }
+
+       virtual void HandleEvent(EventType et, int errornum = 0)
+       {
+               switch (et)
+               {
+                       case EVENT_READ:
+                               /* fd readable event, received ident response */
+                               ReadResponse();
+                       break;
+                       case EVENT_WRITE:
+                               /* fd writeable event, successfully connected! */
+                               OnConnected();
+                       break;
+                       case EVENT_ERROR:
+                               /* fd error event, ohshi- */
+                               ServerInstance->Logs->Log("m_ident",DEBUG,"EVENT_ERROR");
+                               /* We *must* Close() here immediately or we get a
+                                * huge storm of EVENT_ERROR events!
+                                */
+                               Close();
+                               done = true;
+                       break;
+               }
+       }
+
+       void Close()
+       {
+               /* Remove ident socket from engine, and close it, but dont detatch it
+                * from its parent user class, or attempt to delete its memory.
+                */
+               if (GetFd() > -1)
+               {
+                       ServerInstance->Logs->Log("m_ident",DEBUG,"Close ident socket %d", GetFd());
+                       ServerInstance->SE->DelFd(this);
+                       ServerInstance->SE->Close(GetFd());
+                       ServerInstance->SE->Shutdown(GetFd(), SHUT_WR);
+                       this->SetFd(-1);
+               }
+       }
+
+       bool HasResult()
+       {
+               return done;
+       }
+
+       /* Note: if the lookup succeeded, will contain 'ident', otherwise
+        * will contain '~ident'. Use *GetResult() to determine lookup success.
+        */
+       const char* GetResult()
+       {
+               return result.c_str();
+       }
+
+       void ReadResponse()
+       {
+               /* We don't really need to buffer for incomplete replies here, since IDENT replies are
+                * extremely short - there is *no* sane reason it'd be in more than one packet
+                */
+               char ibuf[MAXBUF];
+               int recvresult = ServerInstance->SE->Recv(this, ibuf, MAXBUF-1, 0);
+
+               /* Cant possibly be a valid response shorter than 3 chars,
+                * because the shortest possible response would look like: '1,1'
+                */
+               if (recvresult < 3)
+               {
+                       Close();
+                       done = true;
+                       return;
+               }
+
+               ServerInstance->Logs->Log("m_ident",DEBUG,"ReadResponse()");
+
+               irc::sepstream sep(ibuf, ':');
+               std::string token;
+               for (int i = 0; sep.GetToken(token); i++)
+               {
+                       /* We only really care about the 4th portion */
+                       if (i < 3)
+                               continue;
+
+                       std::string ident;
+
+                       /* Truncate the ident at any characters we don't like, skip leading spaces */
+                       size_t k = 0;
+                       for (const char *j = token.c_str(); *j && (k < ServerInstance->Config->Limits.IdentMax + 1); j++)
+                       {
+                               if (*j == ' ')
+                                       continue;
+
+                               /* Rules taken from InspIRCd::IsIdent */
+                               if (((*j >= 'A') && (*j <= '}')) || ((*j >= '0') && (*j <= '9')) || (*j == '-') || (*j == '.'))
+                               {
+                                       ident += *j;
+                                       continue;
+                               }
+
+                               break;
+                       }
+
+                       /* Re-check with IsIdent, in case that changes and this doesn't (paranoia!) */
+                       if (!ident.empty() && ServerInstance->IsIdent(ident.c_str()))
+                       {
+                               result = ident;
+                       }
+
+                       break;
+               }
+
+               /* Close (but dont delete from memory) our socket
+                * and flag as done
+                */
+               Close();
+               done = true;
+               return;
+       }
+};
+
+class ModuleIdent : public Module
+{
+ private:
+       int RequestTimeout;
+       ConfigReader *Conf;
+ public:
+       ModuleIdent(InspIRCd *Me) : Module(Me)
+       {
+               Conf = new ConfigReader(ServerInstance);
+               OnRehash(NULL);
+               Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCheckReady, I_OnCleanup, I_OnUserDisconnect };
+               ServerInstance->Modules->Attach(eventlist, this, 5);
+       }
+
+       ~ModuleIdent()
+       {
+               delete Conf;
+       }
+
+       virtual Version GetVersion()
+       {
+               return Version("$Id$", VF_VENDOR, API_VERSION);
+       }
+
+       virtual void OnRehash(User *user)
+       {
+               delete Conf;
+               Conf = new ConfigReader(ServerInstance);
+
+               RequestTimeout = Conf->ReadInteger("ident", "timeout", 0, true);
+               if (!RequestTimeout)
+                       RequestTimeout = 5;
+       }
+
+       virtual int OnUserRegister(User *user)
+       {
+               for (int j = 0; j < Conf->Enumerate("connect"); j++)
+               {
+                       std::string hostn = Conf->ReadValue("connect","allow",j);
+                       /* XXX: Fixme: does not respect port, limit, etc */
+                       if ((InspIRCd::MatchCIDR(user->GetIPString(),hostn, ascii_case_insensitive_map)) || (InspIRCd::Match(user->host,hostn, ascii_case_insensitive_map)))
+                       {
+                               bool useident = Conf->ReadFlag("connect", "useident", "yes", j);
+
+                               if (!useident)
+                                       return 0;
+                       }
+               }
+
+               /* User::ident is currently the username field from USER; with m_ident loaded, that
+                * should be preceded by a ~. The field is actually IdentMax+2 characters wide. */
+               if (user->ident.length() > ServerInstance->Config->Limits.IdentMax + 1)
+                       user->ident.assign(user->ident, 0, ServerInstance->Config->Limits.IdentMax);
+               user->ident.insert(0, "~");
+
+               user->WriteServ("NOTICE Auth :*** Looking up your ident...");
+
+               try
+               {
+                       IdentRequestSocket *isock = new IdentRequestSocket(ServerInstance, user);
+                       user->Extend("ident_socket", isock);
+               }
+               catch (ModuleException &e)
+               {
+                       ServerInstance->Logs->Log("m_ident",DEBUG,"Ident exception: %s", e.GetReason());
+               }
+
+               return 0;
+       }
+
+       /* This triggers pretty regularly, we can use it in preference to
+        * creating a Timer object and especially better than creating a
+        * Timer per ident lookup!
+        */
+       virtual bool OnCheckReady(User *user)
+       {
+               /* Does user have an ident socket attached at all? */
+               IdentRequestSocket *isock = NULL;
+               if (!user->GetExt("ident_socket", isock))
+               {
+                       ServerInstance->Logs->Log("m_ident",DEBUG, "No ident socket :(");
+                       return true;
+               }
+
+               ServerInstance->Logs->Log("m_ident",DEBUG, "Has ident_socket");
+
+               time_t compare = isock->age;
+               compare += RequestTimeout;
+
+               /* Check for timeout of the socket */
+               if (ServerInstance->Time() >= compare)
+               {
+                       /* Ident timeout */
+                       user->WriteServ("NOTICE Auth :*** Ident request timed out.");
+                       ServerInstance->Logs->Log("m_ident",DEBUG, "Timeout");
+                       /* The user isnt actually disconnecting,
+                        * we call this to clean up the user
+                        */
+                       OnUserDisconnect(user);
+                       return true;
+               }
+
+               /* Got a result yet? */
+               if (!isock->HasResult())
+               {
+                       ServerInstance->Logs->Log("m_ident",DEBUG, "No result yet");
+                       return false;
+               }
+
+               ServerInstance->Logs->Log("m_ident",DEBUG, "Yay, result!");
+
+               /* wooo, got a result (it will be good, or bad) */
+               if (*(isock->GetResult()) != '~')
+                       user->WriteServ("NOTICE Auth :*** Found your ident, '%s'", isock->GetResult());
+               else
+                       user->WriteServ("NOTICE Auth :*** Could not find your ident, using %s instead.", isock->GetResult());
+
+               /* Copy the ident string to the user */
+               user->ChangeIdent(isock->GetResult());
+
+               /* The user isnt actually disconnecting, we call this to clean up the user */
+               OnUserDisconnect(user);
+               return true;
+       }
+
+       virtual void OnCleanup(int target_type, void *item)
+       {
+               /* Module unloading, tidy up users */
+               if (target_type == TYPE_USER)
+                       OnUserDisconnect((User*)item);
+       }
+
+       virtual void OnUserDisconnect(User *user)
+       {
+               /* User disconnect (generic socket detatch event) */
+               IdentRequestSocket *isock = NULL;
+               if (user->GetExt("ident_socket", isock))
+               {
+                       isock->Close();
+                       delete isock;
+                       user->Shrink("ident_socket");
+               }
+       }
+};
+
+MODULE_INIT(ModuleIdent)
+