X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cgiirc.cpp;h=27309e677b51372e45e8e5448f086a159d7d3430;hb=ced8a722ae62567a708e82f0b72649a5c9399c40;hp=06da29bc0c454130f691cfed033966a0d3b20020;hpb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 06da29bc0..27309e677 100644
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -26,7 +26,7 @@ enum CGItype { INVALID, PASS, IDENT, PASSFIRST, IDENTFIRST, WEBIRC };
 
 /** Holds a CGI site's details
  */
-class CGIhost : public classbase
+class CGIhost
 {
 public:
 	std::string hostmask;
@@ -53,12 +53,20 @@ typedef std::vector<CGIhost> CGIHostlist;
  */
 class CommandWebirc : public Command
 {
-	CGIHostlist Hosts;
 	bool notify;
-	public:
-		CommandWebirc(InspIRCd* Instance, CGIHostlist &cHosts, bool bnotify) : Command(Instance, "WEBIRC", 0, 4, true), Hosts(cHosts), notify(bnotify)
+ public:
+	StringExtItem realhost;
+	StringExtItem realip;
+	LocalStringExt webirc_hostname;
+	LocalStringExt webirc_ip;
+
+	CGIHostlist Hosts;
+	CommandWebirc(Module* Creator, bool bnotify)
+		: Command(Creator, "WEBIRC", 4), notify(bnotify),
+		  realhost("cgiirc_realhost", Creator), realip("cgiirc_realip", Creator),
+		  webirc_hostname("cgiirc_webirc_hostname", Creator), webirc_ip("cgiirc_webirc_ip", Creator)
 		{
-			this->source = "m_cgiirc.so";
+			works_before_reg = true;
 			this->syntax = "password client hostname ip";
 		}
 		CmdResult Handle(const std::vector<std::string> &parameters, User *user)
@@ -72,16 +80,18 @@ class CommandWebirc : public Command
 				{
 					if(iter->type == WEBIRC && parameters[0] == iter->password)
 					{
-						user->Extend("cgiirc_realhost", new std::string(user->host));
-						user->Extend("cgiirc_realip", new std::string(user->GetIPString()));
+						realhost.set(user, user->host);
+						realip.set(user, user->GetIPString());
 						if (notify)
-							ServerInstance->SNO->WriteToSnoMask('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());
-						user->Extend("cgiirc_webirc_hostname", new std::string(parameters[2]));
-						user->Extend("cgiirc_webirc_ip", new std::string(parameters[3]));
-						return CMD_LOCALONLY;
+							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());
+						webirc_hostname.set(user, parameters[2]);
+						webirc_ip.set(user, parameters[3]);
+						return CMD_SUCCESS;
 					}
 				}
 			}
+
+			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;
 		}
 };
@@ -93,28 +103,24 @@ class CGIResolver : public Resolver
 {
 	std::string typ;
 	int theirfd;
-	User* them;
+	LocalUser* them;
 	bool notify;
  public:
-	CGIResolver(Module* me, InspIRCd* Instance, bool NotifyOpers, const std::string &source, bool forward, User* u, int userfd, const std::string &type, bool &cached)
-		: Resolver(Instance, source, forward ? DNS_QUERY_A : DNS_QUERY_PTR4, cached, me), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { }
+	CGIResolver(Module* me, bool NotifyOpers, const std::string &source, bool forward, LocalUser* u, int userfd, const std::string &type, bool &cached)
+		: Resolver(source, forward ? DNS_QUERY_A : DNS_QUERY_PTR4, cached, me), typ(type), theirfd(userfd), them(u), notify(NotifyOpers) { }
 
-	virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0)
+	virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
 	{
-		if (resultnum)
-			return;
-
 		/* Check the user still exists */
-		if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))
+		if ((them) && (&them->eh == ServerInstance->SE->GetRef(theirfd)))
 		{
 			if (notify)
-				ServerInstance->SNO->WriteToSnoMask('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());
+				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());
 
-			them->host.assign(result,0, 64);
-			them->dhost.assign(result, 0, 64);
-			if (querytype)
-				them->SetSockAddr(them->GetProtocolFamily(), result.c_str(), them->GetPort());
-			them->ident.assign("~cgiirc", 0, 8);
+			if (result.length() > 64)
+				return;
+			them->host = result;
+			them->dhost = result;
 			them->InvalidateCache();
 			them->CheckLines(true);
 		}
