X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fuid.cpp;h=58a4a0e9df91d6403d474d24c4282e2b0e1f8fef;hb=eacd707421be4f2612df9bde4517649061bb062e;hp=de3b669c42f30cb4e8521ff89f2d9d8039a1d8df;hpb=98c270f305ad4c11cdbe39a64af9670374206adb;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/uid.cpp b/src/modules/m_spanningtree/uid.cpp
index de3b669c4..58a4a0e9d 100644
--- a/src/modules/m_spanningtree/uid.cpp
+++ b/src/modules/m_spanningtree/uid.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -12,13 +12,6 @@
  */
 
 #include "inspircd.h"
-#include "commands/cmd_whois.h"
-#include "commands/cmd_stats.h"
-#include "socket.h"
-#include "xline.h"
-#include "transport.h"
-#include "m_hash.h"
-#include "socketengine.h"
 
 #include "m_spanningtree/main.h"
 #include "m_spanningtree/utils.h"
@@ -38,10 +31,8 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
 	 */
 	if (params.size() < 10)
 	{
-		if (!params.empty())
-			this->WriteLine(std::string(":")+this->Instance->Config->GetSID()+" KILL "+params[0]+" :Invalid client introduction ("+params[0]+" with only "+
-					ConvToStr(params.size())+" of 10 or more parameters?)");
-		return true;
+		this->SendError("Invalid client introduction (wanted 10 or more parameters, got " + (params.empty() ? "0" : ConvToStr(params.size())) + "!)");
+		return false;
 	}
 
 	time_t age_t = ConvToInt(params[1]);
@@ -52,29 +43,38 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
 
 	if (!remoteserver)
 	{
-		this->WriteLine(std::string(":")+this->Instance->Config->GetSID()+" KILL "+params[0]+" :Invalid client introduction (Unknown server "+source+")");
-		return true;
+		this->SendError("Invalid client introduction (Unknown server "+source+")");
+		return false;
 	}
-
 	/* Check parameters for validity before introducing the client, discovered by dmb */
-	if (!age_t)
+	else if (!age_t)
+	{
+		this->SendError("Invalid client introduction (Invalid TS?)");
+		return false;
+	}
+	else if (!signon)
+	{
+		this->SendError("Invalid client introduction (Invalid signon?)");
+		return false;
+	}
+	else if (params[8][0] != '+')
 	{
-		this->WriteLine(std::string(":")+this->Instance->Config->GetSID()+" KILL "+params[0]+" :Invalid client introduction (Invalid TS?)");
-		return true;
+		this->SendError("Invalid client introduction (Malformed MODE sequence?)");
+		return false;
 	}
 
 	/* check for collision */
-	user_hash::iterator iter = this->Instance->Users->clientlist->find(params[2]);
+	user_hash::iterator iter = this->ServerInstance->Users->clientlist->find(params[2]);
 
