X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cloaking.cpp;h=f9b6734ce89f3f5a478ea81c5e060bfd835f3f1c;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=a32f7348d27215cf12b61d4633d5890bdc1086e0;hpb=540fee57bf71abccaba38c0297b80f8001780c1d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index a32f7348d..f9b6734ce 100644
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *           	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -41,6 +38,37 @@ class CloakUser : public ModeHandler
 	unsigned int key4;
 	Module* Sender;
 	Module* HashProvider;
+
+	/** 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.
+	 *
+	 * For example, if it is passed "svn.inspircd.org" it will return ".inspircd.org".
+	 * If it is passed "brainbox.winbot.co.uk" it will return ".co.uk",
+	 * and if it is passed "localhost.localdomain" it will return ".localdomain".
+	 * 
+	 * This is used to ensure a significant part of the host is always cloaked (see Bug #216)
+	 */
+	std::string LastTwoDomainParts(const std::string &host)
+	{
+		int dots = 0;
+		std::string::size_type splitdot = host.length();
+
+		for (std::string::size_type x = host.length() - 1; x; --x)
+		{
+			if (host[x] == '.')
+			{
+				splitdot = x;
+				dots++;
+			}
+			if (dots >= 3)
+				break;
+		}
+
+		if (splitdot == host.length())
+			return host;
+		else
+			return host.substr(splitdot);
+	}
 	
  public:
 	CloakUser(InspIRCd* Instance, Module* Source, Module* Hash) : ModeHandler(Instance, 'x', 0, 0, false, MODETYPE_USER, false), Sender(Source), HashProvider(Hash)
@@ -84,9 +112,8 @@ class CloakUser : public ModeHandler
 					 */
 
 					unsigned int iv[] = { key1, key2, key3, key4 };
-					std::string a = (n1 ? n1 : n2);
+					std::string a = LastTwoDomainParts(dest->host);
 					std::string b;
-					insp_inaddr testaddr;
 
 					/** Reset the Hash module, and send it our IV and hex table */
 					HashResetRequest(Sender, HashProvider).Send();
@@ -101,16 +128,28 @@ class CloakUser : public ModeHandler
 					 * Their ISP shouldnt go to town on subdomains, or they shouldnt have a kiddie
 					 * vhost.
 					 */
-
-					if ((insp_aton(dest->host,&testaddr) < 1) && (hostcloak.length() <= 64))
-					{
-						// if they have a hostname, make something appropriate
+#ifdef IPV6
+					in6_addr testaddr;
+					in_addr testaddr2;
+					if ((dest->GetProtocolFamily() == AF_INET6) && (inet_pton(AF_INET6,dest->host,&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,&testaddr2) < 1) && (hostcloak.length() <= 64))
+						/* Invalid ipv4 address, and ipv4 user (resolved host) */
 						b = hostcloak;
-					}
 					else
-					{
-						b = ((b.find(':') == std::string::npos) ? Cloak4(dest->host) : Cloak6(dest->host));
-					}
+						/* Valid ipv6 or ipv4 address (not resolved) ipv4 or ipv6 user */
+						b = ((!strchr(dest->host,':')) ? Cloak4(dest->host) : Cloak6(dest->host));
+#else
+					in_addr testaddr;
+					if ((inet_aton(dest->host,&testaddr) < 1) && (hostcloak.length() <= 64))
+						/* Invalid ipv4 address, and ipv4 user (resolved host) */
+						b = hostcloak;
+					else
+						/* Valid ipv4 address (not resolved) ipv4 user */
+						b = Cloak4(dest->host);
+#endif
+
 					dest->ChangeDisplayedHost(b.c_str());
 				}
 				
@@ -168,6 +207,11 @@ class CloakUser : public ModeHandler
 
 	std::string Cloak6(const char* ip)
 	{
+		/* Theyre using 4in6 (YUCK). Translate as ipv4 cloak */
+		if (!strncmp(ip, "0::ffff:", 8))
+			return Cloak4(ip + 8);
+
+		/* If we get here, yes it really is an ipv6 ip */
 		unsigned int iv[] = { key1, key2, key3, key4 };
 		std::vector<std::string> hashies;
 		std::string item = "";
@@ -241,9 +285,10 @@ class ModuleCloaking : public Module
 		cu = new CloakUser(ServerInstance, this, HashModule);
 
 		/* Register it with the core */		
-		ServerInstance->AddMode(cu, 'x');
+		if (!ServerInstance->AddMode(cu, 'x'))
+			throw ModuleException("Could not add new modes!");
 
-		OnRehash("");
+		OnRehash(NULL,"");
 	}
 	
 	virtual ~ModuleCloaking()
@@ -260,7 +305,7 @@ class ModuleCloaking : public Module
 		return Version(1,1,0,2,VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
-	virtual void OnRehash(const std::string &parameter)
+	virtual void OnRehash(userrec* user, const std::string &parameter)
 	{
 		cu->DoRehash();
 	}