X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcompat.cpp;h=b2967af3bd377bb7789f4f268cc98f598682a2eb;hb=ba23c2b115ad3bf2632179d283165c1579332fd8;hp=a9e48a10c5dea404b152872aeb20e3ab506e6a52;hpb=27ecc025acf7b01f51b2ecc32c28180dc49d793c;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_spanningtree/compat.cpp b/src/modules/m_spanningtree/compat.cpp
index a9e48a10c..b2967af3b 100644
--- a/src/modules/m_spanningtree/compat.cpp
+++ b/src/modules/m_spanningtree/compat.cpp
@@ -24,6 +24,13 @@
 
 static std::string newline("\n");
 
+void TreeSocket::WriteLineNoCompat(const std::string& line)
+{
+	ServerInstance->Logs->Log(MODNAME, LOG_RAWIO, "S[%d] O %s", this->GetFd(), line.c_str());
+	this->WriteData(line);
+	this->WriteData(newline);
+}
+
 void TreeSocket::WriteLine(const std::string& original_line)
 {
 	if (LinkState == CONNECTED)
@@ -39,7 +46,7 @@ void TreeSocket::WriteLine(const std::string& original_line)
 			std::string line = original_line;
 			std::string::size_type a = line.find(' ');
 			std::string::size_type b = line.find(' ', a + 1);
-			std::string command = line.substr(a + 1, b-a-1);
+			std::string command(line, a + 1, b-a-1);
 			// now try to find a translation entry
 			// TODO a more efficient lookup method will be needed later
 			if (proto_version < 1205)
@@ -47,15 +54,21 @@ void TreeSocket::WriteLine(const std::string& original_line)
 				if (command == "IJOIN")
 				{
 					// Convert
-					// :<uid> IJOIN <chan> [<ts> [<flags>]]
+					// :<uid> IJOIN <chan> <membid> [<ts> [<flags>]]
 					// to
 					// :<sid> FJOIN <chan> <ts> + [<flags>],<uuid>
 					std::string::size_type c = line.find(' ', b + 1);
 					if (c == std::string::npos)
+						return;
+
+					std::string::size_type d = line.find(' ', c + 1);
+					// Erase membership id first
+					line.erase(c, d-c);
+					if (d == std::string::npos)
 					{
 						// No TS or modes in the command
 						// :22DAAAAAB IJOIN #chan
-						const std::string channame = line.substr(b+1, c-b-1);
+						const std::string channame(line, b+1, c-b-1);
 						Channel* chan = ServerInstance->FindChan(channame);
 						if (!chan)
 							return;
@@ -66,7 +79,7 @@ void TreeSocket::WriteLine(const std::string& original_line)
 					}
 					else
 					{
-						std::string::size_type d = line.find(' ', c + 1);
+						d = line.find(' ', c + 1);
 						if (d == std::string::npos)
 						{
 							// TS present, no modes
@@ -114,7 +127,7 @@ void TreeSocket::WriteLine(const std::string& original_line)
 						// We're sending channel metadata
 						line.erase(c, d-c);
 					}
-					else if (line.substr(c, d-c) == " operquit")
+					else if (!line.compare(c, d-c, " operquit", 9))
 					{
 						// ":22D METADATA 22DAAAAAX operquit :message" -> ":22DAAAAAX OPERQUIT :message"
 						line = ":" + line.substr(b+1, c-b) + "OPERQUIT" + line.substr(d);
@@ -123,8 +136,10 @@ void TreeSocket::WriteLine(const std::string& original_line)
 				else if (command == "FTOPIC")
 				{
 					// Drop channel TS for FTOPIC
-					// :sid FTOPIC #target TS TopicTS ...
-					//     A      B       C  D
+					// :sid FTOPIC #target TS TopicTS setter :newtopic
+					//     A      B       C  D       E      F
+					// :uid FTOPIC #target TS TopicTS :newtopic
+					//     A      B       C  D       E
 					if (b == std::string::npos)
 						return;
 
@@ -136,7 +151,14 @@ void TreeSocket::WriteLine(const std::string& original_line)
 					if (d == std::string::npos)
 						return;
 
-					line.erase(c, d-c);
+					std::string::size_type e = line.find(' ', d + 1);
+					if (line[e+1] == ':')
+					{
+						line.erase(c, e-c);
+						line.erase(a+1, 1);
+					}
+					else
+						line.erase(c, d-c);
 				}
 				else if ((command == "PING") || (command == "PONG"))
 				{
@@ -160,34 +182,157 @@ void TreeSocket::WriteLine(const std::string& original_line)
 						line.erase(colon, 1);
 					}
 				}
+				else if (command == "INVITE")
+				{
+					// :22D INVITE 22DAAAAAN #chan TS ExpirationTime
+					//     A      B         C     D  E
+					if (b == std::string::npos)
+						return;
+
+					std::string::size_type c = line.find(' ', b + 1);
+					if (c == std::string::npos)
+						return;
+
+					std::string::size_type d = line.find(' ', c + 1);
+					if (d == std::string::npos)
+						return;
+
+					std::string::size_type e = line.find(' ', d + 1);
+					// If there is no expiration time then everything will be erased from 'd'
+					line.erase(d, e-d);
+				}
+				else if (command == "FJOIN")
+				{
+					// Strip membership ids
+					// :22D FJOIN #chan 1234 +f 4:3 :o,22DAAAAAB:15 o,22DAAAAAA:15
+					// :22D FJOIN #chan 1234 +f 4:3 o,22DAAAAAB:15
+					// :22D FJOIN #chan 1234 +Pf 4:3 :
+
+					// If the last parameter is prefixed by a colon then it's a userlist which may have 0 or more users;
+					// if it isn't, then it is a single member
+					std::string::size_type spcolon = line.find(" :");
+					if (spcolon != std::string::npos)
+					{
+						spcolon++;
+						// Loop while there is a ':' in the userlist, this is never true if the channel is empty
+						std::string::size_type pos = std::string::npos;
+						while ((pos = line.rfind(':', pos-1)) > spcolon)
+						{
+							// Find the next space after the ':'
+							std::string::size_type sp = line.find(' ', pos);
+							// Erase characters between the ':' and the next space after it, including the ':' but not the space;
+							// if there is no next space, everything will be erased between pos and the end of the line
+							line.erase(pos, sp-pos);
+						}
+					}
+					else
+					{
+						// Last parameter is a single member
+						std::string::size_type sp = line.rfind(' ');
+						std::string::size_type colon = line.find(':', sp);
+						line.erase(colon);
+					}
+				}
+				else if (command == "KICK")
+				{
+					// Strip membership id if the KICK has one
+					if (b == std::string::npos)
+						return;
+
+					std::string::size_type c = line.find(' ', b + 1);
+					if (c == std::string::npos)
+						return;
+
+					std::string::size_type d = line.find(' ', c + 1);
+					if ((d < line.size()-1) && (original_line[d+1] != ':'))
+					{
+						// There is a third parameter which doesn't begin with a colon, erase it
+						std::string::size_type e = line.find(' ', d + 1);
+						line.erase(d, e-d);
+					}
+				}
+				else if (command == "SINFO")
+				{
+					// :22D SINFO version :InspIRCd-3.0
+					//     A     B       C
+					std::string::size_type c = line.find(' ', b + 1);
+					if (c == std::string::npos)
+						return;
+
+					// Only translating SINFO version, discard everything else
+					if (line.compare(b, 9, " version ", 9))
+						return;
+
+					line = line.substr(0, 5) + "VERSION" + line.substr(c);
+				}
+				else if (command == "SERVER")
+				{
+					// :001 SERVER inspircd.test 002 [<anything> ...] :description
+					//     A      B             C
+					std::string::size_type c = line.find(' ', b + 1);
+					if (c == std::string::npos)
+						return;
+
+					std::string::size_type d = c + 4;
+					std::string::size_type spcolon = line.find(" :", d);
+					if (spcolon == std::string::npos)
+						return;
+
+					line.erase(d, spcolon-d);
+					line.insert(c, " * 0");
+
+					if (burstsent)
+					{
+						WriteLineNoCompat(line);
+
+						// Synthesize a :<newserver> BURST <time> message
+						spcolon = line.find(" :");
+						line = CmdBuilder(line.substr(spcolon-3, 3), "BURST").push_int(ServerInstance->Time()).str();
+					}
+				}
+				else if (command == "NUM")
+				{
+					// :<sid> NUM <numeric source sid> <target uuid> <3 digit number> <params>
+					// Translate to
+					// :<sid> PUSH <target uuid> :<numeric source name> <3 digit number> <target nick> <params>
+
+					TreeServer* const numericsource = Utils->FindServerID(line.substr(9, 3));
+					if (!numericsource)
+						return;
+
+					// The nick of the target is necessary for building the PUSH message
+					User* const target = ServerInstance->FindUUID(line.substr(13, UIDGenerator::UUID_LENGTH));
+					if (!target)
+						return;
+
+					std::string push = InspIRCd::Format(":%.*s PUSH %s ::%s %.*s %s", 3, line.c_str()+1, target->uuid.c_str(), numericsource->GetName().c_str(), 3, line.c_str()+23, target->nick.c_str());
+					push.append(line, 26, std::string::npos);
+					push.swap(line);
+				}
 			}
-			ServerInstance->Logs->Log(MODNAME, LOG_RAWIO, "S[%d] O %s", this->GetFd(), line.c_str());
-			this->WriteData(line);
-			this->WriteData(newline);
+			WriteLineNoCompat(line);
 			return;
 		}
 	}
 
