X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cgiirc.cpp;h=cce2e785531ad3c38b6fd3283fdeb173a8712aa0;hb=ccd4c11ea1a43d079eaae9708482ef4a9148796c;hp=8e46a5d4d719e6feb01f0a7683c7a302704761b4;hpb=6e55cd2003750a7f69866128cfd44409676c9a1e;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 8e46a5d4d..cce2e7855 100644
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -89,11 +89,15 @@ class CommandWebirc : public Command
 					{
 						realhost.set(user, user->host);
 						realip.set(user, user->GetIPString());
+
+						bool host_ok = (parameters[2].length() < 64);
+						const std::string& newhost = (host_ok ? parameters[2] : parameters[3]);
+
 						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());
+							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(), newhost.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)
+						if (host_ok)
 							webirc_hostname.set(user, parameters[2]);
 						else
 							webirc_hostname.unset(user);
@@ -130,7 +134,7 @@ class CGIResolver : public Resolver
 	{
 		/* Check the user still exists */
 		User* them = ServerInstance->FindUUID(theiruid);
-		if (them)
+		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());
@@ -146,11 +150,13 @@ class CGIResolver : public Resolver
 
 	virtual void OnError(ResolverError e, const std::string &errormessage)
 	{
+		if (!notify)
+			return;
+
 		User* them = ServerInstance->FindUUID(theiruid);
-		if (them)
+		if ((them) && (!them->quitting))
 		{
-			if (notify)
-				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());
+			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());
 		}
 	}
 
@@ -170,9 +176,9 @@ class ModuleCgiIRC : public Module
 	CommandWebirc cmd;
 	LocalIntExt waiting;
 
-	static void RecheckElineAndClass(LocalUser* user)
+	static void RecheckClass(LocalUser* user)
 	{
-		user->exempt = (ServerInstance->XLines->MatchesLine("E", user) != NULL);
+		user->MyClass = NULL;
 		user->SetClass();
 		user->CheckClass();
 	}
@@ -192,17 +198,17 @@ class ModuleCgiIRC : public Module
 		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
-		if (user->quitting)
+		RecheckClass(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);
+			ServerInstance->AddResolver(r, cached);
 		}
 		catch (...)
 		{
@@ -219,15 +225,11 @@ public:
 	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);
+		ServiceProvider* providerlist[] = { &cmd, &cmd.realhost, &cmd.realip, &cmd.webirc_hostname, &cmd.webirc_ip, &waiting };
+		ServerInstance->Modules->AddServices(providerlist, sizeof(providerlist)/sizeof(ServiceProvider*));
 
 		Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCheckReady };
-		ServerInstance->Modules->Attach(eventlist, this, 3);
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 	}
 
 	void OnRehash(User* user)
@@ -292,8 +294,9 @@ public:
 
 		std::string* webirc_hostname = cmd.webirc_hostname.get(user);
 		user->host = user->dhost = (webirc_hostname ? *webirc_hostname : user->GetIPString());
+		user->InvalidateCache();
 
-		RecheckElineAndClass(user);
+		RecheckClass(user);
 		if (user->quitting)
 			return MOD_RES_DENY;