X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_exemptchanops.cpp;h=411d0dd1568113f77f552ce3fb84d52dbe6ff411;hb=a5b9f37d62670a49e81c5a53f93bdf485aace4a6;hp=27b4e704f2c650ec534e3765b0491cf8d06849fa;hpb=cd712c40e1b352c05e7ae0f72e0a5e84cdf64323;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_exemptchanops.cpp b/src/modules/m_exemptchanops.cpp index 27b4e704f..411d0dd15 100644 --- a/src/modules/m_exemptchanops.cpp +++ b/src/modules/m_exemptchanops.cpp @@ -1,24 +1,25 @@ -/* +------------------------------------+ - * | 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 * - * 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 . */ -#define _CRT_SECURE_NO_DEPRECATE -#define _SCL_SECURE_NO_DEPRECATE #include "inspircd.h" -#include "u_listmode.h" - -/* $ModDesc: Provides the ability to allow channel operators to be exempt from certain modes. */ -/* $ModDep: ../../include/u_listmode.h */ +#include "listmode.h" +#include "modules/exemption.h" /** Handles channel mode +X */ @@ -27,97 +28,106 @@ class ExemptChanOps : public ListModeBase public: ExemptChanOps(Module* Creator) : ListModeBase(Creator, "exemptchanops", 'X', "End of channel exemptchanops list", 954, 953, false, "exemptchanops") { } - virtual bool ValidateParam(User* user, Channel* chan, std::string &word) - { - if ((word.length() > 35) || (word.empty())) + bool ValidateParam(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE { + std::string::size_type p = word.find(':'); + if (p == std::string::npos) { - user->WriteNumeric(955, "%s %s %s :word is too %s for exemptchanops list",user->nick.c_str(), chan->name.c_str(), word.c_str(), (word.empty() ? "short" : "long")); + user->WriteNumeric(Numerics::InvalidModeParameter(chan, this, word, "Invalid exemptchanops entry, format is :")); return false; } - return true; - } + std::string restriction(word, 0, p); + // If there is a '-' in the restriction string ignore it and everything after it + // to support "auditorium-vis" and "auditorium-see" in m_auditorium + p = restriction.find('-'); + if (p != std::string::npos) + restriction.erase(p); + + if (!ServerInstance->Modes->FindMode(restriction, MODETYPE_CHANNEL)) + { + user->WriteNumeric(Numerics::InvalidModeParameter(chan, this, word, "Unknown restriction")); + return false; + } - virtual bool TellListTooLong(User* user, Channel* chan, std::string &word) - { - user->WriteNumeric(959, "%s %s %s :Channel exemptchanops list is full", user->nick.c_str(), chan->name.c_str(), word.c_str()); return true; } - virtual void TellAlreadyOnList(User* user, Channel* chan, std::string &word) + void TellAlreadyOnList(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE { - user->WriteNumeric(957, "%s %s :The word %s is already on the exemptchanops list",user->nick.c_str(), chan->name.c_str(), word.c_str()); + user->WriteNumeric(957, chan->name, InspIRCd::Format("The word %s is already on the exemptchanops list", word.c_str())); } - virtual void TellNotSet(User* user, Channel* chan, std::string &word) + void TellNotSet(User* user, Channel* chan, std::string& word) CXX11_OVERRIDE { - user->WriteNumeric(958, "%s %s :No such exemptchanops word is set",user->nick.c_str(), chan->name.c_str()); + user->WriteNumeric(958, chan->name, "No such exemptchanops word is set"); } }; -class ModuleExemptChanOps : public Module +class ExemptHandler : public CheckExemption::EventListener { - ExemptChanOps ec; - std::string alwaysexempt, neverexempt; - public: - - ModuleExemptChanOps() - : ec(this) + ExemptChanOps ec; + ExemptHandler(Module* me) + : CheckExemption::EventListener(me) + , ec(me) { - if (!ServerInstance->Modes->AddMode(&ec)) - throw ModuleException("Could not add new modes!"); - - ec.DoImplements(this); - Implementation eventlist[] = { I_OnChannelDelete, I_OnChannelRestrictionApply, I_OnRehash, I_OnSyncChannel }; - ServerInstance->Modules->Attach(eventlist, this, 4); - - OnRehash(NULL); } - virtual Version GetVersion() + PrefixMode* FindMode(const std::string& mid) { - return Version("Provides the ability to allow channel operators to be exempt from certain modes.",VF_VENDOR|VF_COMMON); + if (mid.length() == 1) + return ServerInstance->Modes->FindPrefixMode(mid[0]); + + ModeHandler* mh = ServerInstance->Modes->FindMode(mid, MODETYPE_CHANNEL); + return mh ? mh->IsPrefixMode() : NULL; } - virtual void OnRehash(User* user) + ModResult OnCheckExemption(User* user, Channel* chan, const std::string& restriction) CXX11_OVERRIDE { - ConfigReader Conf; - alwaysexempt = Conf.ReadValue("exemptchanops", "alwaysexempt", 0); - neverexempt = Conf.ReadValue("exemptchanops", "neverexempt", 0); - ec.DoRehash(); + unsigned int mypfx = chan->GetPrefixValue(user); + std::string minmode; + + ListModeBase::ModeList* list = ec.GetList(chan); + + if (list) + { + for (ListModeBase::ModeList::iterator i = list->begin(); i != list->end(); ++i) + { + std::string::size_type pos = (*i).mask.find(':'); + if (pos == std::string::npos) + continue; + if (!i->mask.compare(0, pos, restriction)) + minmode.assign(i->mask, pos + 1, std::string::npos); + } + } + + PrefixMode* mh = FindMode(minmode); + if (mh && mypfx >= mh->GetPrefixRank()) + return MOD_RES_ALLOW; + if (mh || minmode == "*") + return MOD_RES_DENY; + + return MOD_RES_PASSTHRU; } +}; - virtual void OnCleanup(int target_type, void* item) +class ModuleExemptChanOps : public Module +{ + ExemptHandler eh; + + public: + ModuleExemptChanOps() : eh(this) { - ec.DoCleanup(target_type, item); } - virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque) + Version GetVersion() CXX11_OVERRIDE { - ec.DoSyncChannel(chan, proto, opaque); + return Version("Provides the ability to allow channel operators to be exempt from certain modes.",VF_VENDOR); } - virtual ModResult OnChannelRestrictionApply(User* user, Channel* chan, const char* restriction) + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - irc::spacesepstream allowstream(alwaysexempt), denystream(neverexempt); - std::string current; - - if (chan->GetPrefixValue(user) != OP_VALUE) - return MOD_RES_PASSTHRU; // They're not opped, so we don't exempt them - while(denystream.GetToken(current)) - if (!strcasecmp(restriction, current.c_str())) return MOD_RES_PASSTHRU; // This mode is set to never allow exemptions in the config - while(allowstream.GetToken(current)) - if (!strcasecmp(restriction, current.c_str())) return MOD_RES_ALLOW; // This mode is set to always allow exemptions in the config - - modelist* list = ec.extItem.get(chan); - - if (!list) return MOD_RES_PASSTHRU; - for (modelist::iterator i = list->begin(); i != list->end(); ++i) - if (!strcasecmp(restriction, i->mask.c_str())) - return MOD_RES_ALLOW; // They're opped, and the channel lets ops bypass this mode. Allow regardless of restrictions - - return MOD_RES_PASSTHRU; + eh.ec.DoRehash(); } };