ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-09 10:39:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move 1205 UID compatibility code to PreProcessOldProtocolMessage.

Browse Source 
This should make it more reliable.
This commit is contained in:
Sadie Powell 2024-07-24 19:26:54 +01:00
parent c7866e1e6c
commit caab65a831
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/m_spanningtree/commands.h
View File

@ -93,7 +93,7 @@ class CommandUID final
{
public:
CommandUID(Module* Creator)
: ServerOnlyServerCommand<CommandUID>(Creator, "UID", 10)
: ServerOnlyServerCommand<CommandUID>(Creator, "UID", 11)
{
}
CmdResult HandleServer(TreeServer* server, CommandBase::Params& params);

9
src/modules/m_spanningtree/compat.cpp
View File

@ -151,5 +151,14 @@ bool TreeSocket::PreProcessOldProtocolMessage(User*& who, std::string& cmd, Comm
params.insert(params.begin(), { target->uuid.substr(0, 3), cmd });
cmd = "ENCAP";
}
else if (irc::equals(cmd, "UID"))
{
if (params.size() < 6)
return false; // Malformed.
// :<sid> UID <uuid> <nickchanged> <nick> <host> <dhost> <user> <duser> <ip.string> <signon> <modes> [<modepara>] :<real>
// ^^^^^^ New in 1206
params.insert(params.begin() + 5, params[5]);
}
return true;
}

13
src/modules/m_spanningtree/uid.cpp
View File

@ -38,10 +38,9 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params
*
* The `duser` field was introduced in the 1206 (v4) protocol.
*/
size_t offset = params[9][0] == '+' ? 1 : 0;
time_t nickchanged = ServerCommand::ExtractTS(params[1]);
time_t signon = ServerCommand::ExtractTS(params[7+offset]);
const std::string& modestr = params[8+offset];
time_t signon = ServerCommand::ExtractTS(params[8]);
const std::string& modestr = params[9];
// Check if the length of the uuid is correct and confirm the sid portion of the uuid matches the sid of the server introducing the user
if (params[0].length() != UIDGenerator::UUID_LENGTH || params[0].compare(0, 3, remoteserver->GetId()))
@ -62,7 +61,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params
else if (collideswith)
{
// The user on this side is fully connected, handle the collision
bool they_change = SpanningTreeUtilities::DoCollision(collideswith, remoteserver, nickchanged, params[5], params[6+offset], params[0], "UID");
bool they_change = SpanningTreeUtilities::DoCollision(collideswith, remoteserver, nickchanged, params[5], params[7], params[0], "UID");
if (they_change)
{
// The client being introduced needs to change nick to uuid, change the nick in the message before
@ -74,7 +73,7 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params
}
irc::sockets::sockaddrs sa(false);
if (!sa.from(params[6+offset]))
if (!sa.from(params[7]))
throw ProtocolException("Invalid IP address or UNIX socket path");
/* For remote users, we pass the UUID they sent to the constructor.
@ -86,14 +85,14 @@ CmdResult CommandUID::HandleServer(TreeServer* remoteserver, CommandBase::Params
_new->ChangeRealHost(params[3], false);
_new->ChangeDisplayedHost(params[4]);
_new->ChangeRealUser(params[5], false);
_new->ChangeDisplayedUser(params[5+offset]);
_new->ChangeDisplayedUser(params[6]);
_new->ChangeRemoteAddress(sa);
_new->ChangeRealName(params.back());
_new->connected = User::CONN_FULL;
_new->signon = signon;
_new->nickchanged = nickchanged;
size_t paramptr = 9 + offset;
size_t paramptr = 10;
for (const auto& modechr : modestr)
{
// Accept more '+' chars, for now