-	ServerInstance->Logs->Log(MODNAME, LOG_RAWIO, "S[%d] O %s", this->GetFd(), original_line.c_str());
-	this->WriteData(original_line);
-	this->WriteData(newline);
+	WriteLineNoCompat(original_line);
 }
 
 namespace
 {
-	bool InsertCurrentChannelTS(std::vector<std::string>& params)
+	bool InsertCurrentChannelTS(CommandBase::Params& params, unsigned int chanindex = 0, unsigned int pos = 1)
 	{
-		Channel* chan = ServerInstance->FindChan(params[0]);
+		Channel* chan = ServerInstance->FindChan(params[chanindex]);
 		if (!chan)
 			return false;
 
-		// Insert the current TS of the channel between the first and the second parameters
-		params.insert(params.begin()+1, ConvToStr(chan->age));
+		// Insert the current TS of the channel after the pos-th parameter
+		params.insert(params.begin()+pos, ConvToStr(chan->age));
 		return true;
 	}
 }
 
-bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std::vector<std::string>& params)
+bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, CommandBase::Params& params)
 {
 	if ((cmd == "METADATA") && (params.size() >= 3) && (params[0][0] == '#'))
 	{
@@ -236,7 +381,7 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std:
 		if ((params.size() != 1) && (params.size() != 3))
 			return false;
 
-		parameterlist p;
+		CommandBase::Params p;
 		p.push_back(cmd.substr(0, 1));
 		p.push_back(params[0]);
 
@@ -268,6 +413,168 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, std:
 		params.insert(params.begin()+1, "operquit");
 		who = MyRoot->ServerUser;
 	}
+	else if ((cmd == "TOPIC") && (params.size() >= 2))
+	{
+		// :20DAAAAAC TOPIC #chan :new topic
+		cmd = "FTOPIC";
+		if (!InsertCurrentChannelTS(params))
+			return false;
+
+		params.insert(params.begin()+2, ConvToStr(ServerInstance->Time()));
+	}
+	else if (cmd == "MODENOTICE")
+	{
+		// MODENOTICE is always supported by 2.0 but it's optional in 3.0.
+		params.insert(params.begin(), "*");
+		params.insert(params.begin()+1, cmd);
+		cmd = "ENCAP";
+	}
+	else if (cmd == "RULES")
+	{
+		return false;
+	}
+	else if (cmd == "INVITE")
+	{
+		// :20D INVITE 22DAAABBB #chan
+		// :20D INVITE 22DAAABBB #chan 123456789
+		// Insert channel timestamp after the channel name; the 3rd parameter, if there, is the invite expiration time
+		return InsertCurrentChannelTS(params, 1, 2);
+	}
+	else if (cmd == "VERSION")
+	{
+		// :20D VERSION :InspIRCd-2.0
+		// change to
+		// :20D SINFO version :InspIRCd-2.0
+		cmd = "SINFO";
+		params.insert(params.begin(), "version");
+	}
+	else if (cmd == "JOIN")
+	{
+		// 2.0 allows and forwards legacy JOINs but we don't, so translate them to FJOINs before processing
+		if ((params.size() != 1) || (IS_SERVER(who)))
+			return false; // Huh?
+
+		cmd = "FJOIN";
+		Channel* chan = ServerInstance->FindChan(params[0]);
+		params.push_back(ConvToStr(chan ? chan->age : ServerInstance->Time()));
+		params.push_back("+");
+		params.push_back(",");
+		params.back().append(who->uuid);
+		who = TreeServer::Get(who)->ServerUser;
+	}
+	else if ((cmd == "FMODE") && (params.size() >= 2))
+	{
+		// Translate user mode changes with timestamp to MODE
+		if (params[0][0] != '#')
+		{
+			User* user = ServerInstance->FindUUID(params[0]);
+			if (!user)
+				return false;
+
+			// Emulate the old nonsensical behavior
+			if (user->age < ServerCommand::ExtractTS(params[1]))
+				return false;
+
+			cmd = "MODE";
+			params.erase(params.begin()+1);
+		}
+	}
+	else if ((cmd == "SERVER") && (params.size() > 4))
+	{
+		// This does not affect the initial SERVER line as it is sent before the link state is CONNECTED
+		// :20D SERVER <name> * 0 <sid> <desc>
+		// change to
+		// :20D SERVER <name> <sid> <desc>
+
+		params[1].swap(params[3]);
+		params.erase(params.begin()+2, params.begin()+4);
+
+		// If the source of this SERVER message is not bursting, then new servers it introduces are bursting
+		TreeServer* server = TreeServer::Get(who);
+		if (!server->IsBursting())
+			params.insert(params.begin()+2, "burst=" + ConvToStr(((uint64_t)ServerInstance->Time())*1000));
+	}
+	else if (cmd == "BURST")
+	{
+		// A server is introducing another one, drop unnecessary BURST
+		return false;
+	}
+	else if (cmd == "SVSWATCH")
+	{
+		// SVSWATCH was removed because nothing was using it, but better be sure
+		return false;
+	}
+	else if (cmd == "PUSH")
+	{
+		if ((params.size() != 2) || (!this->MyRoot))
+			return false; // Huh?
+
+		irc::tokenstream ts(params.back());
+
+		std::string srcstr;
+		ts.GetMiddle(srcstr);
+		srcstr.erase(0, 1);
+
+		std::string token;
+		ts.GetMiddle(token);
+
+		// See if it's a numeric being sent to the target via PUSH
+		unsigned int numeric_number = 0;
+		if (token.length() == 3)
+			numeric_number = ConvToInt(token);
+
+		if ((numeric_number > 0) && (numeric_number < 1000))
+		{
+			// It's a numeric, translate to NUM
+
+			// srcstr must be a valid server name
+			TreeServer* const numericsource = Utils->FindServer(srcstr);
+			if (!numericsource)
+			{
+				ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Unable to translate PUSH numeric %s to user %s from 1202 protocol server %s: source \"%s\" doesn't exist", token.c_str(), params[0].c_str(), this->MyRoot->GetName().c_str(), srcstr.c_str());
+				return false;
+			}
+
+			cmd = "NUM";
+
+			// Second parameter becomes the target uuid
+			params[0].swap(params[1]);
+			// Replace first param (now the PUSH payload, not needed) with the source sid
+			params[0] = numericsource->GetID();
+
+			params.push_back(InspIRCd::Format("%03u", numeric_number));
+
+			// Ignore the nickname in the numeric in PUSH
+			ts.GetMiddle(token);
+
+			// Rest of the tokens are the numeric parameters, add them to NUM
+			while (ts.GetTrailing(token))
+				params.push_back(token);
+		}
+		else if ((token == "PRIVMSG") || (token == "NOTICE"))
+		{
+			// Command is a PRIVMSG/NOTICE
+			cmd.swap(token);
+
+			// Check if the PRIVMSG/NOTICE target is a nickname
+			ts.GetMiddle(token);
+			if (token.c_str()[0] == '#')
+			{
+				ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Unable to translate PUSH %s to user %s from 1202 protocol server %s, target \"%s\"", cmd.c_str(), params[0].c_str(), this->MyRoot->GetName().c_str(), token.c_str());
+				return false;
+			}
+
+			// Replace second parameter with the message
+			ts.GetTrailing(params[1]);
+		}
+		else
+		{
+			ServerInstance->Logs->Log(MODNAME, LOG_DEFAULT, "Unable to translate PUSH to user %s from 1202 protocol server %s", params[0].c_str(), this->MyRoot->GetName().c_str());
+			return false;
+		}
+
+		return true;
+	}
 
 	return true; // Passthru
 }