X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cgiirc.cpp;h=bbb6151bdc13c04f9f1aa328d37f17a9053ad8d5;hb=226a95aab09b9e1f43f61e78179bfa1135816c2d;hp=63efd6bae8caf541b844c181cf800c8225b51ddc;hpb=349106f3f9f75d7f957fc5d1e71ca650f4807bb9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 63efd6bae..bbb6151bd 100644
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -25,6 +25,7 @@
 
 #include "inspircd.h"
 #include "xline.h"
+#include "modules/dns.h"
 
 /* $ModDesc: Change user's hosts connecting from known CGI:IRC hosts */
 
@@ -116,39 +117,44 @@ class CommandWebirc : public Command
 
 /** Resolver for CGI:IRC hostnames encoded in ident/GECOS
  */
-class CGIResolver : public Resolver
+class CGIResolver : public DNS::Request
 {
 	std::string typ;
 	std::string theiruid;
 	LocalIntExt& waiting;
 	bool notify;
  public:
-	CGIResolver(Module* me, bool NotifyOpers, const std::string &source, LocalUser* u,
-			const std::string &type, bool &cached, LocalIntExt& ext)
-		: Resolver(source, DNS_QUERY_PTR4, cached, me), typ(type), theiruid(u->uuid),
+	CGIResolver(DNS::Manager *mgr, Module* me, bool NotifyOpers, const std::string &source, LocalUser* u,
+			const std::string &ttype, LocalIntExt& ext)
+		: DNS::Request(mgr, me, source, DNS::QUERY_PTR), typ(ttype), theiruid(u->uuid),
 		waiting(ext), notify(NotifyOpers)
 	{
 	}
 
-	virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
+	void OnLookupComplete(const DNS::Query *r)
 	{
 		/* Check the user still exists */
 		User* them = ServerInstance->FindUUID(theiruid);
 		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());
+			LocalUser* lu = IS_LOCAL(them);
+			if (!lu)
+				return;
 
-			if (result.length() > 64)
+			const DNS::ResourceRecord &ans_record = r->answers[0];
+			if (ans_record.rdata.empty() || ans_record.rdata.length() > 64)
 				return;
-			them->host = result;
-			them->dhost = result;
+
+			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(), ans_record.rdata.c_str(), typ.c_str());
+
+			them->host = them->dhost = ans_record.rdata;
 			them->InvalidateCache();
-			them->CheckLines(true);
+			lu->CheckLines(true);
 		}
 	}
 
-	virtual void OnError(ResolverError e, const std::string &errormessage)
+	void OnError(const DNS::Query *r)
 	{
 		if (!notify)
 			return;
@@ -175,10 +181,11 @@ class ModuleCgiIRC : public Module
 {
 	CommandWebirc cmd;
 	LocalIntExt waiting;
+	dynamic_reference<DNS::Manager> DNS;
 
-	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();
 	}
@@ -198,27 +205,34 @@ class ModuleCgiIRC : public Module
 		ChangeIP(user, newip);
 		user->host = user->dhost = user->GetIPString();
 		user->InvalidateCache();
-		RecheckElineAndClass(user);
+		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)
+		if (user->quitting || !DNS || user->MyClass->nouserdns)
 			return;
 
+		CGIResolver* r = new CGIResolver(*this->DNS, this, cmd.notify, newip, user, (was_pass ? "PASS" : "IDENT"), waiting);
 		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);
+			this->DNS->Process(r);
 		}
-		catch (...)
+		catch (DNS::Exception &ex)
 		{
+			int count = waiting.get(user);
+			if (count)
+				waiting.set(user, count - 1);
+			delete r;
 			if (cmd.notify)
-				 ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), but I could not resolve their hostname!", user->nick.c_str(), user->host.c_str());
+				 ServerInstance->SNO->WriteToSnoMask('a', "Connecting user %s detected as using CGI:IRC (%s), but I could not resolve their hostname; %s", user->nick.c_str(), user->host.c_str(), ex.GetReason());
 		}
 	}
 
 public:
-	ModuleCgiIRC() : cmd(this), waiting("cgiirc-delay", this)
+	ModuleCgiIRC()
+		: cmd(this)
+		, waiting("cgiirc-delay", this)
+		, DNS(this, "DNS")
 	{
 	}
 
@@ -251,7 +265,7 @@ public:
 			{
 				if (type == "webirc" && password.empty())
 				{
-					ServerInstance->Logs->Log("CONFIG",DEFAULT, "m_cgiirc: Missing password in config: %s", hostmask.c_str());
+					ServerInstance->Logs->Log("CONFIG",LOG_DEFAULT, "m_cgiirc: Missing password in config: %s", hostmask.c_str());
 				}
 				else
 				{
@@ -267,7 +281,7 @@ public:
 					else
 					{
 						cgitype = PASS;
-						ServerInstance->Logs->Log("CONFIG",DEFAULT, "m_cgiirc.so: Invalid <cgihost:type> value in config: %s, setting it to \"pass\"", type.c_str());
+						ServerInstance->Logs->Log("CONFIG",LOG_DEFAULT, "m_cgiirc.so: Invalid <cgihost:type> value in config: %s, setting it to \"pass\"", type.c_str());
 					}
 
 					cmd.Hosts.push_back(CGIhost(hostmask, cgitype, password));
@@ -275,7 +289,7 @@ public:
 			}
 			else
 			{
-				ServerInstance->Logs->Log("CONFIG",DEFAULT, "m_cgiirc.so: Invalid <cgihost:mask> value in config: %s", hostmask.c_str());
+				ServerInstance->Logs->Log("CONFIG",LOG_DEFAULT, "m_cgiirc.so: Invalid <cgihost:mask> value in config: %s", hostmask.c_str());
 				continue;
 			}
 		}
@@ -295,7 +309,7 @@ public:
 		std::string* webirc_hostname = cmd.webirc_hostname.get(user);
 		user->host = user->dhost = (webirc_hostname ? *webirc_hostname : user->GetIPString());
 
-		RecheckElineAndClass(user);
+		RecheckClass(user);
 		if (user->quitting)
 			return MOD_RES_DENY;