1 files changed, 190 insertions, 266 deletions

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 482c6447c..7d4f671b9 100644
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -24,163 +24,150 @@
 
 
 #include "inspircd.h"
-#include "xline.h"
+#include "modules/ssl.h"
+#include "modules/whois.h"
 
-/* $ModDesc: Change user's hosts connecting from known CGI:IRC hosts */
-
-enum CGItype { PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC };
+enum
+{
+	// InspIRCd-specific.
+	RPL_WHOISGATEWAY = 350
+};
 
+// We need this method up here so that it can be accessed from anywhere
+static void ChangeIP(User* user, const std::string& newip)
+{
+	ServerInstance->Users->RemoveCloneCounts(user);
+	user->SetClientIP(newip);
+	ServerInstance->Users->AddClone(user);
+}
 
-/** Holds a CGI site's details
- */
-class CGIhost
+// Encapsulates information about a WebIRC host.
+class WebIRCHost
 {
-public:
+ private:
 	std::string hostmask;
-	CGItype type;
+	std::string fingerprint;
 	std::string password;
+	std::string passhash;
 
-	CGIhost(const std::string &mask, CGItype t, const std::string &spassword)
-	: hostmask(mask), type(t), password(spassword)
+ public:
+	WebIRCHost(const std::string& mask, const std::string& fp, const std::string& pass, const std::string& hash)
+		: hostmask(mask)
+		, fingerprint(fp)
+		, password(pass)
+		, passhash(hash)
 	{
 	}
+
+	bool Matches(LocalUser* user, const std::string& pass) const
+	{
+		// Did the user send a valid password?
+		if (!password.empty() && !ServerInstance->PassCompare(user, password, pass, passhash))
+			return false;
+
+		// Does the user have a valid fingerprint?
+		const std::string fp = SSLClientCert::GetFingerprint(&user->eh);
+		if (!fingerprint.empty() && fp != fingerprint)
+			return false;
+
+		// Does the user's hostname match our hostmask?
+		if (InspIRCd::Match(user->GetRealHost(), hostmask, ascii_case_insensitive_map))
+			return true;
+
+		// Does the user's IP address match our hostmask?
+		return InspIRCd::MatchCIDR(user->GetIPString(), hostmask, ascii_case_insensitive_map);
+	}
 };
-typedef std::vector<CGIhost> CGIHostlist;
 
 /*
  * WEBIRC
  *  This is used for the webirc method of CGIIRC auth, and is (really) the best way to do these things.
- *  Syntax: WEBIRC password client hostname ip
- *  Where password is a shared key, client is the name of the "client" and version (e.g. cgiirc), hostname
+ *  Syntax: WEBIRC password gateway hostname ip
+ *  Where password is a shared key, gateway is the name of the WebIRC gateway and version (e.g. cgiirc), hostname
  *  is the resolved host of the client issuing the command and IP is the real IP of the client.
  *
  * How it works:
  *  To tie in with the rest of cgiirc module, and to avoid race conditions, /webirc is only processed locally
  *  and simply sets metadata on the user, which is later decoded on full connect to give something meaningful.
  */
