X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operprefix.cpp;h=c703d4d7936abcb1df0c0467d0077aae859c5f34;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=d416d5699b64f6c9cce9a75a47d22bc6eb45a1b7;hpb=24731c63b6320be22f7b3220236271fa7476b975;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp index d416d5699..c703d4d79 100644 --- a/src/modules/m_operprefix.cpp +++ b/src/modules/m_operprefix.cpp @@ -1,233 +1,133 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2013, 2017 Sadie Powell + * Copyright (C) 2012-2016 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2009-2010 Craig Edwards + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * 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 free but copyrighted software; see - * the file COPYING for details. + * 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 . */ + /* * Originally by Chernov-Phoenix Alexey (Phoenix@RusNet) mailto:phoenix /email address separator/ pravmail.ru */ -/* $ModDesc: Gives opers cmode +y which provides a staff prefix. */ - #include "inspircd.h" #define OPERPREFIX_VALUE 1000000 -std::set* SetupExt(User* user) -{ - std::set* ext; - if (!user->GetExt("m_operprefix",ext)) - { - ext=new std::set; - ext->clear(); - user->Extend("m_operprefix",ext); - } - return ext; -} - - -void DelPrefixChan(User* user, Channel* channel) -{ - std::set* chans = SetupExt(user); - chans->erase(channel->name); -} - - -void AddPrefixChan(User* user, Channel* channel) -{ - std::set* chans = SetupExt(user); - chans->insert(channel->name); -} - - -class OperPrefixMode : public ModeHandler +class OperPrefixMode : public PrefixMode { public: - OperPrefixMode(InspIRCd* Instance, Module* Creator, char pfx) : ModeHandler(Instance, Creator, 'y', 1, 1, true, MODETYPE_CHANNEL, false, pfx, pfx, TR_NICK) { } - - unsigned int GetPrefixRank() - { - return OPERPREFIX_VALUE; - } - - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool servermode) + OperPrefixMode(Module* Creator) + : PrefixMode(Creator, "operprefix", 'y', OPERPREFIX_VALUE) { - if (servermode || (source && ServerInstance->ULine(source->server))) - return MODEACTION_ALLOW; - else - { - if (source && channel) - source->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Only servers are permitted to change channel mode '%c'", source->nick.c_str(), channel->name.c_str(), 'y'); - return MODEACTION_DENY; - } + prefix = ServerInstance->Config->ConfValue("operprefix")->getString("prefix", "!", 1, 1)[0]; + ranktoset = ranktounset = UINT_MAX; } +}; - ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) - { - User* x = ServerInstance->FindNick(parameter); - if (x) - { - if (!channel->HasUser(x)) - { - return std::make_pair(false, parameter); - } - else - { - std::set* ext; - if (x->GetExt("m_operprefix",ext)) - { - if (ext->find(channel->name)!=ext->end()) - { - return std::make_pair(true, x->nick); - } - else - return std::make_pair(false, parameter); - } - else - { - return std::make_pair(false, parameter); - } - } - } - return std::make_pair(false, parameter); - } +class ModuleOperPrefixMode; +class HideOperWatcher : public ModeWatcher +{ + ModuleOperPrefixMode* parentmod; - bool NeedsOper() { return true; } + public: + HideOperWatcher(ModuleOperPrefixMode* parent); + void AfterMode(User* source, User* dest, Channel* channel, const std::string ¶meter, bool adding) CXX11_OVERRIDE; }; class ModuleOperPrefixMode : public Module { - private: - OperPrefixMode* opm; - public: - ModuleOperPrefixMode(InspIRCd* Me) : Module(Me) - { - ConfigReader Conf(ServerInstance); - std::string pfx = Conf.ReadValue("operprefix", "prefix", "!", 0, false); - - opm = new OperPrefixMode(ServerInstance, this, pfx[0]); - if ((!ServerInstance->Modes->AddMode(opm))) - throw ModuleException("Could not add a new mode!"); - - Implementation eventlist[] = { I_OnPostJoin, I_OnCleanup, I_OnUserQuit, I_OnUserKick, I_OnUserPart, I_OnOper }; - ServerInstance->Modules->Attach(eventlist, this, 6); - } + OperPrefixMode opm; + HideOperWatcher hideoperwatcher; + UserModeReference hideopermode; - void PushChanMode(Channel* channel, User* user, bool negate = false) + public: + ModuleOperPrefixMode() + : opm(this), hideoperwatcher(this) + , hideopermode(this, "hideoper") { - if (negate) - DelPrefixChan(user, channel); - else - AddPrefixChan(user, channel); - char modeline[] = "+y"; - if (negate) - modeline[0] = '-'; - std::vector modechange; - modechange.push_back(channel->name); - modechange.push_back(modeline); - modechange.push_back(user->nick); - ServerInstance->SendMode(modechange,this->ServerInstance->FakeClient); + /* To give clients a chance to learn about the new prefix we don't give +y to opers + * right now. That means if the module was loaded after opers have joined channels + * they need to rejoin them in order to get the oper prefix. + */ } - virtual void OnPostJoin(User *user, Channel *channel) + ModResult OnUserPreJoin(LocalUser* user, Channel* chan, const std::string& cname, std::string& privs, const std::string& keygiven) CXX11_OVERRIDE { - if (user && IS_OPER(user)) - { - if (user->IsModeSet('H')) - { - /* we respect your wish to be invisible */ - return; - } - PushChanMode(channel, user); - } + if ((user->IsOper()) && (!user->IsModeSet(hideopermode))) + privs.push_back('y'); + return MOD_RES_PASSTHRU; } - // XXX: is there a better way to do this? - virtual int OnRawMode(User* user, Channel* chan, const char mode, const std::string ¶m, bool adding, int pcnt, bool servermode) + void OnPostJoin(Membership* memb) CXX11_OVERRIDE { - /* force event propagation to its ModeHandler */ - if (!servermode && chan && (mode == 'y')) - return ACR_ALLOW; - return 0; - } + if ((!IS_LOCAL(memb->user)) || (!memb->user->IsOper()) || (memb->user->IsModeSet(hideopermode))) + return; - virtual void OnOper(User *user, const std::string&) - { - if (user && !user->IsModeSet('H')) - { - for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++) - { - PushChanMode(v->first, user); - } - } - } + if (memb->HasMode(&opm)) + return; - virtual ~ModuleOperPrefixMode() - { - ServerInstance->Modes->DelMode(opm); - delete opm; + // The user was force joined and OnUserPreJoin() did not run. Set the operprefix now. + Modes::ChangeList changelist; + changelist.push_add(&opm, memb->user->nick); + ServerInstance->Modes.Process(ServerInstance->FakeClient, memb->chan, NULL, changelist); } - void CleanUser(User* user, bool quitting) + void SetOperPrefix(User* user, bool add) { - - std::set* ext; - if (user->GetExt("m_operprefix",ext)) - { - // Don't want to announce -mode when they're quitting anyway.. - if (!quitting) - { - for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++) - { - ModePair ms = opm->ModeSet(NULL, NULL , v->first, user->nick); - if (ms.first) - { - PushChanMode(v->first, user, true); - } - } - } - ext->clear(); - delete ext; - user->Shrink("m_operprefix"); - } + Modes::ChangeList changelist; + changelist.push(&opm, add, user->nick); + for (User::ChanList::iterator v = user->chans.begin(); v != user->chans.end(); v++) + ServerInstance->Modes->Process(ServerInstance->FakeClient, (*v)->chan, NULL, changelist); } - virtual void OnCleanup(int target_type, void* item) + void OnPostOper(User* user, const std::string& opername, const std::string& opertype) CXX11_OVERRIDE { - if (target_type == TYPE_USER) - { - User* user = (User*)item; - CleanUser(user, false); - } + if (IS_LOCAL(user) && (!user->IsModeSet(hideopermode))) + SetOperPrefix(user, true); } - virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) + Version GetVersion() CXX11_OVERRIDE { - CleanUser(user,true); + return Version("Adds the server operator-only y (operprefix) channel prefix mode.", VF_VENDOR); } - virtual void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) + void Prioritize() CXX11_OVERRIDE { - DelPrefixChan(user, chan); + // m_opermodes may set +H on the oper to hide him, we don't want to set the oper prefix in that case + Module* opermodes = ServerInstance->Modules->Find("m_opermodes.so"); + ServerInstance->Modules->SetPriority(this, I_OnPostOper, PRIORITY_AFTER, opermodes); } +}; - virtual void OnUserPart(User* user, Channel* channel, std::string &partreason, bool &silent) - { - DelPrefixChan(user, channel); - } +HideOperWatcher::HideOperWatcher(ModuleOperPrefixMode* parent) + : ModeWatcher(parent, "hideoper", MODETYPE_USER) + , parentmod(parent) +{ +} - virtual Version GetVersion() - { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); - } -}; +void HideOperWatcher::AfterMode(User* source, User* dest, Channel* channel, const std::string& parameter, bool adding) +{ + // If hideoper is being unset because the user is deopering, don't set +y + if (IS_LOCAL(dest) && dest->IsOper()) + parentmod->SetOperPrefix(dest, !adding); +} MODULE_INIT(ModuleOperPrefixMode)