-/* +------------------------------------+
- * | 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) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
*
- * 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 <http://www.gnu.org/licenses/>.
*/
+
#include "inspircd.h"
-#include "xline.h"
-#include "treesocket.h"
#include "treeserver.h"
#include "utils.h"
+#include "link.h"
#include "main.h"
-/* $ModDep: m_spanningtree/utils.h m_spanningtree/treeserver.h m_spanningtree/treesocket.h */
+struct CompatMod
+{
+ const char* name;
+ ModuleFlags listflag;
+};
-std::string TreeSocket::MyModules(int filter)
+static CompatMod compatmods[] =
{
- std::vector<std::string> modlist = ServerInstance->Modules->GetAllModuleNames(filter);
+ { "m_watch.so", VF_OPTCOMMON }
+};
- if (filter == VF_COMMON && proto_version != ProtocolVersion)
- CompatAddModules(modlist);
+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 = capabilities + ",";
- capabilities = capabilities + modlist[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 ((!do_compat_include) && (!(v.Flags & filter)))
+ continue;
+
+ if (i != modlist.begin())
+ capabilities.push_back(' ');
+ capabilities.append(i->first);
+ if (!v.link_data.empty())
+ {
+ capabilities.push_back('=');
+ capabilities.append(v.link_data);
+ }
}
return capabilities;
}
+static std::string BuildModeList(ModeType type)
+{
+ std::vector<std::string> modes;
+ const ModeParser::ModeHandlerMap& mhs = ServerInstance->Modes.GetModes(type);
+ 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();
+ if (pm)
+ {
+ if (pm->GetPrefix())
+ mdesc.push_back(pm->GetPrefix());
+ }
+ mdesc.push_back(mh->GetModeChar());
+ modes.push_back(mdesc);
+ }
+ std::sort(modes.begin(), modes.end());
+ return stdalgo::string::join(modes);
+}
+
void TreeSocket::SendCapabilities(int phase)
{
- if (capab_phase >= phase)
+ if (capab->capab_phase >= phase)
return;
- if (capab_phase < 1 && phase >= 1)
+ if (capab->capab_phase < 1 && phase >= 1)
WriteLine("CAPAB START " + ConvToStr(ProtocolVersion));
- capab_phase = phase;
+ capab->capab_phase = phase;
if (phase < 2)
return;
- irc::commasepstream modulelist(MyModules(VF_COMMON));
- irc::commasepstream optmodulelist(MyModules(VF_OPTCOMMON));
+ const char sep = ' ';
+ irc::sepstream modulelist(MyModules(VF_COMMON), sep);
+ irc::sepstream optmodulelist(MyModules(VF_OPTCOMMON), sep);
/* Send module names, split at 509 length */
std::string item;
- std::string line = "CAPAB MODULES ";
+ std::string line = "CAPAB MODULES :";
while (modulelist.GetToken(item))
{
if (line.length() + item.length() + 1 > 509)
{
this->WriteLine(line);
- line = "CAPAB MODULES ";
+ line = "CAPAB MODULES :";
}
- if (line != "CAPAB MODULES ")
- line.append(",");
+ if (line != "CAPAB MODULES :")
+ line.push_back(sep);
line.append(item);
}
- if (line != "CAPAB MODULES ")
+ if (line != "CAPAB MODULES :")
this->WriteLine(line);
- line = "CAPAB MODSUPPORT ";
+ line = "CAPAB MODSUPPORT :";
while (optmodulelist.GetToken(item))
{
if (line.length() + item.length() + 1 > 509)
{
this->WriteLine(line);
- line = "CAPAB MODSUPPORT ";
+ line = "CAPAB MODSUPPORT :";
}
- if (line != "CAPAB MODSUPPORT ")
- line.append(",");
+ if (line != "CAPAB MODSUPPORT :")
+ line.push_back(sep);
line.append(item);
}
- if (line != "CAPAB MODSUPPORT ")
+ if (line != "CAPAB MODSUPPORT :")
this->WriteLine(line);
+ WriteLine("CAPAB CHANMODES :" + BuildModeList(MODETYPE_CHANNEL));
+ WriteLine("CAPAB USERMODES :" + BuildModeList(MODETYPE_USER));
- int ip6 = 0;
-#ifdef IPV6
- ip6 = 1;
-#endif
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"))
{
- this->SetOurChallenge(RandString(20));
+ SetOurChallenge(ServerInstance->GenRandomStr(20));
extra = " CHALLENGE=" + this->GetOurChallenge();
}
+ // 2.0 needs these keys.
+ if (proto_version == 1202)
+ {
+ extra.append(" PROTOCOL="+ConvToStr(ProtocolVersion));
+ extra.append(" MAXGECOS="+ConvToStr(ServerInstance->Config->Limits.MaxReal));
+ }
+
this->WriteLine("CAPAB CAPABILITIES " /* Preprocessor does this one. */
":NICKMAX="+ConvToStr(ServerInstance->Config->Limits.NickMax)+
" CHANMAX="+ConvToStr(ServerInstance->Config->Limits.ChanMax)+
" 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)+
- " IP6NATIVE="+ConvToStr(ip6)+
- " IP6SUPPORT=1"+
- " PROTOCOL="+ConvToStr(ProtocolVersion)+extra+
+ " MAXHOST="+ConvToStr(ServerInstance->Config->Limits.MaxHost)+
+ extra+
" PREFIX="+ServerInstance->Modes->BuildPrefixes()+
- " CHANMODES="+ServerInstance->Modes->GiveModeList(MASK_CHANNEL)+
- " USERMODES="+ServerInstance->Modes->GiveModeList(MASK_USER)+
- " SVSPART=1");
+ " 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
+ // 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");
}
-/* Check a comma seperated list for an item */
-bool TreeSocket::HasItem(const std::string &list, const std::string &item)
-{
- irc::commasepstream seplist(list);
- std::string item2;
-
- while (seplist.GetToken(item2))
- {
- if (item2 == item)
- return true;
- }
- return false;
-}
-
/* Isolate and return the elements that are different between two comma seperated lists */
-std::string TreeSocket::ListDifference(const std::string &one, const std::string &two)
+void TreeSocket::ListDifference(const std::string &one, const std::string &two, char sep,
+ std::string& mleft, std::string& mright)
{
- irc::commasepstream list_one(one);
+ std::set<std::string> values;
+ irc::sepstream sepleft(one, sep);
+ irc::sepstream sepright(two, sep);
std::string item;
- std::string result;
- while (list_one.GetToken(item))
+ while (sepleft.GetToken(item))
+ {
+ values.insert(item);
+ }
+ while (sepright.GetToken(item))
{
- if (!HasItem(two, item))
+ if (!values.erase(item))
{
- result.append(" ");
- result.append(item);
+ mright.push_back(sep);
+ mright.append(item);
}
}
- return result;
+ for(std::set<std::string>::iterator i = values.begin(); i != values.end(); ++i)
+ {
+ mleft.push_back(sep);
+ mleft.append(*i);
+ }
}
-bool TreeSocket::Capab(const parameterlist ¶ms)
+bool TreeSocket::Capab(const CommandBase::Params& params)
{
if (params.size() < 1)
{
}
if (params[0] == "START")
{
- ModuleList.clear();
- OptModuleList.clear();
- CapKeys.clear();
+ capab->ModuleList.clear();
+ capab->OptModuleList.clear();
+ capab->CapKeys.clear();
if (params.size() > 1)
- proto_version = atoi(params[1].c_str());
+ proto_version = ConvToInt(params[1]);
+
+ if (proto_version < MinCompatProtocol)
+ {
+ 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)" : ")"));
+ return false;
+ }
+
+ // Special case, may be removed in the future
+ if (proto_version == 1203 || proto_version == 1204)
+ {
+ SendError("CAPAB negotiation failed: InspIRCd 2.1 beta is not supported");
+ return false;
+ }
+
SendCapabilities(2);
}
else if (params[0] == "END")
{
std::string reason;
/* Compare ModuleList and check CapKeys */
- if ((this->ModuleList != this->MyModules(VF_COMMON)) && (this->ModuleList.length()))
+ if ((this->capab->ModuleList != this->MyModules(VF_COMMON)) && (this->capab->ModuleList.length()))
{
- std::string diffIneed = ListDifference(this->ModuleList, this->MyModules(VF_COMMON));
- std::string diffUneed = ListDifference(this->MyModules(VF_COMMON), this->ModuleList);
- if (diffIneed.length() == 0 && diffUneed.length() == 0)
- {
- reason = "Module list in CAPAB is not alphabetically ordered, cannot compare lists.";
- }
- else
+ std::string diffIneed, diffUneed;
+ ListDifference(this->capab->ModuleList, this->MyModules(VF_COMMON), ' ', diffIneed, diffUneed);
+ if (diffIneed.length() || diffUneed.length())
{
reason = "Modules incorrectly matched on these servers.";
if (diffIneed.length())
reason += " Not loaded here:" + diffIneed;
if (diffUneed.length())
reason += " Not loaded there:" + diffUneed;
+ this->SendError("CAPAB negotiation failed: "+reason);
+ return false;
}
- this->SendError("CAPAB negotiation failed: "+reason);
- return false;
}
- if (this->OptModuleList != this->MyModules(VF_OPTCOMMON) && this->OptModuleList.length())
+ if (this->capab->OptModuleList != this->MyModules(VF_OPTCOMMON) && this->capab->OptModuleList.length())
{
- std::string diffIneed = ListDifference(this->OptModuleList, this->MyModules(VF_OPTCOMMON));
- std::string diffUneed = ListDifference(this->MyModules(VF_OPTCOMMON), this->OptModuleList);
- if (diffIneed.length() == 0 && diffUneed.length() == 0)
+ std::string diffIneed, diffUneed;
+ ListDifference(this->capab->OptModuleList, this->MyModules(VF_OPTCOMMON), ' ', diffIneed, diffUneed);
+ if (diffIneed.length() || diffUneed.length())
{
- reason = "Optional Module list in CAPAB is not alphabetically ordered, cannot compare lists.";
+ if (Utils->AllowOptCommon)
+ {
+ ServerInstance->SNO->WriteToSnoMask('l',
+ "Optional module lists do not match, some commands may not work globally.%s%s%s%s",
+ diffIneed.length() ? " Not loaded here:" : "", diffIneed.c_str(),
+ diffUneed.length() ? " Not loaded there:" : "", diffUneed.c_str());
+ }
+ else
+ {
+ reason = "Optional modules incorrectly matched on these servers, and options::allowmismatch not set.";
+ if (diffIneed.length())
+ reason += " Not loaded here:" + diffIneed;
+ if (diffUneed.length())
+ reason += " Not loaded there:" + diffUneed;
+ this->SendError("CAPAB negotiation failed: "+reason);
+ return false;
+ }
}
- else if (Utils->AllowOptCommon)
+ }
+
+ 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))
{
- ServerInstance->SNO->WriteToSnoMask('l',
- "Optional module lists do not match, some commands may not work globally.%s%s%s%s",
- diffIneed.length() ? " Not loaded here:" : "", diffIneed.c_str(),
- diffUneed.length() ? " Not loaded there:" : "", diffUneed.c_str());
+ std::string diffIneed, diffUneed;
+ ListDifference(capab->ChanModes, BuildModeList(MODETYPE_CHANNEL), ' ', diffIneed, diffUneed);
+ if (diffIneed.length() || diffUneed.length())
+ {
+ reason = "Channel modes not matched on these servers.";
+ if (diffIneed.length())
+ reason += " Not loaded here:" + diffIneed;
+ if (diffUneed.length())
+ reason += " Not loaded there:" + diffUneed;
+ }
}
- else
+ }
+ else 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.";
+ }
+
+ if (!capab->UserModes.empty())
+ {
+ if (capab->UserModes != BuildModeList(MODETYPE_USER))
{
- reason = "Optional modules incorrectly matched on these servers, and options::allowmismatch not set.";
- if (diffIneed.length())
- reason += " Not loaded here:" + diffIneed;
- if (diffUneed.length())
- reason += " Not loaded there:" + diffUneed;
- this->SendError("CAPAB negotiation failed: "+reason);
- return false;
+ std::string diffIneed, diffUneed;
+ ListDifference(capab->UserModes, BuildModeList(MODETYPE_USER), ' ', diffIneed, diffUneed);
+ if (diffIneed.length() || diffUneed.length())
+ {
+ reason = "User modes not matched on these servers.";
+ if (diffIneed.length())
+ reason += " Not loaded here:" + diffIneed;
+ if (diffUneed.length())
+ reason += " Not loaded there:" + diffUneed;
+ }
}
}
-
- if (this->CapKeys.find("PROTOCOL") == this->CapKeys.end())
+ else if (this->capab->CapKeys.find("USERMODES") != this->capab->CapKeys.end())
{
- reason = "Protocol version not specified";
+ 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
{
- proto_version = atoi(CapKeys.find("PROTOCOL")->second.c_str());
- if (proto_version < MinCompatProtocol)
+ // 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<std::string, std::string>::iterator citer = this->capab->CapKeys.find("CASEMAPPING");
+ if (citer != this->capab->CapKeys.end())
+ casemapping = citer->second;
+
+ if (casemapping != ServerInstance->Config->CaseMapping)
{
- 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)" : ")");
+ reason = "The casemapping of the remote server differs to that of the local server."
+ " Local casemapping: " + ServerInstance->Config->CaseMapping +
+ " Remote casemapping: " + casemapping;
}
- }
-
- if(this->CapKeys.find("PREFIX") != this->CapKeys.end() && this->CapKeys.find("PREFIX")->second != ServerInstance->Modes->BuildPrefixes())
- reason = "One or more of the prefixes on the remote server are invalid on this server.";
-
- if(this->CapKeys.find("CHANMODES") != this->CapKeys.end() && this->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->CapKeys.find("USERMODES") != this->CapKeys.end() && this->CapKeys.find("USERMODES")->second != ServerInstance->Modes->GiveModeList(MASK_USER))
- reason = "One or more of the user modes on the remote server are invalid on this server.";
+ }
/* Challenge response, store their challenge for our password */
- std::map<std::string,std::string>::iterator n = this->CapKeys.find("CHALLENGE");
- if (Utils->ChallengeResponse && (n != this->CapKeys.end()) && (ServerInstance->Modules->Find("m_sha256.so")))
+ std::map<std::string,std::string>::iterator n = this->capab->CapKeys.find("CHALLENGE");
+ 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(OutboundPass, this->GetTheirChallenge())+" 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+" "+OutboundPass+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc);
+ this->WriteLine("SERVER "+ServerInstance->Config->ServerName+" "+capab->link->SendPass+" 0 "+ServerInstance->Config->GetSID()+" :"+ServerInstance->Config->ServerDesc);
}
}
}
else if ((params[0] == "MODULES") && (params.size() == 2))
{
- if (!this->ModuleList.length())
+ if (!capab->ModuleList.length())
{
- this->ModuleList.append(params[1]);
+ capab->ModuleList = params[1];
}
else
{
- this->ModuleList.append(",");
- this->ModuleList.append(params[1]);
+ capab->ModuleList.push_back(' ');
+ capab->ModuleList.append(params[1]);
}
}
else if ((params[0] == "MODSUPPORT") && (params.size() == 2))
{
- if (!this->OptModuleList.length())
+ if (!capab->OptModuleList.length())
{
- this->OptModuleList.append(params[1]);
+ capab->OptModuleList = params[1];
}
else
{
- this->OptModuleList.append(",");
- this->OptModuleList.append(params[1]);
+ capab->OptModuleList.push_back(' ');
+ capab->OptModuleList.append(params[1]);
}
}
+ else if ((params[0] == "CHANMODES") && (params.size() == 2))
+ {
+ capab->ChanModes = params[1];
+ }
+ else if ((params[0] == "USERMODES") && (params.size() == 2))
+ {
+ capab->UserModes = params[1];
+ }
else if ((params[0] == "CAPABILITIES") && (params.size() == 2))
{
irc::tokenstream capabs(params[1]);
std::string item;
- bool more = true;
- while ((more = capabs.GetToken(item)))
+ while (capabs.GetToken(item))
{
/* Process each key/value pair */
- std::string::size_type equals = item.rfind('=');
+ 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());
- CapKeys[var] = value;
+ std::string var(item, 0, equals);
+ std::string value(item, equals+1);
+ capab->CapKeys[var] = value;
}
}
}
return true;
}
-
projects / user / henk / code / inspircd.git / blobdiff