X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Ftreesocket2.cpp;h=60bd3ec8a2ba0bb55e09afe9e2810fe8ce541ad1;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=65dd9cc5b6fcf0d2abb09d4370c13f7aa68e988e;hpb=5f7df6455a7055ab71dc4ec84be87ad3f151fa76;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp index 65dd9cc5b..60bd3ec8a 100644 --- a/src/modules/m_spanningtree/treesocket2.cpp +++ b/src/modules/m_spanningtree/treesocket2.cpp @@ -1,12 +1,15 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2007-2008, 2012 Robin Burchell + * Copyright (C) 2019 linuxdaemon + * Copyright (C) 2013, 2018-2020 Sadie Powell + * Copyright (C) 2013 Adam + * Copyright (C) 2012-2016, 2018 Attila Molnar + * Copyright (C) 2012, 2019 Robby * Copyright (C) 2009-2010 Daniel De Graaf - * Copyright (C) 2007-2008 Craig Edwards - * Copyright (C) 2008 Pippijn van Steenhoven - * Copyright (C) 2008 Thomas Stagner - * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2008, 2012 Robin Burchell + * Copyright (C) 2007-2008, 2010 Craig Edwards + * Copyright (C) 2007-2008 Dennis Friis * * This file is part of InspIRCd. InspIRCd is free software: you can * redistribute it and/or modify it under the terms of the GNU General Public @@ -32,58 +35,67 @@ #include "commands.h" /* Handle ERROR command */ -void TreeSocket::Error(parameterlist ¶ms) +void TreeSocket::Error(CommandBase::Params& params) { std::string msg = params.size() ? params[0] : ""; SetError("received ERROR " + msg); } -void TreeSocket::Split(const std::string& line, std::string& prefix, std::string& command, parameterlist& params) +void TreeSocket::Split(const std::string& line, std::string& tags, std::string& prefix, std::string& command, CommandBase::Params& params) { + std::string token; irc::tokenstream tokens(line); - if (!tokens.GetToken(prefix)) + if (!tokens.GetMiddle(token)) return; - if (prefix[0] == ':') + if (token[0] == '@') { - prefix = prefix.substr(1); - - if (prefix.empty()) + if (token.length() <= 1) { - this->SendError("BUG (?) Empty prefix received: " + line); + this->SendError("BUG: Received a message with empty tags: " + line); return; } - if (!tokens.GetToken(command)) + + tags.assign(token, 1, std::string::npos); + if (!tokens.GetMiddle(token)) { - this->SendError("BUG (?) Empty command received: " + line); + this->SendError("BUG: Received a message with no command: " + line); return; } } - else - { - command = prefix; - prefix.clear(); - } - if (command.empty()) - this->SendError("BUG (?) Empty command received: " + line); - std::string param; - while (tokens.GetToken(param)) + if (token[0] == ':') { - params.push_back(param); + if (token.length() <= 1) + { + this->SendError("BUG: Received a message with an empty prefix: " + line); + return; + } + + prefix.assign(token, 1, std::string::npos); + if (!tokens.GetMiddle(token)) + { + this->SendError("BUG: Received a message with no command: " + line); + return; + } } + + command.assign(token); + while (tokens.GetTrailing(token)) + params.push_back(token); } void TreeSocket::ProcessLine(std::string &line) { + std::string tags; std::string prefix; std::string command; - parameterlist params; + CommandBase::Params params; ServerInstance->Logs->Log(MODNAME, LOG_RAWIO, "S[%d] I %s", this->GetFd(), line.c_str()); - Split(line, prefix, command, params); + Split(line, tags, prefix, command, params); if (command.empty()) return; @@ -146,19 +158,19 @@ void TreeSocket::ProcessLine(std::string &line) } else if (command == "BURST") { - if (params.size()) + if (!params.empty()) { - time_t them = ConvToInt(params[0]); + time_t them = ConvToNum(params[0]); time_t delta = them - ServerInstance->Time(); - if ((delta < -600) || (delta > 600)) + if ((delta < -60) || (delta > 60)) { - ServerInstance->SNO->WriteGlobalSno('l',"\2ERROR\2: Your clocks are out by %d seconds (this is more than five minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",abs((long)delta)); - SendError("Your clocks are out by "+ConvToStr(abs((long)delta))+" seconds (this is more than five minutes). Link aborted, PLEASE SYNC YOUR CLOCKS!"); + ServerInstance->SNO->WriteGlobalSno('l', "\002ERROR\002: Your clocks are off by %ld seconds (this is more than one minute). Link aborted, \002PLEASE SYNC YOUR CLOCKS!\002", labs((long)delta)); + SendError("Your clocks are out by "+ConvToStr(labs((long)delta))+" seconds (this is more than one minute). Link aborted, PLEASE SYNC YOUR CLOCKS!"); return; } - else if ((delta < -30) || (delta > 30)) + else if ((delta < -15) || (delta > 15)) { - ServerInstance->SNO->WriteGlobalSno('l',"\2WARNING\2: Your clocks are out by %d seconds. Please consider synching your clocks.", abs((long)delta)); + ServerInstance->SNO->WriteGlobalSno('l', "\002WARNING\002: Your clocks are off by %ld seconds. Please consider syncing your clocks.", labs((long)delta)); } } @@ -169,8 +181,6 @@ void TreeSocket::ProcessLine(std::string &line) return; FinishAuth(capab->name, capab->sid, capab->description, capab->hidden); - - CmdBuilder(MyRoot->GetID(), "BURST").insert(params).Forward(MyRoot); } else if (command == "ERROR") { @@ -209,7 +219,7 @@ void TreeSocket::ProcessLine(std::string &line) * Credentials have been exchanged, we've gotten their 'BURST' (or sent ours). * Anything from here on should be accepted a little more reasonably. */ - this->ProcessConnectedLine(prefix, command, params); + this->ProcessConnectedLine(tags, prefix, command, params); break; case DYING: break; @@ -222,10 +232,20 @@ User* TreeSocket::FindSource(const std::string& prefix, const std::string& comma if (prefix.empty()) return MyRoot->ServerUser; - // If the prefix string is a uuid or a sid FindUUID() returns the appropriate User object - User* who = ServerInstance->FindUUID(prefix); - if (who) - return who; + if (prefix.size() == 3) + { + // Prefix looks like a sid + TreeServer* server = Utils->FindServerID(prefix); + if (server) + return server->ServerUser; + } + else + { + // If the prefix string is a uuid FindUUID() returns the appropriate User object + User* user = ServerInstance->FindUUID(prefix); + if (user) + return user; + } // Some implementations wrongly send a server name as prefix occasionally, handle that too for now TreeServer* const server = Utils->FindServer(prefix); @@ -245,9 +265,9 @@ User* TreeSocket::FindSource(const std::string& prefix, const std::string& comma * command came from a server to avoid desync. */ - who = ServerInstance->FindUUID(prefix.substr(0, 3)); - if (who) - return who; + TreeServer* const usersserver = Utils->FindServerID(prefix.substr(0, 3)); + if (usersserver) + return usersserver->ServerUser; return this->MyRoot->ServerUser; } @@ -255,7 +275,35 @@ User* TreeSocket::FindSource(const std::string& prefix, const std::string& comma return NULL; } -void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command, parameterlist& params) +void TreeSocket::ProcessTag(User* source, const std::string& tag, ClientProtocol::TagMap& tags) +{ + std::string tagkey; + std::string tagval; + const std::string::size_type p = tag.find('='); + if (p != std::string::npos) + { + // Tag has a value + tagkey.assign(tag, 0, p); + tagval.assign(tag, p + 1, std::string::npos); + } + else + { + tagkey.assign(tag); + } + + const Events::ModuleEventProvider::SubscriberList& list = Utils->Creator->tagevprov.GetSubscribers(); + for (Events::ModuleEventProvider::SubscriberList::const_iterator i = list.begin(); i != list.end(); ++i) + { + ClientProtocol::MessageTagProvider* const tagprov = static_cast(*i); + const ModResult res = tagprov->OnProcessTag(source, tagkey, tagval); + if (res == MOD_RES_ALLOW) + tags.insert(std::make_pair(tagkey, ClientProtocol::MessageTagData(tagprov, tagval))); + else if (res == MOD_RES_DENY) + break; + } +} + +void TreeSocket::ProcessConnectedLine(std::string& taglist, std::string& prefix, std::string& command, CommandBase::Params& params) { User* who = FindSource(prefix, command); if (!who) @@ -288,7 +336,7 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command, } // Translate commands coming from servers using an older protocol - if (proto_version < ProtocolVersion) + if (proto_version < PROTO_NEWEST) { if (!PreProcessOldProtocolMessage(who, command, params)) return; @@ -308,8 +356,13 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command, this->Error(params); return; } + else if (command == "BURST") + { + // This is sent even when there is no need for it, drop it here for now + return; + } - throw ProtocolException("Unknown command"); + throw ProtocolException("Unknown command: " + command); } cmdbase = cmd; } @@ -326,17 +379,25 @@ void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command, } CmdResult res; + ClientProtocol::TagMap tags; + std::string tag; + irc::sepstream tagstream(taglist, ';'); + while (tagstream.GetToken(tag)) + ProcessTag(who, tag, tags); + + CommandBase::Params newparams(params, tags); + if (scmd) - res = scmd->Handle(who, params); + res = scmd->Handle(who, newparams); else { - res = cmd->Handle(params, who); + res = cmd->Handle(who, newparams); if (res == CMD_INVALID) throw ProtocolException("Error in command handler"); } if (res == CMD_SUCCESS) - Utils->RouteCommand(server->GetRoute(), cmdbase, params, who); + Utils->RouteCommand(server->GetRoute(), cmdbase, newparams, who); } void TreeSocket::OnTimeout() @@ -346,28 +407,26 @@ void TreeSocket::OnTimeout() void TreeSocket::Close() { - if (fd != -1) - ServerInstance->GlobalCulls.AddItem(this); + if (!HasFd()) + return; + + ServerInstance->GlobalCulls.AddItem(this); this->BufferedSocket::Close(); SetError("Remote host closed connection"); // Connection closed. // If the connection is fully up (state CONNECTED) - // then propogate a netsplit to all peers. + // then propagate a netsplit to all peers. if (MyRoot) - Squit(MyRoot,getError()); + MyRoot->SQuit(getError(), true); - if (!ConnectionFailureShown) - { - ConnectionFailureShown = true; - ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\2%s\2' failed.",linkID.c_str()); + ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\002%s\002' failed.", linkID.c_str()); - time_t server_uptime = ServerInstance->Time() - this->age; - if (server_uptime) - { - std::string timestr = ModuleSpanningTree::TimeToStr(server_uptime); - ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\2%s\2' was established for %s", linkID.c_str(), timestr.c_str()); - } + time_t server_uptime = ServerInstance->Time() - this->age; + if (server_uptime) + { + std::string timestr = InspIRCd::DurationString(server_uptime); + ServerInstance->SNO->WriteGlobalSno('l', "Connection to '\002%s\002' was established for %s", linkID.c_str(), timestr.c_str()); } } @@ -380,8 +439,9 @@ void TreeSocket::FinishAuth(const std::string& remotename, const std::string& re MyRoot = new TreeServer(remotename, remotedesc, remotesid, Utils->TreeRoot, this, hidden); + // Mark the server as bursting + MyRoot->BeginBurst(); this->DoBurst(MyRoot); - // This will send a * in place of the password/hmac CommandServer::Builder(MyRoot).Forward(MyRoot); }