]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_ident.cpp
Fix potential for duplicate SID if the SID is auto generated.
[user/henk/code/inspircd.git] / src / modules / m_ident.cpp
index bf71f81898eedbcc71e75e1288877138651cde49..0fef4d33b984a33c22108c090edffbcf58b6ffca 100644 (file)
@@ -1 +1,322 @@
-/*       +------------------------------------+\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-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#include "inspircd.h"
+
+/* $ModDesc: Provides support for RFC 1413 ident lookups */
+
+// Version 1.5.0.0 - Updated to use InspSocket, faster and neater.
+
+/** Handles RFC1413 ident connections to users
+ */
+class RFC1413 : public InspSocket
+{
+ protected:
+       socklen_t uslen;         // length of our port number
+       socklen_t themlen;       // length of their port number
+       char ident_request[128]; // buffer used to make up the request string
+ public:
+
+       userrec* u;              // user record that the lookup is associated with
+       int ufd;
+
+       RFC1413(InspIRCd* SI, userrec* user, int maxtime, const std::string &bindto) : InspSocket(SI, user->GetIPString(), 113, false, maxtime, bindto), u(user)
+       {
+               ufd = user->GetFd();
+       }
+
+       virtual void OnTimeout()
+       {
+               // When we timeout, the connection failed within the allowed timeframe,
+               // so we just display a notice, and tidy off the ident_data.
+               if (u && (Instance->SE->GetRef(ufd) == u))
+               {
+                       u->Shrink("ident_data");
+                       Instance->next_call = Instance->Time();
+               }
+       }
+
+       virtual bool OnDataReady()
+       {
+               char* ibuf = this->Read();
+               if (ibuf)
+               {
+                       char* savept;
+                       char* section = strtok_r(ibuf,":",&savept);
+                       while (section)
+                       {
+                               if (strstr(section,"USERID"))
+                               {
+                                       section = strtok_r(NULL,":",&savept);
+                                       if (section)
+                                       {
+                                               // ID type, usually UNIX or OTHER... we dont want it, so read the next token
+                                               section = strtok_r(NULL,":",&savept);
+                                               if (section)
+                                               {
+                                                       while (*section == ' ') section++; // strip leading spaces
+                                                       for (char* j = section; *j; j++)
+                                                       if ((*j < 33) || (*j > 126))
+                                                               *j = '\0'; // truncate at invalid chars
+                                                       if (*section)
+                                                       {
+                                                               if (u && (Instance->SE->GetRef(ufd) == u))
+                                                               {
+                                                                       if (this->Instance->IsIdent(section))
+                                                                       {
+                                                                               u->Extend("IDENT", new std::string(std::string(section) + "," + std::string(u->ident)));
+                                                                               strlcpy(u->ident,section,IDENTMAX);
+                                                                               u->WriteServ("NOTICE "+std::string(u->nick)+" :*** Found your ident: "+std::string(u->ident));
+                                                                       }
+                                                               }
+                                                       }
+                                                       return false;
+                                               }
+                                       }
+                               }
+                               section = strtok_r(NULL,":",&savept);
+                       }
+               }
+               return false;
+       }
+
+       virtual void OnClose()
+       {
+               // tidy up after ourselves when the connection is done.
+               // We receive this event straight after a timeout, too.
+               //
+               //
+               // OK, now listen up. The weird looking check here is
+               // REQUIRED. Don't try and optimize it away.
+               //
+               // When a socket is closed, it is not immediately removed
+               // from the socket list, there can be a short delay
+               // before it is culled from the list. This means that
+               // without this check, there is a chance that a user
+               // may not exist when we come to ::Shrink them, which
+               // results in a segfault. The value of "u" may not
+               // always be NULL at this point, so, what we do is
+               // check against the fd_ref_table, to see if (1) the user
+               // exists, and (2) its the SAME user, on the same file
+               // descriptor that they were when the lookup began.
+               //
+               // Fixes issue reported by webs, 7 Jun 2006
+               if (u && (Instance->SE->GetRef(ufd) == u))
+               {
+                       Instance->next_call = Instance->Time();
+                       u->Shrink("ident_data");
+               }
+       }
+
+       virtual void OnError(InspSocketError e)
+       {
+               if (u && (Instance->SE->GetRef(ufd) == u))
+               {
+                       if (*u->ident == '~')
+                               u->WriteServ("NOTICE "+std::string(u->nick)+" :*** Could not find your ident, using "+std::string(u->ident)+" instead.");
+
+                       Instance->next_call = Instance->Time();
+                       u->Shrink("ident_data");
+               }
+       }
+
+       virtual bool OnConnected()
+       {
+               if (u && (Instance->SE->GetRef(ufd) == u))
+               {
+                       sockaddr* sock_us = new sockaddr[2];
+                       sockaddr* sock_them = new sockaddr[2];
+                       bool success = false;
+                       uslen = sizeof(sockaddr_in);
+                       themlen = sizeof(sockaddr_in);
+#ifdef IPV6
+                       if (this->u->GetProtocolFamily() == AF_INET6)
+                       {
+                               themlen = sizeof(sockaddr_in6);
+                               uslen = sizeof(sockaddr_in6);
+                       }
+#endif
+                       success = ((getsockname(this->u->GetFd(),sock_us,&uslen) || getpeername(this->u->GetFd(), sock_them, &themlen)));
+                       if (success)
+                       {
+                               delete[] sock_us;
+                               delete[] sock_them;
+                               return false;
+                       }
+                       else
+                       {
+                               // send the request in the following format: theirsocket,oursocket
+#ifdef IPV6
+                               if (this->u->GetProtocolFamily() == AF_INET6)
+                                       snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in6*)sock_them)->sin6_port),ntohs(((sockaddr_in6*)sock_us)->sin6_port));
+                               else
+#endif
+                               snprintf(ident_request,127,"%d,%d\r\n",ntohs(((sockaddr_in*)sock_them)->sin_port),ntohs(((sockaddr_in*)sock_us)->sin_port));
+                               this->Write(ident_request);
+                               delete[] sock_us;
+                               delete[] sock_them;
+                               return true;
+                       }
+               }
+               else
+               {
+                       Instance->next_call = Instance->Time();
+                       return true;
+               }
+       }
+};
+
+class ModuleIdent : public Module
+{
+
+       ConfigReader* Conf;
+       int IdentTimeout;
+       std::string PortBind;
+
+ public:
+       void ReadSettings()
+       {
+               Conf = new ConfigReader(ServerInstance);
+               IdentTimeout = Conf->ReadInteger("ident", "timeout", 0, true);
+               PortBind = Conf->ReadValue("ident", "bind", 0);
+               if (!IdentTimeout)
+                       IdentTimeout = 1;
+               DELETE(Conf);
+       }
+
+       ModuleIdent(InspIRCd* Me)
+               : Module(Me)
+       {
+
+               ReadSettings();
+       }
+
+       void Implements(char* List)
+       {
+               List[I_OnCleanup] = List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnCheckReady] = List[I_OnUserDisconnect] = 1;
+       }
+
+       void OnSyncUserMetaData(userrec* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
+       {
+               if ((displayable) && (extname == "IDENT"))
+               {
+                       std::string* ident;
+                       if (GetExt("IDENT", ident))
+                               proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, *ident);
+               }
+       }
+
+
+       virtual void OnRehash(userrec* user, const std::string &parameter)
+       {
+               ReadSettings();
+       }
+
+       virtual int OnUserRegister(userrec* user)
+       {
+               /*
+                * when the new user connects, before they authenticate with USER/NICK/PASS, we do
+                * their ident lookup. We do this by instantiating an object of type RFC1413, which
+                * is derived from InspSocket, and inserting it into the socket engine using the
+                * Server::AddSocket() call.
+                */
+               char newident[MAXBUF];
+               strcpy(newident,"~");
+               strlcat(newident,user->ident,IDENTMAX);
+               strlcpy(user->ident,newident,IDENTMAX);
+               
+
+               user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Looking up your ident...");
+               RFC1413* ident = new RFC1413(ServerInstance, user, IdentTimeout, PortBind);
+               if ((ident->GetState() == I_CONNECTING) || (ident->GetState() == I_CONNECTED))
+               {
+                       user->Extend("ident_data", (char*)ident);
+               }
+               else
+               {
+                       user->WriteServ("NOTICE "+std::string(user->nick)+" :*** Could not find your ident, using "+std::string(user->ident)+" instead.");
+                       ServerInstance->next_call = ServerInstance->Time();
+               }
+               return 0;
+       }
+
+       virtual bool OnCheckReady(userrec* user)
+       {
+               /*
+                * The socket engine will clean up their ident request for us when it completes,
+                * either due to timeout or due to closing, so, we just hold them until they dont
+                * have an ident field any more.
+                */
+               RFC1413* ident;
+               return (!user->GetExt("ident_data", ident));
+       }
+
+       virtual void OnCleanup(int target_type, void* item)
+       {
+               if (target_type == TYPE_USER)
+               {
+                       userrec* user = (userrec*)item;
+                       RFC1413* ident;
+                       std::string* identstr;
+                       if (user->GetExt("ident_data", ident))
+                       {
+                               // FIX: If the user record is deleted, the socket wont be removed
+                               // immediately so there is chance of the socket trying to write to
+                               // a user which has now vanished! To prevent this, set ident::u
+                               // to NULL and check it so that we dont write users who have gone away.
+                               ident->u = NULL;
+                               ServerInstance->SE->DelFd(ident);
+                       }
+                       if (user->GetExt("IDENT", identstr))
+                       {
+                               delete identstr;
+                       }
+               }
+       }
+
+       virtual void OnUserDisconnect(userrec* user)
+       {
+               /*
+                * when the user quits tidy up any ident lookup they have pending to keep things tidy.
+                * When we call RemoveSocket, the abstractions tied into the system evnetually work their
+                * way to RFC1459::OnClose(), which shrinks off the ident_data for us, so we dont need
+                * to do it here. If we don't tidy this up, there may still be lingering idents for users
+                * who have quit, as class RFC1459 is only loosely bound to userrec* via a pair of pointers
+                * and this would leave at least one of the invalid ;)
+                */
+               RFC1413* ident;
+               std::string* identstr;
+               if (user->GetExt("ident_data", ident))
+               {
+                       ident->u = NULL;
+                       ServerInstance->SE->DelFd(ident);
+               }
+               if (user->GetExt("IDENT", identstr))
+               {
+                       delete identstr;
+               }
+       }
+
+       virtual ~ModuleIdent()
+       {
+               ServerInstance->next_call = ServerInstance->Time();
+       }
+
+       virtual Version GetVersion()
+       {
+               return Version(1,1,0,0,VF_VENDOR,API_VERSION);
+       }
+
+};
+
+MODULE_INIT(ModuleIdent)