X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fcoremods%2Fcore_channel%2Fcore_channel.cpp;h=db17925b0f8432db33d397b598984740a32998ac;hb=c71361e8e4f22cb4f72881399bce2832eb080b0e;hp=4e49ba2b4a6ff1b41e095e3d82ec4bb89fc4ba5f;hpb=b2ac8cc0a6405946a388b80df3be21bc276a61f3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/coremods/core_channel/core_channel.cpp b/src/coremods/core_channel/core_channel.cpp index 4e49ba2b4..db17925b0 100644 --- a/src/coremods/core_channel/core_channel.cpp +++ b/src/coremods/core_channel/core_channel.cpp @@ -1,7 +1,11 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2014-2015 Attila Molnar + * Copyright (C) 2019 Robby + * Copyright (C) 2018 linuxdaemon + * Copyright (C) 2018 Dylan Frank + * Copyright (C) 2017-2020 Sadie Powell + * Copyright (C) 2014-2015, 2018 Attila Molnar * * 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 @@ -122,7 +126,7 @@ class CoreModChannel : public Module, public CheckExemption::EventListener public: CoreModChannel() - : CheckExemption::EventListener(this) + : CheckExemption::EventListener(this, UINT_MAX) , invapi(this) , cmdinvite(this, invapi) , cmdjoin(this) @@ -148,16 +152,6 @@ class CoreModChannel : public Module, public CheckExemption::EventListener void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { ConfigTag* optionstag = ServerInstance->Config->ConfValue("options"); - Implementation events[] = { I_OnCheckKey, I_OnCheckLimit, I_OnCheckChannelBan }; - if (optionstag->getBool("invitebypassmodes", true)) - ServerInstance->Modules.Attach(events, this, sizeof(events)/sizeof(Implementation)); - else - { - for (unsigned int i = 0; i < sizeof(events)/sizeof(Implementation); i++) - ServerInstance->Modules.Detach(events[i], this); - } - - joinhook.modefromuser = optionstag->getBool("cyclehostsfromuser"); std::string current; irc::spacesepstream defaultstream(optionstag->getString("exemptchanops")); @@ -174,51 +168,65 @@ class CoreModChannel : public Module, public CheckExemption::EventListener ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Exempting prefix %c from %s", prefix, restriction.c_str()); exempts[restriction] = prefix; } - exemptions.swap(exempts); ConfigTag* securitytag = ServerInstance->Config->ConfValue("security"); - const std::string announceinvites = securitytag->getString("announceinvites", "dynamic"); + const std::string announceinvites = securitytag->getString("announceinvites", "dynamic", 1); + Invite::AnnounceState newannouncestate; if (stdalgo::string::equalsci(announceinvites, "none")) - cmdinvite.announceinvites = Invite::ANNOUNCE_NONE; + newannouncestate = Invite::ANNOUNCE_NONE; else if (stdalgo::string::equalsci(announceinvites, "all")) - cmdinvite.announceinvites = Invite::ANNOUNCE_ALL; + newannouncestate = Invite::ANNOUNCE_ALL; else if (stdalgo::string::equalsci(announceinvites, "ops")) - cmdinvite.announceinvites = Invite::ANNOUNCE_OPS; + newannouncestate = Invite::ANNOUNCE_OPS; else if (stdalgo::string::equalsci(announceinvites, "dynamic")) - cmdinvite.announceinvites = Invite::ANNOUNCE_DYNAMIC; + newannouncestate = Invite::ANNOUNCE_DYNAMIC; else throw ModuleException(announceinvites + " is an invalid value, at " + securitytag->getTagLocation()); + // Config is valid, apply it + + // Validates and applies tags, so do it first + banmode.DoRehash(); + + exemptions.swap(exempts); // In 2.0 we allowed limits of 0 to be set. This is non-standard behaviour // and will be removed in the next major release. - limitmode.minlimit = optionstag->getBool("allowzerolimit", true) ? 0 : 1; + limitmode.minlimit = optionstag->getBool("allowzerolimit", true) ? 0 : 1;; + cmdinvite.announceinvites = newannouncestate; + joinhook.modefromuser = optionstag->getBool("cyclehostsfromuser"); - banmode.DoRehash(); + Implementation events[] = { I_OnCheckKey, I_OnCheckLimit, I_OnCheckChannelBan }; + if (optionstag->getBool("invitebypassmodes", true)) + ServerInstance->Modules.Attach(events, this, sizeof(events)/sizeof(Implementation)); + else + { + for (unsigned int i = 0; i < sizeof(events)/sizeof(Implementation); i++) + ServerInstance->Modules.Detach(events[i], this); + } } void On005Numeric(std::map& tokens) CXX11_OVERRIDE { tokens["KEYLEN"] = ConvToStr(ModeChannelKey::maxkeylen); - // Build a map of limits to their mode character. - insp::flat_map limits; + std::vector limits; + std::string vlist; const ModeParser::ListModeList& listmodes = ServerInstance->Modes->GetListModes(); for (ModeParser::ListModeList::const_iterator iter = listmodes.begin(); iter != listmodes.end(); ++iter) { - const unsigned int limit = (*iter)->GetLowerLimit(); - limits[limit].push_back((*iter)->GetModeChar()); + ListModeBase* lm = *iter; + limits.push_back(InspIRCd::Format("%c:%u", lm->GetModeChar(), lm->GetLowerLimit())); + if (lm->HasVariableLength()) + vlist.push_back(lm->GetModeChar()); } - // Generate the MAXLIST token from the limits map. - std::string& buffer = tokens["MAXLIST"]; - for (insp::flat_map::const_iterator iter = limits.begin(); iter != limits.end(); ++iter) - { - if (!buffer.empty()) - buffer.push_back(','); + std::sort(limits.begin(), limits.end()); + tokens["MAXLIST"] = stdalgo::string::join(limits, ','); - buffer.append(iter->second); - buffer.push_back(':'); - buffer.append(ConvToStr(iter->first)); + if (!vlist.empty()) + { + tokens["VBANLIST"]; // deprecated + tokens["VLIST"] = vlist; } } @@ -236,7 +244,7 @@ class CoreModChannel : public Module, public CheckExemption::EventListener if (!MOD_RESULT.check(InspIRCd::TimingSafeCompare(ckey, keygiven))) { // If no key provided, or key is not the right one, and can't bypass +k (not invited or option not enabled) - user->WriteNumeric(ERR_BADCHANNELKEY, chan->name, "Cannot join channel (Incorrect channel key)"); + user->WriteNumeric(ERR_BADCHANNELKEY, chan->name, "Cannot join channel (incorrect channel key)"); return MOD_RES_DENY; } } @@ -248,7 +256,7 @@ class CoreModChannel : public Module, public CheckExemption::EventListener FIRST_MOD_RESULT(OnCheckInvite, MOD_RESULT, (user, chan)); if (MOD_RESULT != MOD_RES_ALLOW) { - user->WriteNumeric(ERR_INVITEONLYCHAN, chan->name, "Cannot join channel (Invite only)"); + user->WriteNumeric(ERR_INVITEONLYCHAN, chan->name, "Cannot join channel (invite only)"); return MOD_RES_DENY; } } @@ -260,7 +268,7 @@ class CoreModChannel : public Module, public CheckExemption::EventListener FIRST_MOD_RESULT(OnCheckLimit, MOD_RESULT, (user, chan)); if (!MOD_RESULT.check(chan->GetUserCounter() < static_cast(limitmode.ext.get(chan)))) { - user->WriteNumeric(ERR_CHANNELISFULL, chan->name, "Cannot join channel (Channel is full)"); + user->WriteNumeric(ERR_CHANNELISFULL, chan->name, "Cannot join channel (channel is full)"); return MOD_RES_DENY; } }