-class CommandWebirc : public Command
+class CommandWebIRC : public SplitCommand
 {
  public:
+	std::vector<WebIRCHost> hosts;
 	bool notify;
+	StringExtItem gateway;
 	StringExtItem realhost;
 	StringExtItem realip;
-	LocalStringExt webirc_hostname;
-	LocalStringExt webirc_ip;
-
-	CGIHostlist Hosts;
-	CommandWebirc(Module* Creator)
-		: Command(Creator, "WEBIRC", 4),
-		  realhost("cgiirc_realhost", Creator), realip("cgiirc_realip", Creator),
-		  webirc_hostname("cgiirc_webirc_hostname", Creator), webirc_ip("cgiirc_webirc_ip", Creator)
-		{
-			allow_empty_last_param = false;
-			works_before_reg = true;
-			this->syntax = "password client hostname ip";
-		}
-		CmdResult Handle(const std::vector<std::string> &parameters, User *user)
-		{
-			if(user->registered == REG_ALL)
-				return CMD_FAILURE;
-
-			irc::sockets::sockaddrs ipaddr;
-			if (!irc::sockets::aptosa(parameters[3], 0, ipaddr))
-			{
-				IS_LOCAL(user)->CommandFloodPenalty += 5000;
-				ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s tried to use WEBIRC but gave an invalid IP address.", user->GetFullRealHost().c_str());
-				return CMD_FAILURE;
-			}
-
-			for(CGIHostlist::iterator iter = Hosts.begin(); iter != Hosts.end(); iter++)
-			{
-				if(InspIRCd::Match(user->host, iter->hostmask, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(user->GetIPString(), iter->hostmask, ascii_case_insensitive_map))
-				{
-					if(iter->type == WEBIRC && parameters[0] == iter->password)
-					{
-						realhost.set(user, user->host);
-						realip.set(user, user->GetIPString());
-
-						// Check if we're happy with the provided hostname. If it's problematic then use the IP instead.
-						bool host_ok = (parameters[2].length() < 64) && (parameters[2].find_first_not_of("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.:-") == std::string::npos);
-						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(), newhost.c_str(), user->host.c_str());
-
-						webirc_hostname.set(user, newhost);
-						webirc_ip.set(user, parameters[3]);
-						return CMD_SUCCESS;
-					}
-				}
-			}
-
-			IS_LOCAL(user)->CommandFloodPenalty += 5000;
-			ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s tried to use WEBIRC, but didn't match any configured webirc blocks.", user->GetFullRealHost().c_str());
-			return CMD_FAILURE;
-		}
-};
 
-
-/** Resolver for CGI:IRC hostnames encoded in ident/GECOS
- */
-class CGIResolver : public Resolver
-{
-	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),
-		waiting(ext), notify(NotifyOpers)
+	CommandWebIRC(Module* Creator)
+		: SplitCommand(Creator, "WEBIRC", 4)
+		, gateway("cgiirc_gateway", ExtensionItem::EXT_USER, Creator)
+		, realhost("cgiirc_realhost", ExtensionItem::EXT_USER, Creator)
+		, realip("cgiirc_realip", ExtensionItem::EXT_USER, Creator)
 	{
+		allow_empty_last_param = false;
+		works_before_reg = true;
+		this->syntax = "password gateway hostname ip";
 	}
 
-	virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
+	CmdResult HandleLocal(const std::vector<std::string>& parameters, LocalUser* user) CXX11_OVERRIDE
 	{
-		/* Check the user still exists */
-		User* them = ServerInstance->FindUUID(theiruid);
-		if ((them) && (!them->quitting))
+		if (user->registered == REG_ALL)
+			return CMD_FAILURE;
+
+		irc::sockets::sockaddrs ipaddr;
+		if (!irc::sockets::aptosa(parameters[3], 0, ipaddr))
 		{
-			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());
-
-			if (result.length() > 64)
-				return;
-			them->host = result;
-			them->dhost = result;
-			them->InvalidateCache();
-			them->CheckLines(true);
+			user->CommandFloodPenalty += 5000;
+			WriteLog("Connecting user %s (%s) tried to use WEBIRC but gave an invalid IP address.",
+				user->uuid.c_str(), user->GetIPString().c_str());
+			return CMD_FAILURE;
 		}
-	}
-
-	virtual void OnError(ResolverError e, const std::string &errormessage)
-	{
-		if (!notify)
-			return;
 
-		User* them = ServerInstance->FindUUID(theiruid);
-		if ((them) && (!them->quitting))
+		for (std::vector<WebIRCHost>::const_iterator iter = hosts.begin(); iter != hosts.end(); ++iter)
 		{
-			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());
+			// If we don't match the host then skip to the next host.
+			if (!iter->Matches(user, parameters[0]))
+				continue;
+
+			// The user matched a WebIRC block!
+			gateway.set(user, parameters[1]);
+			realhost.set(user, user->GetRealHost());
+			realip.set(user, user->GetIPString());
+
+			WriteLog("Connecting user %s is using a WebIRC gateway; changing their IP from %s to %s.",
+				user->uuid.c_str(), user->GetIPString().c_str(), parameters[3].c_str());
+
+			// Set the IP address sent via WEBIRC. We ignore the hostname and lookup
+			// instead do our own DNS lookups because of unreliable gateways.
+			ChangeIP(user, parameters[3]);
+			return CMD_SUCCESS;
 		}
