X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cloaking.cpp;h=2bd8df80eea37f9dc6b3126e44c85cd0ba8e0b31;hb=de25d946733f774e3a5b53a58438a9c92af0acbe;hp=7eb2abd173bd0eea2fa5d2891cfb02a1edc7643f;hpb=27e0df3719ce1d6153f8f332d23631044b3c9a79;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index 7eb2abd17..2bd8df80e 100644
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -3,7 +3,7 @@
  *       +------------------------------------+
  *
  *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *	    the file COPYING for details.
@@ -28,9 +28,9 @@ class CloakUser : public ModeHandler
 	unsigned int key3;
 	unsigned int key4;
 	bool ipalways;
-	Module* Sender;
 	Module* HashProvider;
 	const char *xtab[4];
+	LocalStringExt ext;
 
 	/** This function takes a domain name string and returns just the last two domain parts,
 	 * or the last domain part if only two are available. Failing that it just returns what it was given.
@@ -63,11 +63,13 @@ class CloakUser : public ModeHandler
 			return host.substr(splitdot);
 	}
 
-	CloakUser(InspIRCd* Instance, Module* source, Module* Hash) : ModeHandler(Instance, 'x', 0, 0, false, MODETYPE_USER, false), Sender(source), HashProvider(Hash)
+	CloakUser(Module* source, Module* Hash)
+		: ModeHandler(source, 'x', PARAM_NONE, MODETYPE_USER), HashProvider(Hash),
+		ext("cloaked_host", source)
 	{
 	}
 
-	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
 	{
 		/* For remote clients, we dont take any action, we just allow it.
 		 * The local server where they are will set their cloak instead.
@@ -95,14 +97,15 @@ class CloakUser : public ModeHandler
 				 * are connecting via localhost) -- this doesnt matter much.
 				 */
 
-				std::string* cloak;
+				std::string* cloak = ext.get(dest);
 
-				if (!dest->GetExt("cloaked_host", cloak))
+				if (!cloak)
 				{
 					/* Force creation of missing cloak */
-					Sender->OnUserConnect(dest);
+					creator->OnUserConnect(dest);
+					cloak = ext.get(dest);
 				}