@@ -122,10 +128,10 @@ class CGIResolver : public Resolver
 
 	virtual void OnError(ResolverError e, const std::string &errormessage)
 	{
-		if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))
+		if ((them) && (&them->eh == ServerInstance->SE->GetRef(theirfd)))
 		{
 			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());
 		}
 	}
 
@@ -136,31 +142,32 @@ class CGIResolver : public Resolver
 
 class ModuleCgiIRC : public Module
 {
-	CommandWebirc* mycommand;
+	CommandWebirc cmd;
 	bool NotifyOpers;
-	CGIHostlist Hosts;
 public:
-	ModuleCgiIRC(InspIRCd* Me) : Module(Me)
+	ModuleCgiIRC() : cmd(this, NotifyOpers)
 	{
-
-		OnRehash(NULL,"");
-		mycommand = new CommandWebirc(Me, Hosts, NotifyOpers);
-		ServerInstance->AddCommand(mycommand);
-
-		Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCleanup, I_OnSyncUserMetaData, I_OnDecodeMetaData, I_OnUserDisconnect, I_OnUserConnect };
-		ServerInstance->Modules->Attach(eventlist, this, 7);
+		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);
+
+		Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnDecodeMetaData, I_OnUserDisconnect, I_OnUserConnect };
+		ServerInstance->Modules->Attach(eventlist, this, 5);
 	}
 
 
 	virtual void Prioritize()
 	{
-		ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIO_FIRST);
+		ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_FIRST);
 	}
 
-	virtual void OnRehash(User* user, const std::string &parameter)
+	virtual void OnRehash(User* user)
 	{
-		ConfigReader Conf(ServerInstance);
-		Hosts.clear();
+		ConfigReader Conf;
+		cmd.Hosts.clear();
 
 		NotifyOpers = Conf.ReadFlag("cgiirc", "opernotice", 0);	// If we send an oper notice when a CGI:IRC has their host changed.
 
@@ -195,7 +202,7 @@ public:
 					if (cgitype == INVALID)
 						cgitype = PASS;
 
-					Hosts.push_back(CGIhost(hostmask,cgitype, password.length() ? password : "" ));
+					cmd.Hosts.push_back(CGIhost(hostmask,cgitype, password.length() ? password : "" ));
 				}
 			}
 			else
@@ -206,63 +213,9 @@ public:
 		}
 	}
 
