X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcapab.cpp;h=9894dd413d55524a03ec76734709f35c2a9c0174;hb=e2b0f3dc9ef4d56c71d7abda13e6139ca092e387;hp=cb3611d336e1341d2383c702bcd8eb637209b18b;hpb=03a1bf15b1da7643b237c22db1a478916a976ccf;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp index cb3611d33..9894dd413 100644 --- a/src/modules/m_spanningtree/capab.cpp +++ b/src/modules/m_spanningtree/capab.cpp @@ -1,73 +1,130 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2010 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2019 linuxdaemon + * Copyright (C) 2014, 2017-2020 Sadie Powell + * Copyright (C) 2014 Daniel Vassdal + * Copyright (C) 2012-2016 Attila Molnar + * Copyright (C) 2012 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008, 2010 Craig Edwards + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2008 Robin Burchell * - * This program is free but copyrighted software; see - * the file COPYING for details. + * 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 + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #include "inspircd.h" -#include "xline.h" -#include "treesocket.h" #include "treeserver.h" #include "utils.h" #include "link.h" #include "main.h" -std::string TreeSocket::MyModules(int filter) +struct CompatMod { - std::vector modlist = ServerInstance->Modules->GetAllModuleNames(filter); + const char* name; + ModuleFlags listflag; +}; - if (filter == VF_COMMON && proto_version != ProtocolVersion) - CompatAddModules(modlist); +static CompatMod compatmods[] = +{ + { "m_watch.so", VF_OPTCOMMON } +}; + +std::string TreeSocket::MyModules(int filter) +{ + const ModuleManager::ModuleMap& modlist = ServerInstance->Modules->GetModules(); std::string capabilities; - sort(modlist.begin(),modlist.end()); - for (unsigned int i = 0; i < modlist.size(); i++) + for (ModuleManager::ModuleMap::const_iterator i = modlist.begin(); i != modlist.end(); ++i) { - if (i) - capabilities.push_back(proto_version > 1201 ? ' ' : ','); - capabilities.append(modlist[i]); - Module* m = ServerInstance->Modules->Find(modlist[i]); - if (m && proto_version > 1201) + Module* const mod = i->second; + // 3.0 advertises its settings for the benefit of services + // 2.0 would bork on this + if (proto_version < PROTO_INSPIRCD_30 && mod->ModuleSourceFile == "m_kicknorejoin.so") + continue; + + bool do_compat_include = false; + if (proto_version < PROTO_INSPIRCD_30) { - Version v = m->GetVersion(); - if (!v.link_data.empty()) + for (size_t j = 0; j < sizeof(compatmods)/sizeof(compatmods[0]); j++) { - capabilities.push_back('='); - capabilities.append(v.link_data); + if ((compatmods[j].listflag & filter) && (mod->ModuleSourceFile == compatmods[j].name)) + { + do_compat_include = true; + break; + } } } + + Version v = mod->GetVersion(); + if ((!do_compat_include) && (!(v.Flags & filter))) + continue; + + capabilities.push_back(' '); + capabilities.append(i->first); + if (!v.link_data.empty()) + { + capabilities.push_back('='); + capabilities.append(v.link_data); + } } - return capabilities; + + // If we are linked in a 2.0 server and have an ascii casemapping + // advertise it as m_ascii.so from inspircd-extras + if ((filter & VF_COMMON) && ServerInstance->Config->CaseMapping == "ascii" && proto_version == PROTO_INSPIRCD_20) + capabilities.append(" m_ascii.so"); + + if (capabilities.empty()) + return capabilities; + + return capabilities.substr(1); } -static std::string BuildModeList(ModeType type) +std::string TreeSocket::BuildModeList(ModeType mtype) { std::vector modes; - for(char c='A'; c <= 'z'; c++) + const ModeParser::ModeHandlerMap& mhs = ServerInstance->Modes.GetModes(mtype); + for (ModeParser::ModeHandlerMap::const_iterator i = mhs.begin(); i != mhs.end(); ++i) { - ModeHandler* mh = ServerInstance->Modes->FindMode(c, type); - if (mh) + const ModeHandler* const mh = i->second; + const PrefixMode* const pm = mh->IsPrefixMode(); + std::string mdesc; + if (proto_version >= PROTO_INSPIRCD_30) { - std::string mdesc = mh->name; - mdesc.push_back('='); - if (mh->GetPrefix()) - mdesc.push_back(mh->GetPrefix()); - if (mh->GetModeChar()) - mdesc.push_back(mh->GetModeChar()); - modes.push_back(mdesc); + if (pm) + mdesc.append("prefix:").append(ConvToStr(pm->GetPrefixRank())).push_back(':'); + else if (mh->IsListMode()) + mdesc.append("list:"); + else if (mh->NeedsParam(true)) + mdesc.append(mh->NeedsParam(false) ? "param:" : "param-set:"); + else + mdesc.append("simple:"); } + mdesc.append(mh->name); + mdesc.push_back('='); + if (pm) + { + if (pm->GetPrefix()) + mdesc.push_back(pm->GetPrefix()); + } + mdesc.push_back(mh->GetModeChar()); + modes.push_back(mdesc); } - sort(modes.begin(), modes.end()); - irc::stringjoiner line(" ", modes, 0, modes.size() - 1); - return line.GetJoined(); + std::sort(modes.begin(), modes.end()); + return stdalgo::string::join(modes); } void TreeSocket::SendCapabilities(int phase) @@ -76,13 +133,13 @@ void TreeSocket::SendCapabilities(int phase) return; if (capab->capab_phase < 1 && phase >= 1) - WriteLine("CAPAB START " + ConvToStr(ProtocolVersion)); + WriteLine("CAPAB START " + ConvToStr(PROTO_NEWEST)); capab->capab_phase = phase; if (phase < 2) return; - char sep = proto_version > 1201 ? ' ' : ','; + const char sep = ' '; irc::sepstream modulelist(MyModules(VF_COMMON), sep); irc::sepstream optmodulelist(MyModules(VF_OPTCOMMON), sep); /* Send module names, split at 509 length */ @@ -126,12 +183,30 @@ void TreeSocket::SendCapabilities(int phase) std::string extra; /* Do we have sha256 available? If so, we send a challenge */ - if (Utils->ChallengeResponse && (ServerInstance->Modules->Find("m_sha256.so"))) + if (ServerInstance->Modules->FindService(SERVICE_DATA, "hash/sha256")) { SetOurChallenge(ServerInstance->GenRandomStr(20)); extra = " CHALLENGE=" + this->GetOurChallenge(); } + // 2.0 needs these keys. + if (proto_version == PROTO_INSPIRCD_20) + { + extra.append(" PROTOCOL="+ConvToStr(proto_version)) + .append(" MAXGECOS="+ConvToStr(ServerInstance->Config->Limits.MaxReal)) + .append(" CHANMODES="+ServerInstance->Modes->GiveModeList(MODETYPE_CHANNEL)) + .append(" USERMODES="+ServerInstance->Modes->GiveModeList(MODETYPE_USER)) + .append(" PREFIX="+ ServerInstance->Modes->BuildPrefixes()); + } + + // HACK: Allow services to know what extbans exist. This will be + // replaced by CAPAB EXTBANS in the next protocol version. + std::map tokens; + FOREACH_MOD(On005Numeric, (tokens)); + std::map::const_iterator eiter = tokens.find("EXTBAN"); + if (eiter != tokens.end()) + extra.append(" EXTBANS=" + eiter->second); + this->WriteLine("CAPAB CAPABILITIES " /* Preprocessor does this one. */ ":NICKMAX="+ConvToStr(ServerInstance->Config->Limits.NickMax)+ " CHANMAX="+ConvToStr(ServerInstance->Config->Limits.ChanMax)+ @@ -140,19 +215,23 @@ void TreeSocket::SendCapabilities(int phase) " MAXQUIT="+ConvToStr(ServerInstance->Config->Limits.MaxQuit)+ " MAXTOPIC="+ConvToStr(ServerInstance->Config->Limits.MaxTopic)+ " MAXKICK="+ConvToStr(ServerInstance->Config->Limits.MaxKick)+ - " MAXGECOS="+ConvToStr(ServerInstance->Config->Limits.MaxGecos)+ + " MAXREAL="+ConvToStr(ServerInstance->Config->Limits.MaxReal)+ " MAXAWAY="+ConvToStr(ServerInstance->Config->Limits.MaxAway)+ - " IP6SUPPORT=1"+ - " PROTOCOL="+ConvToStr(ProtocolVersion)+extra+ - " PREFIX="+ServerInstance->Modes->BuildPrefixes()+ - " CHANMODES="+ServerInstance->Modes->GiveModeList(MASK_CHANNEL)+ - " USERMODES="+ServerInstance->Modes->GiveModeList(MASK_USER)+ - " SVSPART=1"); + " MAXHOST="+ConvToStr(ServerInstance->Config->Limits.MaxHost)+ + extra+ + " CASEMAPPING="+ServerInstance->Config->CaseMapping+ + // XXX: Advertise the presence or absence of m_globops in CAPAB CAPABILITIES. + // Services want to know about it, and since m_globops was not marked as VF_(OPT)COMMON + // in 2.0, we advertise it here to not break linking to previous versions. + // Protocol version 1201 (1.2) does not have this issue because we advertise m_globops + // to 1201 protocol servers irrespectively of its module flags. + (ServerInstance->Modules->Find("m_globops.so") != NULL ? " GLOBOPS=1" : " GLOBOPS=0") + ); this->WriteLine("CAPAB END"); } -/* Isolate and return the elements that are different between two comma seperated lists */ +/* Isolate and return the elements that are different between two comma separated lists */ void TreeSocket::ListDifference(const std::string &one, const std::string &two, char sep, std::string& mleft, std::string& mright) { @@ -179,7 +258,7 @@ void TreeSocket::ListDifference(const std::string &one, const std::string &two, } } -bool TreeSocket::Capab(const parameterlist ¶ms) +bool TreeSocket::Capab(const CommandBase::Params& params) { if (params.size() < 1) { @@ -192,7 +271,24 @@ bool TreeSocket::Capab(const parameterlist ¶ms) capab->OptModuleList.clear(); capab->CapKeys.clear(); if (params.size() > 1) - proto_version = atoi(params[1].c_str()); + proto_version = ConvToNum(params[1]); + + if (proto_version < PROTO_OLDEST) + { + SendError("CAPAB negotiation failed: Server is using protocol version " + + (proto_version ? ConvToStr(proto_version) : "1201 or older") + + " which is too old to link with this server (protocol versions " + + ConvToStr(PROTO_OLDEST) + " to " + ConvToStr(PROTO_NEWEST) + " are supported)"); + return false; + } + + // We don't support the 2.1 protocol. + if (proto_version == PROTO_INSPIRCD_21_A0 || proto_version == PROTO_INSPIRCD_21_B2) + { + SendError("CAPAB negotiation failed: InspIRCd 2.1 beta is not supported"); + return false; + } + SendCapabilities(2); } else if (params[0] == "END") @@ -202,7 +298,7 @@ bool TreeSocket::Capab(const parameterlist ¶ms) if ((this->capab->ModuleList != this->MyModules(VF_COMMON)) && (this->capab->ModuleList.length())) { std::string diffIneed, diffUneed; - ListDifference(this->capab->ModuleList, this->MyModules(VF_COMMON), proto_version > 1201 ? ' ' : ',', diffIneed, diffUneed); + ListDifference(this->capab->ModuleList, this->MyModules(VF_COMMON), ' ', diffIneed, diffUneed); if (diffIneed.length() || diffUneed.length()) { reason = "Modules incorrectly matched on these servers."; @@ -214,6 +310,7 @@ bool TreeSocket::Capab(const parameterlist ¶ms) return false; } } + if (this->capab->OptModuleList != this->MyModules(VF_OPTCOMMON) && this->capab->OptModuleList.length()) { std::string diffIneed, diffUneed; @@ -229,7 +326,7 @@ bool TreeSocket::Capab(const parameterlist ¶ms) } else { - reason = "Optional modules incorrectly matched on these servers, and options::allowmismatch not set."; + reason = "Optional modules incorrectly matched on these servers and is not enabled."; if (diffIneed.length()) reason += " Not loaded here:" + diffIneed; if (diffUneed.length()) @@ -240,24 +337,6 @@ bool TreeSocket::Capab(const parameterlist ¶ms) } } - if (this->capab->CapKeys.find("PROTOCOL") == this->capab->CapKeys.end()) - { - reason = "Protocol version not specified"; - } - else - { - proto_version = atoi(capab->CapKeys.find("PROTOCOL")->second.c_str()); - if (proto_version < MinCompatProtocol) - { - reason = "Server is using protocol version " + ConvToStr(proto_version) + - " which is too old to link with this server (version " + ConvToStr(ProtocolVersion) - + (ProtocolVersion != MinCompatProtocol ? ", links with " + ConvToStr(MinCompatProtocol) + " and above)" : ")"); - } - } - - if(this->capab->CapKeys.find("PREFIX") != this->capab->CapKeys.end() && this->capab->CapKeys.find("PREFIX")->second != ServerInstance->Modes->BuildPrefixes()) - reason = "One or more of the prefixes on the remote server are invalid on this server."; - if (!capab->ChanModes.empty()) { if (capab->ChanModes != BuildModeList(MODETYPE_CHANNEL)) @@ -274,10 +353,25 @@ bool TreeSocket::Capab(const parameterlist ¶ms) } } } - else if (this->capab->CapKeys.find("CHANMODES") != this->capab->CapKeys.end()) + else if (proto_version == PROTO_INSPIRCD_20) { - if (this->capab->CapKeys.find("CHANMODES")->second != ServerInstance->Modes->GiveModeList(MASK_CHANNEL)) - reason = "One or more of the channel modes on the remote server are invalid on this server."; + if (this->capab->CapKeys.find("CHANMODES") != this->capab->CapKeys.end()) + { + if (this->capab->CapKeys.find("CHANMODES")->second != ServerInstance->Modes->GiveModeList(MODETYPE_CHANNEL)) + reason = "One or more of the channel modes on the remote server are invalid on this server."; + } + + else if (this->capab->CapKeys.find("PREFIX") != this->capab->CapKeys.end()) + { + if (this->capab->CapKeys.find("PREFIX")->second != ServerInstance->Modes->BuildPrefixes()) + reason = "One or more of the prefixes on the remote server are invalid on this server."; + } + } + + if (!reason.empty()) + { + this->SendError("CAPAB negotiation failed: " + reason); + return false; } if (!capab->UserModes.empty()) @@ -296,39 +390,52 @@ bool TreeSocket::Capab(const parameterlist ¶ms) } } } - else if (this->capab->CapKeys.find("USERMODES") != this->capab->CapKeys.end()) + else if (proto_version == PROTO_INSPIRCD_20 && this->capab->CapKeys.find("USERMODES") != this->capab->CapKeys.end()) { - if (this->capab->CapKeys.find("USERMODES")->second != ServerInstance->Modes->GiveModeList(MASK_USER)) + if (this->capab->CapKeys.find("USERMODES")->second != ServerInstance->Modes->GiveModeList(MODETYPE_USER)) reason = "One or more of the user modes on the remote server are invalid on this server."; } + if (!reason.empty()) + { + this->SendError("CAPAB negotiation failed: " + reason); + return false; + } + + if (this->capab->CapKeys.find("CASEMAPPING") != this->capab->CapKeys.end()) + { + const std::string casemapping = this->capab->CapKeys.find("CASEMAPPING")->second; + if (casemapping != ServerInstance->Config->CaseMapping) + { + reason = "The casemapping of the remote server differs to that of the local server." + " Local casemapping: " + ServerInstance->Config->CaseMapping + + " Remote casemapping: " + casemapping; + this->SendError("CAPAB negotiation failed: " + reason); + return false; + } + } + /* Challenge response, store their challenge for our password */ std::map::iterator n = this->capab->CapKeys.find("CHALLENGE"); - if (Utils->ChallengeResponse && (n != this->capab->CapKeys.end()) && (ServerInstance->Modules->Find("m_sha256.so"))) + if ((n != this->capab->CapKeys.end()) && (ServerInstance->Modules->FindService(SERVICE_DATA, "hash/sha256"))) { /* Challenge-response is on now */ this->SetTheirChallenge(n->second); if (!this->GetTheirChallenge().empty() && (this->LinkState == CONNECTING)) { this->SendCapabilities(2); - this->WriteLine(std::string("SERVER ")+ServerInstance->Config->ServerName+" "+this->MakePass(capab->link->SendPass, capab->theirchallenge)+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc); + this->WriteLine("SERVER "+ServerInstance->Config->ServerName+" "+this->MakePass(capab->link->SendPass, capab->theirchallenge)+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc); } } else { - /* They didnt specify a challenge or we don't have m_sha256.so, we use plaintext */ + // They didn't specify a challenge or we don't have sha256, we use plaintext if (this->LinkState == CONNECTING) { this->SendCapabilities(2); - this->WriteLine(std::string("SERVER ")+ServerInstance->Config->ServerName+" "+capab->link->SendPass+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc); + this->WriteLine("SERVER "+ServerInstance->Config->ServerName+" "+capab->link->SendPass+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc); } } - - if (reason.length()) - { - this->SendError("CAPAB negotiation failed: "+reason); - return false; - } } else if ((params[0] == "MODULES") && (params.size() == 2)) { @@ -338,7 +445,7 @@ bool TreeSocket::Capab(const parameterlist ¶ms) } else { - capab->ModuleList.push_back(proto_version > 1201 ? ' ' : ','); + capab->ModuleList.push_back(' '); capab->ModuleList.append(params[1]); } } @@ -364,7 +471,7 @@ bool TreeSocket::Capab(const parameterlist ¶ms) } else if ((params[0] == "CAPABILITIES") && (params.size() == 2)) { - irc::tokenstream capabs(params[1]); + irc::spacesepstream capabs(params[1]); std::string item; while (capabs.GetToken(item)) { @@ -372,12 +479,11 @@ bool TreeSocket::Capab(const parameterlist ¶ms) std::string::size_type equals = item.find('='); if (equals != std::string::npos) { - std::string var = item.substr(0, equals); - std::string value = item.substr(equals+1, item.length()); + std::string var(item, 0, equals); + std::string value(item, equals+1); capab->CapKeys[var] = value; } } } return true; } -