X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cgiirc.cpp;h=3e00f498d9ed2dd621a853647dd3974706636580;hb=8085aa879bd989b526791797910295944a364084;hp=691c54184ad19ab3df0b80afce5246796a160b2c;hpb=6d6feb70a3647567248b81d76fbb3c0dd6f4b2b9;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 691c54184..3e00f498d 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-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -53,10 +53,10 @@ typedef std::vector<CGIhost> CGIHostlist;
  */
 class CommandWebirc : public Command
 {
-	CGIHostlist Hosts;
-	bool notify;
+		bool notify;
 	public:
-		CommandWebirc(InspIRCd* Instance, CGIHostlist &cHosts, bool bnotify) : Command(Instance, "WEBIRC", 0, 4, true), Hosts(cHosts), notify(bnotify)
+		CGIHostlist Hosts;
+		CommandWebirc(InspIRCd* Instance, bool bnotify) : Command(Instance, "WEBIRC", 0, 4, true), notify(bnotify)
 		{
 			this->source = "m_cgiirc.so";
 			this->syntax = "password client hostname ip";
@@ -65,23 +65,25 @@ class CommandWebirc : public Command
 		{
 			if(user->registered == REG_ALL)
 				return CMD_FAILURE;
-			
+
 			for(CGIHostlist::iterator iter = Hosts.begin(); iter != Hosts.end(); iter++)
 			{
-				if(ServerInstance->MatchText(user->host, iter->hostmask) || ServerInstance->MatchText(user->GetIPString(), iter->hostmask))
+				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)
 					{
 						user->Extend("cgiirc_realhost", new std::string(user->host));
 						user->Extend("cgiirc_realip", new std::string(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, parameters[2].c_str(), user->host);
+							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());
 						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 tried to use WEBIRC, but didn't match any configured webirc blocks.", user->GetFullRealHost().c_str());
 			return CMD_FAILURE;
 		}
 };
@@ -99,22 +101,21 @@ class CGIResolver : public Resolver
 	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) { }
 
-	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 (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, 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());
 
-			strlcpy(them->host, result.c_str(), 63);
-			them->dhost.assign(result, 0, 63);
+			them->host.assign(result,0, 64);
+			them->dhost.assign(result, 0, 64);
+			if (querytype)
+				them->SetClientIP(result.c_str());
 			them->ident.assign("~cgiirc", 0, 8);
 			them->InvalidateCache();
-			them->CheckLines();
+			them->CheckLines(true);
 		}
 	}
 
@@ -123,7 +124,7 @@ class CGIResolver : public Resolver
 		if ((them) && (them == 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, 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());
 		}
 	}
 
@@ -134,43 +135,40 @@ class CGIResolver : public Resolver
 
 class ModuleCgiIRC : public Module
 {
-	CommandWebirc* mycommand;
+	CommandWebirc cmd;
 	bool NotifyOpers;
-	CGIHostlist Hosts;
 public:
-	ModuleCgiIRC(InspIRCd* Me) : Module(Me)
+	ModuleCgiIRC(InspIRCd* Me) : Module(Me), cmd(Me, NotifyOpers)
 	{
-		
-		OnRehash(NULL,"");
-		mycommand = new CommandWebirc(Me, Hosts, NotifyOpers);
-		ServerInstance->AddCommand(mycommand);
+		OnRehash(NULL);
+		ServerInstance->AddCommand(&cmd);
 
-		Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCleanup, I_OnSyncUserMetaData, I_OnDecodeMetaData, I_OnUserDisconnect, I_OnUserConnect };
+		Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnCleanup, I_OnSyncUser, I_OnDecodeMetaData, I_OnUserDisconnect, I_OnUserConnect };
 		ServerInstance->Modules->Attach(eventlist, this, 7);
 	}
 
-	
+
 	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();
-		
+		cmd.Hosts.clear();
+
 		NotifyOpers = Conf.ReadFlag("cgiirc", "opernotice", 0);	// If we send an oper notice when a CGI:IRC has their host changed.
-		
+
 		if(Conf.GetError() == CONF_VALUE_NOT_FOUND)
 			NotifyOpers = true;