-				if (dest->GetExt("cloaked_host", cloak))
+				if (cloak)
 				{
 					dest->ChangeDisplayedHost(cloak->c_str());
 					dest->SetMode('x',true);
@@ -145,14 +148,14 @@ class CloakUser : public ModeHandler
 		octet[1] = octet[0] + "." + octet[1];
 
 		/* Reset the Hash module and send it our IV */
-		HashResetRequest(Sender, HashProvider).Send();
-		HashKeyRequest(Sender, HashProvider, iv).Send();
+		HashResetRequest(creator, HashProvider).Send();
+		HashKeyRequest(creator, HashProvider, iv).Send();
 
 		/* Send the Hash module a different hex table for each octet group's Hash sum */
 		for (int k = 0; k < 4; k++)
 		{
-			HashHexRequest(Sender, HashProvider, xtab[(iv[k]+i[k]) % 4]).Send();
-			ra[k] = std::string(HashSumRequest(Sender, HashProvider, octet[k]).Send()).substr(0,6);
+			HashHexRequest(creator, HashProvider, xtab[(iv[k]+i[k]) % 4]).Send();
+			ra[k] = std::string(HashSumRequest(creator, HashProvider, octet[k]).Send()).substr(0,6);
 		}
 		/* Stick them all together */
 		return std::string().append(ra[0]).append(".").append(ra[1]).append(".").append(ra[2]).append(".").append(ra[3]);
@@ -166,8 +169,8 @@ class CloakUser : public ModeHandler
 		int rounds = 0;
 
 		/* Reset the Hash module and send it our IV */
-		HashResetRequest(Sender, HashProvider).Send();
-		HashKeyRequest(Sender, HashProvider, iv).Send();
+		HashResetRequest(creator, HashProvider).Send();
+		HashKeyRequest(creator, HashProvider, iv).Send();
 
 		for (const char* input = ip; *input; input++)
 		{
@@ -175,8 +178,8 @@ class CloakUser : public ModeHandler
 			if (item.length() > 7)
 			{
 				/* Send the Hash module a different hex table for each octet group's Hash sum */
-				HashHexRequest(Sender, HashProvider, xtab[(key1+rounds) % 4]).Send();
-				hashies.push_back(std::string(HashSumRequest(Sender, HashProvider, item).Send()).substr(0,8));
+				HashHexRequest(creator, HashProvider, xtab[(key1+rounds) % 4]).Send();
+				hashies.push_back(std::string(HashSumRequest(creator, HashProvider, item).Send()).substr(0,8));
 				item.clear();
 			}
 			rounds++;
@@ -184,8 +187,8 @@ class CloakUser : public ModeHandler
 		if (!item.empty())
 		{
 			/* Send the Hash module a different hex table for each octet group's Hash sum */
-			HashHexRequest(Sender, HashProvider, xtab[(key1+rounds) % 4]).Send();
-			hashies.push_back(std::string(HashSumRequest(Sender, HashProvider, item).Send()).substr(0,8));
+			HashHexRequest(creator, HashProvider, xtab[(key1+rounds) % 4]).Send();
+			hashies.push_back(std::string(HashSumRequest(creator, HashProvider, item).Send()).substr(0,8));
 			item.clear();
 		}
 		/* Stick them all together */
@@ -194,7 +197,7 @@ class CloakUser : public ModeHandler
 
 	void DoRehash()
 	{
-		ConfigReader Conf(ServerInstance);
+		ConfigReader Conf;
 		bool lowercase;
 
 		/* These are *not* using the need_positive parameter of ReadInteger -
@@ -250,24 +253,21 @@ class CloakUser : public ModeHandler
 class ModuleCloaking : public Module
 {
  private:
-
  	CloakUser* cu;
-	Module* HashModule;
 
  public:
-	ModuleCloaking(InspIRCd* Me)
-		: Module(Me)
+	ModuleCloaking()
 	{
 		/* Attempt to locate the md5 service provider, bail if we can't find it */
-		HashModule = ServerInstance->Modules->Find("m_md5.so");
+		Module* HashModule = ServerInstance->Modules->Find("m_md5.so");
 		if (!HashModule)
 			throw ModuleException("Can't find m_md5.so. Please load m_md5.so before m_cloaking.so.");
 
-		cu = new CloakUser(ServerInstance, this, HashModule);
+		cu = new CloakUser(this, HashModule);
 
 		try
 		{
-			OnRehash(NULL,"");
+			OnRehash(NULL);
 		}
 		catch (ModuleException &e)
 		{
@@ -283,50 +283,39 @@ class ModuleCloaking : public Module
 		}
 
 		ServerInstance->Modules->UseInterface("HashRequest");
+		Extensible::Register(&cu->ext);
 
-		Implementation eventlist[] = { I_OnRehash, I_OnUserDisconnect, I_OnCleanup, I_OnCheckBan, I_OnUserConnect, I_OnSyncUserMetaData, I_OnCleanup };
-		ServerInstance->Modules->Attach(eventlist, this, 6);
+		Implementation eventlist[] = { I_OnRehash, I_OnCheckBan, I_OnUserConnect };
+		ServerInstance->Modules->Attach(eventlist, this, 3);
 
 		CloakExistingUsers();
 	}
 
-	void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
-	{
-		if ((displayable) && (extname == "cloaked_host"))
-		{
-			std::string* cloak;
-			if (user->GetExt("cloaked_host", cloak))
-				proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, *cloak);
-		}
-	}
-
 	void CloakExistingUsers()
 	{
 		std::string* cloak;
 		for (std::vector<User*>::iterator u = ServerInstance->Users->local_users.begin(); u != ServerInstance->Users->local_users.end(); u++)
 		{
-			if (!(*u)->GetExt("cloaked_host", cloak))
+			cloak = cu->ext.get(*u);
+			if (!cloak)
 			{
 				OnUserConnect(*u);
 			}
 		}
 	}
 
-	virtual int OnCheckBan(User* user, Channel* chan)
+	ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask)
 	{
-		char mask[MAXBUF];
-		std::string* tofree;
+		char cmask[MAXBUF];
+		std::string* cloak = cu->ext.get(user);
 		/* Check if they have a cloaked host, but are not using it */
-		if (user->GetExt("cloaked_host", tofree) && *tofree != user->dhost)
+		if (cloak && *cloak != user->dhost)
 		{
-			snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), tofree->c_str());
-			for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
-			{
-				if (InspIRCd::Match(mask,i->data))
-					return -1;
-			}
+			snprintf(cmask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), cloak->c_str());
+			if (InspIRCd::Match(cmask,mask))
+				return MOD_RES_DENY;
 		}
