X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_spanningtree%2Fcapab.cpp;h=c29330516952f1324481fd63116c6840eafb7233;hb=f2e3fd5952b23209b084bde4f464e6643c8a00ff;hp=7afcc50e5935305e4d53dafe7796d7dc787629f4;hpb=16398df07d4ce1f1d4a2e43d97bc39043f8d44b5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_spanningtree/capab.cpp b/src/modules/m_spanningtree/capab.cpp index 7afcc50e5..c29330516 100644 --- a/src/modules/m_spanningtree/capab.cpp +++ b/src/modules/m_spanningtree/capab.cpp @@ -26,6 +26,17 @@ #include "link.h" #include "main.h" +struct CompatMod +{ + const char* name; + ModuleFlags listflag; +}; + +static CompatMod compatmods[] = +{ + { "m_watch.so", VF_OPTCOMMON } +}; + std::string TreeSocket::MyModules(int filter) { const ModuleManager::ModuleMap& modlist = ServerInstance->Modules->GetModules(); @@ -33,8 +44,27 @@ std::string TreeSocket::MyModules(int filter) std::string capabilities; for (ModuleManager::ModuleMap::const_iterator i = modlist.begin(); i != modlist.end(); ++i) { + 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") + continue; + + bool do_compat_include = false; + if (proto_version < 1205) + { + for (size_t j = 0; j < sizeof(compatmods)/sizeof(compatmods[0]); j++) + { + if ((compatmods[j].listflag & filter) && (mod->ModuleSourceFile == compatmods[j].name)) + { + do_compat_include = true; + break; + } + } + } + Version v = i->second->GetVersion(); - if (!(v.Flags & filter)) + if ((!do_compat_include) && (!(v.Flags & filter))) continue; if (i != modlist.begin()) @@ -49,29 +79,38 @@ std::string TreeSocket::MyModules(int filter) return capabilities; } -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 != 1202) { - std::string mdesc = mh->name; - mdesc.push_back('='); - PrefixMode* pm = mh->IsPrefixMode(); if (pm) - { - if (pm->GetPrefix()) - mdesc.push_back(pm->GetPrefix()); - mdesc.push_back(mh->GetModeChar()); - } - modes.push_back(mdesc); + 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); - return line.GetJoined(); + std::sort(modes.begin(), modes.end()); + return stdalgo::string::join(modes); } void TreeSocket::SendCapabilities(int phase) @@ -130,15 +169,21 @@ 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 this key + // 2.0 needs these keys. if (proto_version == 1202) - extra.append(" PROTOCOL="+ConvToStr(ProtocolVersion)); + { + extra.append(" PROTOCOL="+ConvToStr(ProtocolVersion)) + .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)+ @@ -148,12 +193,17 @@ 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(MASK_CHANNEL)+ - " USERMODES="+ServerInstance->Modes->GiveModeList(MASK_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 + // 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"); @@ -186,7 +236,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) { @@ -199,7 +249,7 @@ 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) { @@ -237,6 +287,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; @@ -252,7 +303,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()) @@ -263,9 +314,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)) @@ -282,10 +330,25 @@ bool TreeSocket::Capab(const parameterlist ¶ms) } } } - else if (this->capab->CapKeys.find("CHANMODES") != this->capab->CapKeys.end()) + else if (proto_version == 1202) { - 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()) @@ -304,15 +367,34 @@ bool TreeSocket::Capab(const parameterlist ¶ms) } } } - else if (this->capab->CapKeys.find("USERMODES") != this->capab->CapKeys.end()) + else if (proto_version == 1202 && 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); @@ -324,19 +406,13 @@ bool TreeSocket::Capab(const parameterlist ¶ms) } 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("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)) { @@ -372,7 +448,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)) { @@ -380,12 +456,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; } -