-		
+
 		for(int i = 0; i < Conf.Enumerate("cgihost"); i++)
 		{
 			std::string hostmask = Conf.ReadValue("cgihost", "mask", i); // An allowed CGI:IRC host
 			std::string type = Conf.ReadValue("cgihost", "type", i); // What type of user-munging we do on this host.
 			std::string password = Conf.ReadValue("cgihost", "password", i);
-			
+
 			if(hostmask.length())
 			{
 				if (type == "webirc" && !password.length()) {
@@ -193,7 +191,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
@@ -211,13 +209,13 @@ public:
 			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;
@@ -225,30 +223,23 @@ public:
 			}
 		}
 	}
-	
-	virtual void OnSyncUserMetaData(User* user, Module* proto, void* opaque, const std::string &extname, bool displayable)
+
+	virtual void OnSyncUser(User* user, Module* proto, void* opaque)
 	{
-		if((extname == "cgiirc_realhost") || (extname == "cgiirc_realip"))
-		{
-			std::string* data;
-			
-			if(user->GetExt(extname, data))
-			{
-				proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, *data);
-			}
-		}
+		std::string* data;
+		if (user->GetExt("cgiirc_realhost", data))
+			proto->ProtoSendMetaData(opaque, user, "cgiirc_realhost", *data);
+		if (user->GetExt("cgiirc_realip", data))
+			proto->ProtoSendMetaData(opaque, user, "cgiirc_realip", *data);
 	}
 
-	virtual void OnDecodeMetaData(int target_type, void* target, const std::string &extname, const std::string &extdata)
+	virtual void OnDecodeMetaData(Extensible* target, const std::string &extname, const std::string &extdata)
 	{
-		if(target_type == TYPE_USER)
+		User* dest = dynamic_cast<User*>(target);
+		std::string* bleh;
+		if(dest && ((extname == "cgiirc_realhost") || (extname == "cgiirc_realip")) && (!dest->GetExt(extname, bleh)))
 		{
-			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));
-			}
+			dest->Extend(extname, new std::string(extdata));
 		}
 	}
 
@@ -256,36 +247,36 @@ public:
 	{
 		OnCleanup(TYPE_USER, user);
 	}
-	
+
 
 	virtual int OnUserRegister(User* user)
