/*
* InspIRCd -- Internet Relay Chat Daemon
*
- * Copyright (C) 2007-2008, 2012 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ * Copyright (C) 2013, 2018-2019 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2013 Adam <Adam@anope.org>
+ * Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2012, 2019 Robby <robby@chatbelgie.be>
* Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- * Copyright (C) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
- * Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
- * Copyright (C) 2008 Thomas Stagner <aquanight@inspircd.org>
+ * Copyright (C) 2008, 2012 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2007-2008, 2010 Craig Edwards <brain@inspircd.org>
* Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
*
* This file is part of InspIRCd. InspIRCd is free software: you can
SetError("received ERROR " + msg);
}
-void TreeSocket::Split(const std::string& line, std::string& prefix, std::string& command, CommandBase::Params& 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.GetMiddle(prefix))
+ if (!tokens.GetMiddle(token))
return;
- if (prefix[0] == ':')
+ if (token[0] == '@')
{
- prefix.erase(prefix.begin());
-
- 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.GetMiddle(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.GetTrailing(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;
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;
}
else if (command == "BURST")
{
- if (params.size())
+ if (!params.empty())
{
- time_t them = ConvToInt(params[0]);
+ time_t them = ConvToNum<time_t>(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 %ld seconds (this is more than five minutes). Link aborted, \2PLEASE SYNC YOUR CLOCKS!\2",labs((long)delta));
- SendError("Your clocks are out by "+ConvToStr(labs((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 %ld seconds. Please consider synching your clocks.", labs((long)delta));
+ ServerInstance->SNO->WriteGlobalSno('l', "\002WARNING\002: Your clocks are off by %ld seconds. Please consider syncing your clocks.", labs((long)delta));
}
}
* 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;
return NULL;
}
-void TreeSocket::ProcessConnectedLine(std::string& prefix, std::string& command, CommandBase::Params& 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<ClientProtocol::MessageTagProvider*>(*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)
}
// Translate commands coming from servers using an older protocol
- if (proto_version < ProtocolVersion)
+ if (proto_version < PROTO_NEWEST)
{
if (!PreProcessOldProtocolMessage(who, command, params))
return;
return;
}
- throw ProtocolException("Unknown command");
+ throw ProtocolException("Unknown command: " + command);
}
cmdbase = cmd;
}
}
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
{
- ClientProtocol::TagMap tags;
- res = cmd->Handle(who, CommandBase::Params(params, tags));
+ 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()
// If the connection is fully up (state CONNECTED)
// then propogate a netsplit to all peers.
if (MyRoot)
- MyRoot->SQuit(getError());
+ MyRoot->SQuit(getError(), 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());
+ 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());
}
}
projects / user / henk / code / inspircd.git / blobdiff