-	if (iter != this->Instance->Users->clientlist->end())
+	if (iter != this->ServerInstance->Users->clientlist->end())
 	{
 		/*
 		 * Nick collision.
 		 */
-		Instance->Logs->Log("m_spanningtree",DEBUG,"*** Collision on %s", params[2].c_str());
 		int collide = this->DoCollision(iter->second, age_t, params[5], params[8], params[0]);
+		ServerInstance->Logs->Log("m_spanningtree",DEBUG,"*** Collision on %s, collide=%d", params[2].c_str(), collide);
 
-		if (collide == 2)
+		if (collide != 1)
 		{
 			/* remote client changed, make sure we change their nick for the hash too */
 			params[2] = params[0];
@@ -87,19 +87,19 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
 	User* _new = NULL;
 	try
 	{
-		_new = new User(this->Instance, params[0]);
+		_new = new User(this->ServerInstance, params[0]);
 	}
 	catch (...)
 	{
-		SendError("Protocol violation - Duplicate UUID '" + params[0] + "' on introduction of new user");
+		this->SendError("Protocol violation - Duplicate UUID '" + params[0] + "' on introduction of new user");
 		return false;
 	}
-	(*(this->Instance->Users->clientlist))[params[2]] = _new;
+	(*(this->ServerInstance->Users->clientlist))[params[2]] = _new;
 	_new->SetFd(FD_MAGIC_NUMBER);
 	_new->nick.assign(params[2], 0, MAXBUF);
 	_new->host.assign(params[3], 0, 64);
 	_new->dhost.assign(params[4], 0, 64);
-	_new->server = this->Instance->FindServerNamePtr(remoteserver->GetName().c_str());
+	_new->server = this->ServerInstance->FindServerNamePtr(remoteserver->GetName().c_str());
 	_new->ident.assign(params[5], 0, MAXBUF);
 	_new->fullname.assign(params[params.size() - 1], 0, MAXBUF);
 	_new->registered = REG_ALL;
@@ -114,24 +114,48 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
 	unsigned int paramptr = 9;
 	for (std::string::iterator v = params[8].begin(); v != params[8].end(); v++)
 	{
+		if (*v == '+')
+			continue;
+
 		/* For each mode thats set, increase counter */
-		ModeHandler* mh = Instance->Modes->FindMode(*v, MODETYPE_USER);
+		ModeHandler* mh = ServerInstance->Modes->FindMode(*v, MODETYPE_USER);
 
 		if (mh)
 		{
-			if (mh->GetNumParams(true) && (paramptr < params.size() - 1))
-				mh->OnModeChange(_new, _new, NULL, params[paramptr++], true);
+			if (mh->GetNumParams(true))
+			{
+				/* IMPORTANT NOTE:
+				 * All modes are assumed to succeed here as they are being set by a remote server.
+				 * Modes CANNOT FAIL here. If they DO fail, then the failure is ignored. This is important
+				 * to note as all but one modules currently cannot ever fail in this situation, except for
+				 * m_servprotect which specifically works this way to prevent the mode being set ANYWHERE
+				 * but here, at client introduction. You may safely assume this behaviour is standard and
+				 * will not change in future versions if you want to make use of this protective behaviour
+				 * yourself.
+				 */
+				if (paramptr < params.size() - 1)
+					mh->OnModeChange(_new, _new, NULL, params[paramptr++], true);
+				else
+				{
+					this->SendError(std::string("Broken UID command, expected a parameter for user mode '")+(*v)+"' but there aren't enough parameters in the command!");
+					return false;
+				}
+			}
 			else
 				mh->OnModeChange(_new, _new, NULL, empty, true);
 			_new->SetMode(*v, true);
 			mh->ChangeCount(1);
 		}
+		else
+		{
+			this->SendError(std::string("Warning: Broken UID command, unknown user mode '")+(*v)+"' in the mode string! (mismatched module?)");
+			return false;
+		}
 	}
 
-	//_new->ProcessNoticeMasks(params[7].c_str());
-
 	/* now we've done with modes processing, put the + back for remote servers */
-	params[8] = "+" + params[8];
+	if (params[8][0] != '+')
+		params[8] = "+" + params[8];
 
 #ifdef SUPPORT_IP6LINKS
 	if (params[6].find_first_of(":") != std::string::npos)
@@ -140,21 +164,21 @@ bool TreeSocket::ParseUID(const std::string &source, std::deque<std::string> &pa
 #endif
 		_new->SetSockAddr(AF_INET, params[6].c_str(), 0);
 
-	Instance->Users->AddGlobalClone(_new);
+	ServerInstance->Users->AddGlobalClone(_new);
 
 	bool dosend = true;
 
-	if ((this->Utils->quiet_bursts && remoteserver->bursting) || this->Instance->SilentULine(_new->server))
+	if ((this->Utils->quiet_bursts && remoteserver->bursting) || this->ServerInstance->SilentULine(_new->server))
 		dosend = false;
 
 	if (dosend)
-		this->Instance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s!%s@%s [%s] [%s]", _new->server, _new->nick.c_str(), _new->ident.c_str(), _new->host.c_str(), _new->GetIPString(), _new->fullname.c_str());
+		this->ServerInstance->SNO->WriteToSnoMask('C',"Client connecting at %s: %s!%s@%s [%s] [%s]", _new->server, _new->nick.c_str(), _new->ident.c_str(), _new->host.c_str(), _new->GetIPString(), _new->fullname.c_str());
 
 	params[params.size() - 1] = ":" + params[params.size() - 1];
 	Utils->DoOneToAllButSender(source, "UID", params, source);
 
-	Instance->PI->Introduce(_new);
-	FOREACH_MOD_I(Instance,I_OnPostConnect,OnPostConnect(_new));
+	ServerInstance->PI->Introduce(_new);
+	FOREACH_MOD_I(ServerInstance,I_OnPostConnect,OnPostConnect(_new));
 
 	return true;
 }