-	{	
-		for(CGIHostlist::iterator iter = Hosts.begin(); iter != Hosts.end(); iter++)
-		{			
-			if(ServerInstance->MatchText(user->host, iter->hostmask) || ServerInstance->MatchText(user->GetIPString(), iter->hostmask))
+	{
+		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))
 			{
 				// Deal with it...
 				if(iter->type == PASS)
 				{
 					CheckPass(user); // We do nothing if it fails so...
-					user->CheckLines();
+					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();
+					user->CheckLines(true);
 				}
 				else if(iter->type == IDENT)
 				{
 					CheckIdent(user); // Nothing on failure.
-					user->CheckLines();
+					user->CheckLines(true);
 				}
 				else if(iter->type == IDENTFIRST && !CheckIdent(user))
 				{
 					// If the ident lookup fails, try the password.
 					CheckPass(user);
-					user->CheckLines();
+					user->CheckLines(true);
 				}
 				else if(iter->type == WEBIRC)
 				{
@@ -302,33 +293,23 @@ public:
 		std::string *webirc_hostname, *webirc_ip;
 		if(user->GetExt("cgiirc_webirc_hostname", webirc_hostname))
 		{
-			strlcpy(user->host,webirc_hostname->c_str(),63);
-			user->dhost.assign(*webirc_hostname, 0, 63);
+			user->host.assign(*webirc_hostname, 0, 64);
+			user->dhost.assign(*webirc_hostname, 0, 64);
 			delete webirc_hostname;
 			user->InvalidateCache();
 			user->Shrink("cgiirc_webirc_hostname");
 		}
 		if(user->GetExt("cgiirc_webirc_ip", webirc_ip))
 		{
-			bool valid=false;
 			ServerInstance->Users->RemoveCloneCounts(user);
-#ifdef IPV6
-			valid = (inet_pton(AF_INET6, webirc_ip->c_str(), &((sockaddr_in6*)user->ip)->sin6_addr) > 0); 
-
-			if(!valid)
-				valid = (inet_aton(webirc_ip->c_str(), &((sockaddr_in*)user->ip)->sin_addr));
-#else
-			if (inet_aton(webirc_ip->c_str(), &((sockaddr_in*)user->ip)->sin_addr))
-				valid = true;
-#endif
-
+			user->SetClientIP(webirc_ip->c_str());
 			delete webirc_ip;
 			user->InvalidateCache();
 			user->Shrink("cgiirc_webirc_ip");
 			ServerInstance->Users->AddLocalClone(user);
 			ServerInstance->Users->AddGlobalClone(user);
 			user->CheckClass();
-			user->CheckLines();
+			user->CheckLines(true);
 		}
 	}
 
@@ -338,21 +319,13 @@ public:
 		{
 			user->Extend("cgiirc_realhost", new std::string(user->host));
 			user->Extend("cgiirc_realip", new std::string(user->GetIPString()));
-			strlcpy(user->host, user->password.c_str(), 64);
+			user->host.assign(user->password, 0, 64);
 			user->dhost.assign(user->password, 0, 64);
 			user->InvalidateCache();
 
 			bool valid = false;
 			ServerInstance->Users->RemoveCloneCounts(user);
-#ifdef IPV6
-			if (user->GetProtocolFamily() == AF_INET6)
-				valid = (inet_pton(AF_INET6, user->password, &((sockaddr_in6*)user->ip)->sin6_addr) > 0);
-			else
-				valid = (inet_aton(user->password, &((sockaddr_in*)user->ip)->sin_addr));
-#else
-			if (inet_aton(user->password.c_str(), &((sockaddr_in*)user->ip)->sin_addr))
-				valid = true;
-#endif
+			valid = user->SetClientIP(user->password.c_str());
 			ServerInstance->Users->AddLocalClone(user);
 			ServerInstance->Users->AddGlobalClone(user);
 			user->CheckClass();
@@ -361,7 +334,7 @@ public:
 			{
 				/* 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, user->password.c_str());
+					ServerInstance->SNO->WriteGlobalSno('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());
 			}
 			else
 			{
@@ -376,85 +349,70 @@ public:
 				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);
+						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();
-
-			/*if(NotifyOpers)
-				ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as using CGI:IRC (%s), changing real host to %s from PASS", user->nick, user->host, user->password);*/
 
+			user->password.clear();
 			return true;
 		}
-		
+
 		return false;
 	}
-	
+
 	bool CheckIdent(User* 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();
 		else if(len == 9 && user->ident[0] == '~')
 			ident = user->ident.c_str() + 1;
 		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()));
 		ServerInstance->Users->RemoveCloneCounts(user);
-#ifdef IPV6
-		if (user->GetProtocolFamily() == AF_INET6)
-			inet_pton(AF_INET6, newip, &((sockaddr_in6*)user->ip)->sin6_addr);
-		else
-#endif
-		inet_aton(newip, &((sockaddr_in*)user->ip)->sin_addr);
+		user->SetClientIP(newipstr);
 		ServerInstance->Users->AddLocalClone(user);
 		ServerInstance->Users->AddGlobalClone(user);
 		user->CheckClass();
+		user->host = newipstr;
+		user->dhost = newipstr;
+		user->ident.assign("~cgiirc", 0, 8);
 		try
 		{
-			strlcpy(user->host, newip, 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, ServerInstance, NotifyOpers, newipstr, false, user, user->GetFd(), "IDENT", cached);
 			ServerInstance->AddResolver(r, cached);
 		}
 		catch (...)
 		{
-			strlcpy(user->host, newip, 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);
+				 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());
 		}
-		/*strlcpy(user->host, newip, 16);
-		strlcpy(user->dhost, newip, 16);
-		strlcpy(user->ident, "~cgiirc", 8);*/
 
 		return true;
 	}
-	
+
 	bool IsValidHost(const std::string &host)
 	{
 		if(!host.size())
 			return false;
-	
+
 		for(unsigned int i = 0; i < host.size(); i++)
 		{
 			if(	((host[i] >= '0') && (host[i] <= '9')) ||
@@ -462,12 +420,12 @@ public:
 					((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;
 	}
 
@@ -475,10 +433,10 @@ public:
 	{
 		if(ip.size() < 7 || ip.size() > 15)
 			return false;
-	
+
 		short sincedot = 0;
 		short dots = 0;
-	
+
 		for(unsigned int i = 0; i < ip.size(); i++)
 		{
 			if((dots <= 3) && (sincedot <= 3))
@@ -496,39 +454,25 @@ public:
 			else
 			{
 				return false;
-			
+
 			}
 		}
-		
+
 		if(dots != 3)
 			return false;
-		
-		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(1,2,0,0,VF_VENDOR,API_VERSION);
+		return Version("$Id$",VF_VENDOR,API_VERSION);
 	}
-	
+
 };
 
 MODULE_INIT(ModuleCgiIRC)