-	virtual void OnCleanup(int target_type, void* item)
-	{
-		if(target_type == TYPE_USER)
-		{
-			User* user = (User*)item;
-			std::string* realhost;
-			std::string* realip;
-
-			if(user->GetExt("cgiirc_realhost", realhost))
-			{
-				delete realhost;
-				user->Shrink("cgiirc_realhost");
-			}
-
-			if(user->GetExt("cgiirc_realip", realip))
-			{
-				delete realip;
-				user->Shrink("cgiirc_realip");
-			}
-		}
-	}
-
-	virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
-	{
-		if((extname == "cgiirc_realhost") || (extname == "cgiirc_realip"))
-		{
-			std::string* data;
-
-			if(user->GetExt(extname, data))
-			{
-				proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, *data);
-			}
-		}
-	}
-
-	virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata)
-	{
-		if(target_type == TYPE_USER)
-		{
-			User* dest = (User*)target;
-			std::string* bleh;
-			if(((extname == "cgiirc_realhost") || (extname == "cgiirc_realip")) && (!dest->GetExt(extname, bleh)))
-			{
-				dest->Extend(extname, new std::string(extdata));
-			}
-		}
-	}
-
-	virtual void OnUserDisconnect(User* user)
+	virtual ModResult OnUserRegister(LocalUser* user)
 	{
-		OnCleanup(TYPE_USER, user);
-	}
-
-
-	virtual int OnUserRegister(User* user)
-	{
-		for(CGIHostlist::iterator iter = Hosts.begin(); iter != Hosts.end(); iter++)
+		for(CGIHostlist::iterator iter = cmd.Hosts.begin(); iter != cmd.Hosts.end(); iter++)
 		{
 			if(InspIRCd::Match(user->host, iter->hostmask, ascii_case_insensitive_map) || InspIRCd::MatchCIDR(user->GetIPString(), iter->hostmask, ascii_case_insensitive_map))
 			{
@@ -293,83 +246,65 @@ public:
 				{
 					// We don't need to do anything here
 				}
-				return 0;
+				return MOD_RES_PASSTHRU;
 			}
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
-	virtual void OnUserConnect(User* user)
+	virtual void OnUserConnect(LocalUser* user)
 	{
-		std::string *webirc_hostname, *webirc_ip;
-		if(user->GetExt("cgiirc_webirc_hostname", webirc_hostname))
+		std::string *webirc_hostname = cmd.webirc_hostname.get(user);
+		std::string *webirc_ip = cmd.webirc_ip.get(user);
+		if (webirc_hostname && webirc_hostname->length() < 64)
 		{
-			user->host.assign(*webirc_hostname, 0, 64);
-			user->dhost.assign(*webirc_hostname, 0, 64);
-			delete webirc_hostname;
+			user->host = *webirc_hostname;
+			user->dhost = *webirc_hostname;
 			user->InvalidateCache();
-			user->Shrink("cgiirc_webirc_hostname");
 		}
-		if(user->GetExt("cgiirc_webirc_ip", webirc_ip))
+		if (webirc_ip)
 		{
 			ServerInstance->Users->RemoveCloneCounts(user);
-			user->SetSockAddr(user->GetProtocolFamily(), webirc_ip->c_str(), user->GetPort());
-			delete webirc_ip;
+			user->SetClientIP(webirc_ip->c_str());
 			user->InvalidateCache();
-			user->Shrink("cgiirc_webirc_ip");
+			cmd.webirc_ip.unset(user);
 			ServerInstance->Users->AddLocalClone(user);
 			ServerInstance->Users->AddGlobalClone(user);
+			user->SetClass();
 			user->CheckClass();
 			user->CheckLines(true);
 		}
+		cmd.webirc_hostname.unset(user);
 	}
 
-	bool CheckPass(User* user)
+	bool CheckPass(LocalUser* user)
 	{
 		if(IsValidHost(user->password))
 		{
-			user->Extend("cgiirc_realhost", new std::string(user->host));
-			user->Extend("cgiirc_realip", new std::string(user->GetIPString()));
-			user->host.assign(user->password, 0, 64);
-			user->dhost.assign(user->password, 0, 64);
+			cmd.realhost.set(user, user->host);
+			cmd.realip.set(user, user->GetIPString());
+			user->host = user->password;
+			user->dhost = user->password;
 			user->InvalidateCache();
 
-			bool valid = false;
 			ServerInstance->Users->RemoveCloneCounts(user);
-#ifdef IPV6
-			if (user->GetProtocolFamily() == AF_INET6)
-				valid = (inet_pton(AF_INET6, user->password.c_str(), &((sockaddr_in6*)user->ip)->sin6_addr) > 0);
-			else
-				valid = (inet_aton(user->password.c_str(), &((sockaddr_in*)user->ip)->sin_addr));
-#else
-			if (inet_aton(user->password.c_str(), &((sockaddr_in*)user->ip)->sin_addr))
-				valid = true;
-#endif
+			user->SetClientIP(user->password.c_str());
 			ServerInstance->Users->AddLocalClone(user);
 			ServerInstance->Users->AddGlobalClone(user);
+			user->SetClass();
 			user->CheckClass();
 
-			if (valid)
+			try
 			{
-				/* We were given a IP in the password, we don't do DNS so they get this is as their host as well. */
-				if(NotifyOpers)
-					ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick.c_str(), user->host.c_str(), user->password.c_str());
+
+				bool cached;
+				CGIResolver* r = new CGIResolver(this, NotifyOpers, user->password, false, user, user->GetFd(), "PASS", cached);
+				ServerInstance->AddResolver(r, cached);
 			}
-			else
+			catch (...)
 			{
-				/* We got as resolved hostname in the password. */
-				try
-				{
-
-					bool cached;
-					CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, user->password, false, user, user->GetFd(), "PASS", cached);
-					ServerInstance->AddResolver(r, cached);
-				}
-				catch (...)
-				{
-					if (NotifyOpers)
-						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());
-				}
+				if (NotifyOpers)
+					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());
 			}
 
 			user->password.clear();
