X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_restrictchans.cpp;h=853b6b75c14d647e000efbf2419c1af16bf1969d;hb=9aadc251e9910998fbbe5438b461958a261eae1d;hp=9de6b1a0c6a38b02b2f89d31c8536db27d95e65a;hpb=54d10d53c730ab81ca6464fe2f0e0ecbcd435672;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_restrictchans.cpp b/src/modules/m_restrictchans.cpp index 9de6b1a0c..853b6b75c 100644 --- a/src/modules/m_restrictchans.cpp +++ b/src/modules/m_restrictchans.cpp @@ -21,56 +21,70 @@ #include "inspircd.h" +#include "modules/account.h" + +typedef insp::flat_set AllowChans; class ModuleRestrictChans : public Module { - std::set allowchans; + AllowChans allowchans; + bool allowregistered; - void ReadConfig() + bool CanCreateChannel(LocalUser* user, const std::string& name) { - allowchans.clear(); - ConfigTagList tags = ServerInstance->Config->ConfTags("allowchannel"); - for(ConfigIter i = tags.first; i != tags.second; ++i) + const AccountExtItem* accountext = GetAccountExtItem(); + if (allowregistered && accountext && accountext->get(user)) + return true; + + if (user->HasPrivPermission("channels/restricted-create")) + return true; + + for (AllowChans::const_iterator it = allowchans.begin(), it_end = allowchans.end(); it != it_end; ++it) { - ConfigTag* tag = i->second; - std::string txt = tag->getString("name"); - allowchans.insert(txt.c_str()); + if (InspIRCd::Match(name, *it)) + return true; } + + return false; } public: - void init() CXX11_OVERRIDE + ModuleRestrictChans() + : allowregistered(false) { - ReadConfig(); - Implementation eventlist[] = { I_OnUserPreJoin, I_OnRehash }; - ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } - void OnRehash(User* user) CXX11_OVERRIDE + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - ReadConfig(); + AllowChans newallows; + ConfigTagList tags = ServerInstance->Config->ConfTags("allowchannel"); + for (ConfigIter i = tags.first; i != tags.second; ++i) + { + const std::string name = i->second->getString("name"); + if (name.empty()) + throw ModuleException("Empty at " + i->second->getTagLocation()); + + newallows.insert(name); + } + allowchans.swap(newallows); + + // Global config + ConfigTag* tag = ServerInstance->Config->ConfValue("restrictchans"); + allowregistered = tag->getBool("allowregistered", false); } ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE { - irc::string x(cname.c_str()); - // channel does not yet exist (record is null, about to be created IF we were to allow it) - if (!chan) - { - // user is not an oper and its not in the allow list - if ((!user->IsOper()) && (allowchans.find(x) == allowchans.end())) - { - user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Only IRC operators may create new channels",user->nick.c_str(),cname.c_str()); - return MOD_RES_DENY; - } - } + if (!chan && !CanCreateChannel(user, cname)) + return MOD_RES_DENY; + return MOD_RES_PASSTHRU; } Version GetVersion() CXX11_OVERRIDE { - return Version("Only opers may create new channels if this module is loaded",VF_VENDOR); + return Version("Allows restricting who can create channels", VF_VENDOR); } };