X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cloaking.cpp;h=8bba9cedab4acd9d151b132def4d66dc91edc693;hb=78ec14490c922588e2c2a9c47c01518b33a677b7;hp=64ba71d95ffc26a9621458a95b22bbe1bb194eea;hpb=d185decae97752368d5cf62311cbc0d1a52aa22c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index 64ba71d95..8bba9ceda 100644
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.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.
@@ -12,7 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "wildcard.h"
 #include "m_hash.h"
 
 /* $ModDesc: Provides masking of user hostnames */
@@ -70,9 +69,6 @@ class CloakUser : public ModeHandler
 
 	ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
 	{
-		if (source != dest)
-			return MODEACTION_DENY;
-
 		/* For remote clients, we dont take any action, we just allow it.
 		 * The local server where they are will set their cloak instead.
 		 * This is fine, as we will recieve it later.
@@ -101,9 +97,13 @@ class CloakUser : public ModeHandler
 
 				std::string* cloak;
 
+				if (!dest->GetExt("cloaked_host", cloak))
+				{
+					/* Force creation of missing cloak */
+					Sender->OnUserConnect(dest);
+				}
 				if (dest->GetExt("cloaked_host", cloak))
 				{
-					/* Cloaked host has been set before on this user, don't bother to recalculate and waste cpu */
 					dest->ChangeDisplayedHost(cloak->c_str());
 					dest->SetMode('x',true);
 					return MODEACTION_ALLOW;
@@ -160,11 +160,6 @@ 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;
@@ -248,6 +243,11 @@ class CloakUser : public ModeHandler
 
 			throw ModuleException("You have not defined cloak keys for m_cloaking!!! THIS IS INSECURE AND SHOULD BE CHECKED! - " + detail);
 		}
+		else if (key1 == 0x01234567 || key2 == 0x01234567 || key3 == 0x01234567 || key4 = 0x01234567)
+		{
+			/* Simple test to see if the config was changed from the values in the example config, as these would be very insecure. */
+			throw ModuleException("You did not change the cloak keys for m_cloaking! You must randomly create your own keys in the <cloak> tag.");
+		}
 	}
 };
 
@@ -289,8 +289,10 @@ class ModuleCloaking : public Module
 
 		ServerInstance->Modules->UseInterface("HashRequest");
 
-		Implementation eventlist[] = { I_OnRehash, I_OnUserDisconnect, I_OnCleanup, I_OnCheckBan, I_OnUserConnect, I_OnSyncUserMetaData };
+		Implementation eventlist[] = { I_OnRehash, I_OnUserDisconnect, I_OnCleanup, I_OnCheckBan, I_OnUserConnect, I_OnSyncUserMetaData, I_OnCleanup };
 		ServerInstance->Modules->Attach(eventlist, this, 6);
+
+		CloakExistingUsers();
 	}
 
 	void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
@@ -303,6 +305,17 @@ class ModuleCloaking : public Module
 		}
 	}
 
+	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))
+			{
+				OnUserConnect(*u);
+			}
+		}
+	}
 
 	virtual int OnCheckBan(User* user, Channel* chan)
 	{
@@ -314,7 +327,7 @@ class ModuleCloaking : public Module
 			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 (match(mask,i->data))
+				if (InspIRCd::Match(mask,i->data))
 					return -1;
 			}
 		}
@@ -324,14 +337,21 @@ class ModuleCloaking : public Module
  	void Prioritize()
 	{
 		/* Needs to be after m_banexception etc. */
-		ServerInstance->Modules->SetPriority(this, I_OnCheckBan, PRIO_LAST);
+		ServerInstance->Modules->SetPriority(this, I_OnCheckBan, PRIORITY_LAST);
+
+		/* but before m_conn_umodes, so host is generated ready to apply */
+		Module *um = ServerInstance->Modules->Find("m_conn_umodes.so");
+		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)
@@ -351,7 +371,7 @@ class ModuleCloaking : public Module
 	{
 		// returns the version number of the module to be
 		// listed in /MODULES
-		return Version(1,2,0,2,VF_COMMON|VF_VENDOR,API_VERSION);
+		return Version("$Id$", VF_COMMON|VF_VENDOR,API_VERSION);
 	}
 
 	virtual void OnRehash(User* user, const std::string &parameter)
@@ -361,6 +381,10 @@ class ModuleCloaking : public Module
 
 	virtual void OnUserConnect(User* dest)
 	{
+		std::string* tofree;
+		if (dest->GetExt("cloaked_host", tofree))
+			return;
+
 		if (dest->host.find('.') != std::string::npos || dest->host.find(':') != std::string::npos)
 		{
 			unsigned int iv[] = { cu->key1, cu->key2, cu->key3, cu->key4 };