X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcapab.cpp;h=27cb42fca1b43982b5d9e94e611b7e0a6969c2cf;hb=4a6fedd9324d87349a806c9c1d0ae6e7d3c1fd38;hp=7f9f9edb7b4575b753c24f7f20c3b5b7df3b9bc5;hpb=51a47e7d757df63370168ab5000d13ca9c349ecd;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp index 7f9f9edb7..27cb42fca 100644 --- a/src/modules/m_spanningtree/capab.cpp +++ b/src/modules/m_spanningtree/capab.cpp @@ -1,9 +1,15 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2019 linuxdaemon + * Copyright (C) 2014, 2017-2019 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 - * Copyright (C) 2008 Craig Edwards * * 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 @@ -47,11 +53,11 @@ std::string TreeSocket::MyModules(int filter) Module* const mod = i->second; // 3.0 advertises its settings for the benefit of services // 2.0 would bork on this - if (proto_version < 1205 && i->second->ModuleSourceFile == "m_kicknorejoin.so") + if (proto_version < PROTO_INSPIRCD_30 && mod->ModuleSourceFile == "m_kicknorejoin.so") continue; bool do_compat_include = false; - if (proto_version < 1205) + if (proto_version < PROTO_INSPIRCD_30) { for (size_t j = 0; j < sizeof(compatmods)/sizeof(compatmods[0]); j++) { @@ -63,12 +69,11 @@ std::string TreeSocket::MyModules(int filter) } } - Version v = i->second->GetVersion(); + Version v = mod->GetVersion(); if ((!do_compat_include) && (!(v.Flags & filter))) continue; - if (i != modlist.begin()) - capabilities.push_back(' '); + capabilities.push_back(' '); capabilities.append(i->first); if (!v.link_data.empty()) { @@ -76,19 +81,40 @@ std::string TreeSocket::MyModules(int filter) 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; - const ModeParser::ModeHandlerMap& mhs = ServerInstance->Modes.GetModes(type); + const ModeParser::ModeHandlerMap& mhs = ServerInstance->Modes.GetModes(mtype); for (ModeParser::ModeHandlerMap::const_iterator i = mhs.begin(); i != mhs.end(); ++i) { const ModeHandler* const mh = i->second; - std::string mdesc = mh->name; - mdesc.push_back('='); const PrefixMode* const pm = mh->IsPrefixMode(); + std::string mdesc; + if (proto_version >= PROTO_INSPIRCD_30) + { + 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()) @@ -98,7 +124,7 @@ static std::string BuildModeList(ModeType type) modes.push_back(mdesc); } std::sort(modes.begin(), modes.end()); - return irc::stringjoiner(modes); + return stdalgo::string::join(modes); } void TreeSocket::SendCapabilities(int phase) @@ -107,7 +133,7 @@ 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) @@ -163,9 +189,15 @@ void TreeSocket::SendCapabilities(int phase) extra = " CHALLENGE=" + this->GetOurChallenge(); } - // 2.0 needs this key - if (proto_version == 1202) - extra.append(" PROTOCOL="+ConvToStr(ProtocolVersion)); + // 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()); + } this->WriteLine("CAPAB CAPABILITIES " /* Preprocessor does this one. */ ":NICKMAX="+ConvToStr(ServerInstance->Config->Limits.NickMax)+ @@ -175,13 +207,10 @@ 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)+ " MAXHOST="+ConvToStr(ServerInstance->Config->Limits.MaxHost)+ extra+ - " PREFIX="+ServerInstance->Modes->BuildPrefixes()+ - " CHANMODES="+ServerInstance->Modes->GiveModeList(MODETYPE_CHANNEL)+ - " USERMODES="+ServerInstance->Modes->GiveModeList(MODETYPE_USER)+ " 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 @@ -221,7 +250,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) { @@ -234,18 +263,19 @@ bool TreeSocket::Capab(const parameterlist ¶ms) capab->OptModuleList.clear(); capab->CapKeys.clear(); if (params.size() > 1) - proto_version = ConvToInt(params[1]); + proto_version = ConvToNum(params[1]); - if (proto_version < MinCompatProtocol) + 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 (version " + ConvToStr(ProtocolVersion) - + (ProtocolVersion != MinCompatProtocol ? ", links with " + ConvToStr(MinCompatProtocol) + " and above)" : ")")); + 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; } - // Special case, may be removed in the future - if (proto_version == 1203 || proto_version == 1204) + // 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; @@ -272,6 +302,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; @@ -287,7 +318,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()) @@ -298,9 +329,6 @@ bool TreeSocket::Capab(const parameterlist ¶ms) } } - 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)) @@ -317,10 +345,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(MODETYPE_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()) @@ -339,28 +382,29 @@ 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(MODETYPE_USER)) reason = "One or more of the user modes on the remote server are invalid on this server."; } - else + + if (!reason.empty()) { - // We default to rfc1459 here because if this key is not sent then - // the remote server is running the 2.0 protocol which uses rfc1459 - // by default. - std::string casemapping = "rfc1459"; - std::map::iterator citer = this->capab->CapKeys.find("CASEMAPPING"); - if (citer != this->capab->CapKeys.end()) - casemapping = citer->second; + 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 */ @@ -384,12 +428,6 @@ bool TreeSocket::Capab(const parameterlist ¶ms) 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)) { @@ -425,7 +463,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)) {