+
+		user->CommandFloodPenalty += 5000;
+		WriteLog("Connecting user %s (%s) tried to use WEBIRC but didn't match any configured WebIRC hosts.",
+			user->uuid.c_str(), user->GetIPString().c_str());
+		return CMD_FAILURE;
 	}
 
-	virtual ~CGIResolver()
+	void WriteLog(const char* message, ...) CUSTOM_PRINTF(2, 3)
 	{
-		User* them = ServerInstance->FindUUID(theiruid);
-		if (!them)
-			return;
-		int count = waiting.get(them);
-		if (count)
-			waiting.set(them, count - 1);
+		std::string buffer;
+		VAFORMAT(buffer, message, message);
+
+		// If we are sending a snotice then the message will already be
+		// written to the logfile.
+		if (notify)
+			ServerInstance->SNO->WriteGlobalSno('w', buffer);
+		else
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, buffer);
 	}
 };
 
-class ModuleCgiIRC : public Module
+class ModuleCgiIRC : public Module, public Whois::EventListener
 {
-	CommandWebirc cmd;
-	LocalIntExt waiting;
+	CommandWebIRC cmd;
+	std::vector<std::string> hosts;
 
 	static void RecheckClass(LocalUser* user)
 	{
@@ -189,119 +176,82 @@ class ModuleCgiIRC : public Module
 		user->CheckClass();
 	}
 
-	static void ChangeIP(LocalUser* user, const std::string& newip)
-	{
-		ServerInstance->Users->RemoveCloneCounts(user);
-		user->SetClientIP(newip.c_str());
-		ServerInstance->Users->AddLocalClone(user);
-		ServerInstance->Users->AddGlobalClone(user);
-	}
-
-	void HandleIdentOrPass(LocalUser* user, const std::string& newip, bool was_pass)
+	void HandleIdent(LocalUser* user, const std::string& newip)
 	{
-		cmd.realhost.set(user, user->host);
+		cmd.realhost.set(user, user->GetRealHost());
 		cmd.realip.set(user, user->GetIPString());
-		user->host = user->dhost = user->GetIPString();
+
+		cmd.WriteLog("Connecting user %s is using an ident gateway; changing their IP from %s to %s.",
+			user->uuid.c_str(), user->GetIPString().c_str(), newip.c_str());
 		ChangeIP(user, newip);
-		user->InvalidateCache();
 		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);
-			waiting.set(user, waiting.get(user) + 1);
-			ServerInstance->AddResolver(r, cached);
-		}
-		catch (...)
-		{
-			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());
-		}
 	}
 
 public:
-	ModuleCgiIRC() : cmd(this), waiting("cgiirc-delay", this)
+	ModuleCgiIRC()
+		: Whois::EventListener(this)
+		, cmd(this)
 	{
 	}
 
-	void init()
+	void init() CXX11_OVERRIDE
 	{
-		OnRehash(NULL);
-		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, sizeof(eventlist)/sizeof(Implementation));
+		ServerInstance->SNO->EnableSnomask('w', "CGIIRC");
 	}
 