@@ -379,12 +314,11 @@ public:
 		return false;
 	}
 
-	bool CheckIdent(User* user)
+	bool CheckIdent(LocalUser* user)
 	{
-		int ip[4];
 		const char* ident;
-		char newip[16];
 		int len = user->ident.length();
+		in_addr newip;
 
 		if(len == 8)
 			ident = user->ident.c_str();
@@ -393,38 +327,37 @@ public:
 		else
 			return false;
 
-		for(int i = 0; i < 4; i++)
-			if(!HexToInt(ip[i], ident + i*2))
-				return false;
-
-		snprintf(newip, 16, "%d.%d.%d.%d", ip[0], ip[1], ip[2], ip[3]);
+		errno = 0;
+		unsigned long ipaddr = strtoul(ident, NULL, 16);
+		if (errno)
+			return false;
+		newip.s_addr = htonl(ipaddr);
+		char* newipstr = inet_ntoa(newip);
 
-		user->Extend("cgiirc_realhost", new std::string(user->host));
-		user->Extend("cgiirc_realip", new std::string(user->GetIPString()));
+		cmd.realhost.set(user, user->host);
+		cmd.realip.set(user, user->GetIPString());
 		ServerInstance->Users->RemoveCloneCounts(user);
-		user->SetSockAddr(user->GetProtocolFamily(), newip, user->GetPort());
+		user->SetClientIP(newipstr);
 		ServerInstance->Users->AddLocalClone(user);
 		ServerInstance->Users->AddGlobalClone(user);
+		user->SetClass();
 		user->CheckClass();
+		user->host = newipstr;
+		user->dhost = newipstr;
+		user->ident.assign("~cgiirc", 0, 8);
 		try
 		{
-			user->host.assign(newip, 0, 16);
-			user->dhost.assign(newip, 0, 16);
-			user->ident.assign("~cgiirc", 0, 8);
 
 			bool cached;
-			CGIResolver* r = new CGIResolver(this, ServerInstance, NotifyOpers, newip, false, user, user->GetFd(), "IDENT", cached);
+			CGIResolver* r = new CGIResolver(this, NotifyOpers, newipstr, false, user, user->GetFd(), "IDENT", cached);
 			ServerInstance->AddResolver(r, cached);
 		}
 		catch (...)
 		{
-			user->host.assign(newip, 0, 16);
-			user->dhost.assign(newip, 0, 16);
-			user->ident.assign("~cgiirc", 0, 8);
 			user->InvalidateCache();
 
 			if(NotifyOpers)
-				 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!", user->nick.c_str(), user->host.c_str());
 		}
 
 		return true;
@@ -432,7 +365,7 @@ public:
 
 	bool IsValidHost(const std::string &host)
 	{
-		if(!host.size())
+		if(!host.size() || host.size() > 64)
 			return false;
 
 		for(unsigned int i = 0; i < host.size(); i++)
@@ -486,27 +419,13 @@ public:
 		return true;
 	}
 
-	bool HexToInt(int &out, const char* in)
-	{
-		char ip[3];
-		ip[0] = in[0];
-		ip[1] = in[1];
-		ip[2] = 0;
-		out = strtol(ip, NULL, 16);
-
-		if(out > 255 || out < 0)
-			return false;
-
-		return true;
-	}
-
 	virtual ~ModuleCgiIRC()
 	{
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version("$Id$",VF_VENDOR,API_VERSION);
+		return Version("Change user's hosts connecting from known CGI:IRC hosts",VF_VENDOR);
 	}
 
 };