Update wiki links to use HTTPS and point to the correct pages.

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

diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index c30e4d200fe305cc1f5c73d9ef0561e50691111b..f0ced1db79789ba313711dc97defae384f1dc8b1 100644 (file)
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -230,40 +230,41 @@ class IdentRequestSocket : public EventHandler
 
                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 at the first null character, but first make sure
+                * there is at least one null char (at the end of the buffer).
+                */
+               ibuf[recvresult] = '\0';
+               std::string buf(ibuf);
 
-                       /* 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;
+               /* <2 colons: invalid
+                *  2 colons: reply is an error
+                * >3 colons: there is a colon in the ident
+                */
+               if (std::count(buf.begin(), buf.end(), ':') != 3)
+                       return;
 
-                               /* Rules taken from InspIRCd::IsIdent */
-                               if (((*j >= 'A') && (*j <= '}')) || ((*j >= '0') && (*j <= '9')) || (*j == '-') || (*j == '.'))
-                               {
-                                       ident += *j;
-                                       continue;
-                               }
+               std::string::size_type lastcolon = buf.rfind(':');
 
+               /* Truncate the ident at any characters we don't like, skip leading spaces */
+               for (std::string::const_iterator i = buf.begin()+lastcolon+1; i != buf.end(); ++i)
+               {
+                       if (result.size() == ServerInstance->Config->Limits.IdentMax)
+                               /* Ident is getting too long */
                                break;
-                       }
 
-                       /* Re-check with IsIdent, in case that changes and this doesn't (paranoia!) */
-                       if (!ident.empty() && ServerInstance->IsIdent(ident.c_str()))
+                       if (*i == ' ')
+                               continue;
+
+                       /* Add the next char to the result and see if it's still a valid ident,
+                        * according to IsIdent(). If it isn't, then erase what we just added and
+                        * we're done.
+                        */
+                       result += *i;
+                       if (!ServerInstance->IsIdent(result.c_str()))
                        {
-                               result = ident;
+                               result.erase(result.end()-1);
+                               break;
                        }
-
-                       break;
                }
        }
 };
@@ -275,12 +276,17 @@ class ModuleIdent : public Module
  public:
        ModuleIdent() : ext("ident_socket", this)
        {
+       }
+
+       void init()
+       {
+               ServerInstance->Modules->AddService(ext);
                OnRehash(NULL);
                Implementation eventlist[] = {
                        I_OnRehash, I_OnUserInit, I_OnCheckReady,
                        I_OnUserDisconnect, I_OnSetConnectClass
                };
-               ServerInstance->Modules->Attach(eventlist, this, 5);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
        ~ModuleIdent()
@@ -294,9 +300,7 @@ class ModuleIdent : public Module
 
        virtual void OnRehash(User *user)
        {
-               ConfigReader Conf;
-
-               RequestTimeout = Conf.ReadInteger("ident", "timeout", 0, true);
+               RequestTimeout = ServerInstance->Config->ConfValue("ident")->getInt("timeout", 5);
                if (!RequestTimeout)
                        RequestTimeout = 5;
        }
@@ -358,7 +362,7 @@ class ModuleIdent : public Module
                /* wooo, got a result (it will be good, or bad) */
                if (isock->result.empty())
                {
-                       user->ident.insert(0, 1, '~');
+                       user->ident.insert(user->ident.begin(), 1, '~');
                        user->WriteServ("NOTICE Auth :*** Could not find your ident, using %s instead.", user->ident.c_str());
                }
                else
@@ -367,6 +371,7 @@ class ModuleIdent : public Module
                        user->WriteServ("NOTICE Auth :*** Found your ident, '%s'", user->ident.c_str());
                }
 
+               user->InvalidateCache();
                isock->Close();
                ext.unset(user);
                return MOD_RES_PASSTHRU;