X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_ident.cpp;h=6099e7c1411e24659a1aed30a5dbd9034612f97a;hb=86f8294c2de86b8d060abbb02f7c51c0ca0d9ead;hp=b7c9c1cfdef7ca8c481225093ddc66f9c4a53c5f;hpb=44f42a13de52c8025942ddab42f51feb36821782;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_ident.cpp b/src/modules/m_ident.cpp
index b7c9c1cfd..6099e7c14 100644
--- a/src/modules/m_ident.cpp
+++ b/src/modules/m_ident.cpp
@@ -216,60 +216,56 @@ class IdentRequestSocket : public EventHandler
 		char ibuf[MAXBUF];
 		int recvresult = ServerInstance->SE->Recv(this, ibuf, MAXBUF-1, 0);
 
+		/* Close (but don't delete from memory) our socket
+		 * and flag as done since the ident lookup has finished
+		 */
+		Close();
+		done = true;
+
 		/* 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 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;
 		}
-
-		/* Close (but dont delete from memory) our socket
-		 * and flag as done
-		 */
-		Close();
-		done = true;
-		return;
 	}
 };
 
@@ -280,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()
@@ -299,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;
 	}
@@ -372,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;
@@ -388,7 +388,11 @@ class ModuleIdent : public Module
 	{
 		/* Module unloading, tidy up users */
 		if (target_type == TYPE_USER)
-			OnUserDisconnect((LocalUser*)item);
+		{
+			LocalUser* user = IS_LOCAL((User*) item);
+			if (user)
+				OnUserDisconnect(user);
+		}
 	}
 
 	virtual void OnUserDisconnect(LocalUser *user)