-	void OnRehash(User* user)
+	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
-		cmd.Hosts.clear();
-
-		// Do we send an oper notice when a CGI:IRC has their host changed?
-		cmd.notify = ServerInstance->Config->ConfValue("cgiirc")->getBool("opernotice", true);
+		std::vector<std::string> identhosts;
+		std::vector<WebIRCHost> webirchosts;
 
 		ConfigTagList tags = ServerInstance->Config->ConfTags("cgihost");
 		for (ConfigIter i = tags.first; i != tags.second; ++i)
 		{
 			ConfigTag* tag = i->second;
-			std::string hostmask = tag->getString("mask"); // An allowed CGI:IRC host
-			std::string type = tag->getString("type"); // What type of user-munging we do on this host.
-			std::string password = tag->getString("password");
 
-			if(hostmask.length())
+			// Ensure that we have the <cgihost:mask> parameter.
+			const std::string mask = tag->getString("mask");
+			if (mask.empty())
+				throw ModuleException("<cgihost:mask> is a mandatory field, at " + tag->getTagLocation());
+
+			// Determine what lookup type this host uses.
+			const std::string type = tag->getString("type");
+			if (stdalgo::string::equalsci(type, "ident"))
 			{
-				if (type == "webirc" && password.empty())
-				{
-					ServerInstance->Logs->Log("CONFIG",DEFAULT, "m_cgiirc: Missing password in config: %s", hostmask.c_str());
-				}
-				else
-				{
-					CGItype cgitype;
-					if (type == "pass")
-						cgitype = PASS;
-					else if (type == "ident")
-						cgitype = IDENT;
-					else if (type == "passfirst")
-						cgitype = PASSFIRST;
-					else if (type == "webirc")
-						cgitype = WEBIRC;
-					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());
-					}
-
-					cmd.Hosts.push_back(CGIhost(hostmask, cgitype, password));
-				}
+				// The IP address should be looked up from the hex IP address.
+				identhosts.push_back(mask);
+			}
+			else if (stdalgo::string::equalsci(type, "webirc"))
+			{
+				// The IP address will be received via the WEBIRC command.
+				const std::string fingerprint = tag->getString("fingerprint");
+				const std::string password = tag->getString("password");
+
+				// WebIRC blocks require a password.
+				if (fingerprint.empty() && password.empty())
+					throw ModuleException("When using <cgihost type=\"webirc\"> either the fingerprint or password field is required, at " + tag->getTagLocation());
+
+				webirchosts.push_back(WebIRCHost(mask, fingerprint, password, tag->getString("hash")));
 			}
 			else
 			{
-				ServerInstance->Logs->Log("CONFIG",DEFAULT, "m_cgiirc.so: Invalid <cgihost:mask> value in config: %s", hostmask.c_str());
-				continue;
+				throw ModuleException(type + " is an invalid <cgihost:mask> type, at " + tag->getTagLocation()); 
 			}
 		}
+
+		// The host configuration was valid so we can apply it.
+		hosts.swap(identhosts);
+		cmd.hosts.swap(webirchosts);
+
+		// Do we send an oper notice when a m_cgiirc client has their IP changed?
+		cmd.notify = ServerInstance->Config->ConfValue("cgiirc")->getBool("opernotice", true);
 	}
 
-	ModResult OnCheckReady(LocalUser *user)
+	ModResult OnCheckReady(LocalUser *user) CXX11_OVERRIDE
 	{
-		if (waiting.get(user))
-			return MOD_RES_DENY;
-
-		std::string *webirc_ip = cmd.webirc_ip.get(user);
-		if (!webirc_ip)
+		if (!cmd.realip.get(user))
 			return MOD_RES_PASSTHRU;
 
-		std::string* webirc_hostname = cmd.webirc_hostname.get(user);
-		user->host = user->dhost = (webirc_hostname ? *webirc_hostname : user->GetIPString());
-
-		ChangeIP(user, *webirc_ip);
-		user->InvalidateCache();
-
 		RecheckClass(user);
 		if (user->quitting)
 			return MOD_RES_DENY;
@@ -310,61 +260,57 @@ public:
 		if (user->quitting)
 			return MOD_RES_DENY;
 
-		cmd.webirc_hostname.unset(user);
-		cmd.webirc_ip.unset(user);
-
 		return MOD_RES_PASSTHRU;
 	}
 
