ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-10 02:59:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor "CAPAB CAPABILITIES" code.

Browse Source
This commit is contained in:
Sadie Powell 2024-08-17 00:08:52 +01:00
parent e41b4ca696
commit 6c12543edc
1 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
modules/spanningtree/capab.cpp
View File

@ -163,6 +163,43 @@ namespace
return okay;
}
// Generates a capability list in the format "FOO=BAR BAZ=BAX".
std::string FormatCapabilities(TreeSocket* ts)
{
std::unordered_map<std::string, std::string> capabilities = {
{ "CASEMAPPING", ServerInstance->Config->CaseMapping },
{ "MAXAWAY", ConvToStr(ServerInstance->Config->Limits.MaxAway) },
{ "MAXCHANNEL", ConvToStr(ServerInstance->Config->Limits.MaxChannel) },
{ "MAXHOST", ConvToStr(ServerInstance->Config->Limits.MaxHost) },
{ "MAXKICK", ConvToStr(ServerInstance->Config->Limits.MaxKick) },
{ "MAXLINE", ConvToStr(ServerInstance->Config->Limits.MaxLine) },
{ "MAXMODES", ConvToStr(ServerInstance->Config->Limits.MaxModes) },
{ "MAXNICK", ConvToStr(ServerInstance->Config->Limits.MaxNick) },
{ "MAXQUIT", ConvToStr(ServerInstance->Config->Limits.MaxQuit) },
{ "MAXREAL", ConvToStr(ServerInstance->Config->Limits.MaxReal) },
{ "MAXTOPIC", ConvToStr(ServerInstance->Config->Limits.MaxTopic) },
{ "MAXUSER", ConvToStr(ServerInstance->Config->Limits.MaxUser) },
};
// If SHA256 hashing support is available then send a challenge token.
if (ServerInstance->Modules.FindService(SERVICE_DATA, "hash/sha256"))
{
ts->SetOurChallenge(ServerInstance->GenRandomStr(20));
capabilities["CHALLENGE"] = ts->GetOurChallenge();
}
auto first = true;
std::stringstream capabilitystr;
for (const auto& [capkey, capvalue] : capabilities)
{
if (!first)
capabilitystr << ' ';
capabilitystr << capkey << '=' << capvalue;
first = false;
}
return capabilitystr.str();
}
// Generates a module list in the format "m_foo.so=bar m_bar.so=baz".
std::string FormatModules(ModuleFlags property)
{
@ -265,46 +302,16 @@ void TreeSocket::SendCapabilities(int phase)
if (phase < 2)
return;
WriteLine("CAPAB CAPABILITIES :" + FormatCapabilities(this));
WriteLine("CAPAB MODULES :" + FormatModules(VF_COMMON));
WriteLine("CAPAB MODSUPPORT :" + FormatModules(VF_OPTCOMMON));
WriteLine("CAPAB CHANMODES :" + BuildModeList(MODETYPE_CHANNEL));
WriteLine("CAPAB USERMODES :" + BuildModeList(MODETYPE_USER));
std::unordered_map<std::string, std::string> capabilities = {
{ "CASEMAPPING", ServerInstance->Config->CaseMapping },
{ "MAXAWAY", ConvToStr(ServerInstance->Config->Limits.MaxAway) },
{ "MAXCHANNEL", ConvToStr(ServerInstance->Config->Limits.MaxChannel) },
{ "MAXHOST", ConvToStr(ServerInstance->Config->Limits.MaxHost) },
{ "MAXKICK", ConvToStr(ServerInstance->Config->Limits.MaxKick) },
{ "MAXLINE", ConvToStr(ServerInstance->Config->Limits.MaxLine) },
{ "MAXMODES", ConvToStr(ServerInstance->Config->Limits.MaxModes) },
{ "MAXNICK", ConvToStr(ServerInstance->Config->Limits.MaxNick) },
{ "MAXQUIT", ConvToStr(ServerInstance->Config->Limits.MaxQuit) },
{ "MAXREAL", ConvToStr(ServerInstance->Config->Limits.MaxReal) },
{ "MAXTOPIC", ConvToStr(ServerInstance->Config->Limits.MaxTopic) },
{ "MAXUSER", ConvToStr(ServerInstance->Config->Limits.MaxUser) },
};
std::string extbans;
if (BuildExtBanList(extbans))
WriteLine("CAPAB EXTBANS :" + extbans);
// If SHA256 hashing support is available then send a challenge token.
if (ServerInstance->Modules.FindService(SERVICE_DATA, "hash/sha256"))
{
SetOurChallenge(ServerInstance->GenRandomStr(20));
capabilities["CHALLENGE"] = GetOurChallenge();
}
std::stringstream capabilitystr;
char separator = ':';
for (const auto& [capkey, capvalue] : capabilities)
{
capabilitystr << separator << capkey << '=' << capvalue;
separator = ' ';
}
this->WriteLine("CAPAB CAPABILITIES " + capabilitystr.str());
this->WriteLine("CAPAB END");
}