-		return 0;
+		return MOD_RES_PASSTHRU;
 	}
 
  	void Prioritize()
@@ -339,45 +328,29 @@ class ModuleCloaking : public Module
 		ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_AFTER, &um);
 	}
 
-	virtual void OnUserDisconnect(User* user)
-	{
-		std::string* tofree;
-		if (user->GetExt("cloaked_host", tofree))
-		{
-			delete tofree;
-			user->Shrink("cloaked_host");
-		}
-	}
-
-	virtual void OnCleanup(int target_type, void* item)
-	{
-		if (target_type == TYPE_USER)
-			OnUserDisconnect((User*)item);
-	}
-
-	virtual ~ModuleCloaking()
+	~ModuleCloaking()
 	{
 		ServerInstance->Modes->DelMode(cu);
 		delete cu;
 		ServerInstance->Modules->DoneWithInterface("HashRequest");
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion()
 	{
 		// returns the version number of the module to be
 		// listed in /MODULES
-		return Version("$Id$", VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("Provides masking of user hostnames", VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
-	virtual void OnRehash(User* user, const std::string &parameter)
+	void OnRehash(User* user)
 	{
 		cu->DoRehash();
 	}
 
-	virtual void OnUserConnect(User* dest)
+	void OnUserConnect(User* dest)
 	{
-		std::string* tofree;
-		if (dest->GetExt("cloaked_host", tofree))
+		std::string* cloak = cu->ext.get(dest);
+		if (cloak)
 			return;
 
 		if (dest->host.find('.') != std::string::npos || dest->host.find(':') != std::string::npos)
@@ -410,39 +383,25 @@ class ModuleCloaking : public Module
 				 * Their ISP shouldnt go to town on subdomains, or they shouldnt have a kiddie
 				 * vhost.
 				 */
-#ifdef IPV6
-				in6_addr testaddr;
-				in_addr testaddr2;
-				if ((dest->GetProtocolFamily() == AF_INET6) && (inet_pton(AF_INET6,dest->host.c_str(),&testaddr) < 1) && (hostcloak.length() <= 64))
-					/* Invalid ipv6 address, and ipv6 user (resolved host) */
-					b = hostcloak;
-				else if ((dest->GetProtocolFamily() == AF_INET) && (inet_aton(dest->host.c_str(),&testaddr2) < 1) && (hostcloak.length() <= 64))
-					/* Invalid ipv4 address, and ipv4 user (resolved host) */
-					b = hostcloak;
-				else
-					/* Valid ipv6 or ipv4 address (not resolved) ipv4 or ipv6 user */
-					b = ((!strchr(dest->host.c_str(),':')) ? cu->Cloak4(dest->host.c_str()) : cu->Cloak6(dest->host.c_str()));
-#else
-				in_addr testaddr;
-				if ((inet_aton(dest->host.c_str(),&testaddr) < 1) && (hostcloak.length() <= 64))
-					/* Invalid ipv4 address, and ipv4 user (resolved host) */
+				std::string testaddr;
+				int testport;
+				if (!irc::sockets::satoap(&dest->client_sa, testaddr, testport) && (hostcloak.length() <= 64))
+					/* not a valid address, must have been a host, so cloak as a host */
 					b = hostcloak;
+				else if (dest->client_sa.sa.sa_family == AF_INET6)
+					b = cu->Cloak6(dest->GetIPString());
 				else
-					/* Valid ipv4 address (not resolved) ipv4 user */
-					b = cu->Cloak4(dest->host.c_str());
-#endif
+					b = cu->Cloak4(dest->GetIPString());
 			}
 			else
 			{
-#ifdef IPV6
-				if (dest->GetProtocolFamily() == AF_INET6)
+				if (dest->client_sa.sa.sa_family == AF_INET6)
 					b = cu->Cloak6(dest->GetIPString());
-#endif
-				if (dest->GetProtocolFamily() == AF_INET)
+				else
 					b = cu->Cloak4(dest->GetIPString());
 			}
 
-			dest->Extend("cloaked_host", new std::string(b));
+			cu->ext.set(dest,b);
 		}
 	}