-	ModResult OnUserRegister(LocalUser* user)
+	ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE
 	{
-		for(CGIHostlist::iterator iter = cmd.Hosts.begin(); iter != cmd.Hosts.end(); iter++)
+		// If <connect:webirc> is not set then we have nothing to do.
+		const std::string webirc = myclass->config->getString("webirc");
+		if (webirc.empty())
+			return MOD_RES_PASSTHRU;
+
+		// If the user is not connecting via a WebIRC gateway then they
+		// cannot match this connect class.
+		const std::string* gateway = cmd.gateway.get(user);
+		if (!gateway)
+			return MOD_RES_DENY;
+
+		// If the gateway matches the <connect:webirc> constraint then
+		// allow the check to continue. Otherwise, reject it.
+		return InspIRCd::Match(*gateway, webirc) ? MOD_RES_PASSTHRU : MOD_RES_DENY;
+	}
+
+	ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE
+	{
+		for (std::vector<std::string>::const_iterator iter = hosts.begin(); iter != hosts.end(); ++iter)
 		{
-			if(InspIRCd::Match(user->host, iter->hostmask, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(user->GetIPString(), iter->hostmask, ascii_case_insensitive_map))
-			{
-				// Deal with it...
-				if(iter->type == PASS)
-				{
-					CheckPass(user); // We do nothing if it fails so...
-					user->CheckLines(true);
-				}
-				else if(iter->type == PASSFIRST && !CheckPass(user))
-				{
-					// If the password lookup failed, try the ident
-					CheckIdent(user);	// If this fails too, do nothing
-					user->CheckLines(true);
-				}
-				else if(iter->type == IDENT)
-				{
-					CheckIdent(user); // Nothing on failure.
-					user->CheckLines(true);
-				}
-				else if(iter->type == IDENTFIRST && !CheckIdent(user))
-				{
-					// If the ident lookup fails, try the password.
-					CheckPass(user);
-					user->CheckLines(true);
-				}
-				else if(iter->type == WEBIRC)
-				{
-					// We don't need to do anything here
-				}
-				return MOD_RES_PASSTHRU;
-			}
+			if (!InspIRCd::Match(user->GetRealHost(), *iter, ascii_case_insensitive_map) && !InspIRCd::MatchCIDR(user->GetIPString(), *iter, ascii_case_insensitive_map))
+				continue;
+
+			CheckIdent(user); // Nothing on failure.
+			user->CheckLines(true);
+			break;
 		}
 		return MOD_RES_PASSTHRU;
 	}
 
-	bool CheckPass(LocalUser* user)
+	void OnWhois(Whois::Context& whois) CXX11_OVERRIDE
 	{
-		if(IsValidHost(user->password))
-		{
-			HandleIdentOrPass(user, user->password, true);
-			user->password.clear();
-			return true;
-		}
+		if (!whois.IsSelfWhois() && !whois.GetSource()->HasPrivPermission("users/auspex"))
+			return;
 
-		return false;
+		// If these fields are not set then the client is not using a gateway.
+		const std::string* realhost = cmd.realhost.get(whois.GetTarget());
+		const std::string* realip = cmd.realip.get(whois.GetTarget());
+		if (!realhost || !realip)
+			return;
+
+		const std::string* gateway = cmd.gateway.get(whois.GetTarget());
+		if (gateway)
+			whois.SendLine(RPL_WHOISGATEWAY, *realhost, *realip, "is connected via the " + *gateway + " WebIRC gateway");
+		else
+			whois.SendLine(RPL_WHOISGATEWAY, *realhost, *realip, "is connected via an ident gateway");
 	}
 
 	bool CheckIdent(LocalUser* user)
@@ -387,37 +333,15 @@ public:
 		std::string newipstr(inet_ntoa(newip));
 
 		user->ident = "~cgiirc";
-		HandleIdentOrPass(user, newipstr, false);
+		HandleIdent(user, newipstr);
 
 		return true;
 	}
 
-	bool IsValidHost(const std::string &host)
+	Version GetVersion() CXX11_OVERRIDE
 	{
-		if(!host.size() || host.size() > 64)
-			return false;
-
-		for(unsigned int i = 0; i < host.size(); i++)
-		{
-			if(	((host[i] >= '0') && (host[i] <= '9')) ||
-					((host[i] >= 'A') && (host[i] <= 'Z')) ||
-					((host[i] >= 'a') && (host[i] <= 'z')) ||
-					((host[i] == '-') && (i > 0) && (i+1 < host.size()) && (host[i-1] != '.') && (host[i+1] != '.')) ||
-					((host[i] == '.') && (i > 0) && (i+1 < host.size())) )
-
-				continue;
-			else
-				return false;
-		}
-
-		return true;
-	}
-
-	virtual Version GetVersion()
-	{
-		return Version("Change user's hosts connecting from known CGI:IRC hosts",VF_VENDOR);
+		return Version("Enables forwarding the real IP address of a user from a gateway to the IRC server", VF_VENDOR);
 	}
-
 };
 
 MODULE_INIT(ModuleCgiIRC)