X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operprefix.cpp;h=9f1f6cc5e8f3f25863a940abde3513d133767d46;hb=9c6a2d1b5ba5a2aeb91d00e1115534fbde670841;hp=5991536e5e55fa13cb1937dbc6f18fdac89f1166;hpb=f8254d68b51b4dec7d180ca5935d8c04cdd92a66;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp index 5991536e5..9f1f6cc5e 100644 --- a/src/modules/m_operprefix.cpp +++ b/src/modules/m_operprefix.cpp @@ -1,239 +1,186 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell * - * 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 . */ -/* - by Chernov-Phoenix Alexey (Phoenix@RusNet) mailto:phoenix /email address separator/ pravmail.ru */ - -#include "inspircd.h" - -static char prefixchar; - -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); -} +/* + * Originally by Chernov-Phoenix Alexey (Phoenix@RusNet) mailto:phoenix /email address separator/ pravmail.ru + */ +/* $ModDesc: Gives opers cmode +y which provides a staff prefix. */ -void AddPrefixChan(User* user, Channel* channel) -{ - std::set* chans = SetupExt(user); - chans->insert(channel->name); -} +#include "inspircd.h" +#define OPERPREFIX_VALUE 1000000 class OperPrefixMode : public ModeHandler { public: - OperPrefixMode(InspIRCd* Instance) : ModeHandler(Instance, 'y', 1, 1, true, MODETYPE_CHANNEL, false, prefixchar) { } + OperPrefixMode(Module* Creator) : ModeHandler(Creator, "operprefix", 'y', PARAM_ALWAYS, MODETYPE_CHANNEL) + { + std::string pfx = ServerInstance->Config->ConfValue("operprefix")->getString("prefix", "!"); + list = true; + prefix = pfx.empty() ? '!' : pfx[0]; + levelrequired = OPERPREFIX_VALUE; + m_paramtype = TR_NICK; + } unsigned int GetPrefixRank() { - return 40000; + return OPERPREFIX_VALUE; } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool servermode) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { - if (servermode || (source && ServerInstance->ULine(source->server))) + if (IS_SERVER(source) || ServerInstance->ULine(source->server)) return MODEACTION_ALLOW; else { - if (source && channel) + if (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; } } - 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); - } - bool NeedsOper() { return true; } }; +class ModuleOperPrefixMode; +class HideOperWatcher : public ModeWatcher +{ + ModuleOperPrefixMode* parentmod; + public: + HideOperWatcher(ModuleOperPrefixMode* parent) : ModeWatcher((Module*) parent, 'H', MODETYPE_USER), parentmod(parent) {} + void AfterMode(User* source, User* dest, Channel* channel, const std::string ¶meter, bool adding, ModeType type); +}; + class ModuleOperPrefixMode : public Module { private: - OperPrefixMode* opm; + OperPrefixMode opm; + bool mw_added; + HideOperWatcher hideoperwatcher; public: - ModuleOperPrefixMode(InspIRCd* Me) : Module(Me) + ModuleOperPrefixMode() + : opm(this), mw_added(false), hideoperwatcher(this) { - ConfigReader Conf(ServerInstance); - std::string tmp; - tmp = Conf.ReadValue("operprefix", "prefix", "!", 0, false); - strlcpy(&prefixchar,tmp.c_str(),2); - - opm = new OperPrefixMode(ServerInstance); - 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); } - virtual void PushChanMode(Channel* channel, User* user, bool negate = false) + void init() { - 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); - } + ServerInstance->Modules->AddService(opm); - virtual void OnPostJoin(User *user, Channel *channel) - { - // This may look wrong, but I don't think it is.. PushChanMode will send FMODE which should sort it all out. - if (!IS_LOCAL(user)) - return; + Implementation eventlist[] = { I_OnUserPreJoin, I_OnPostOper, I_OnLoadModule, I_OnUnloadModule, I_OnPostJoin }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); - if (user && IS_OPER(user)) - { - if (user->IsModeSet('H')) - { - /* we respect your wish to be invisible */ - return; - } - PushChanMode(channel, user); - } - } + /* 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. + */ - // 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) - { - /* force event propagation to its ModeHandler */ - if (!servermode && chan && (mode == 'y')) - return ACR_ALLOW; - return 0; + if (ServerInstance->Modules->Find("m_hideoper.so")) + mw_added = ServerInstance->Modes->AddModeWatcher(&hideoperwatcher); } - virtual void OnOper(User *user, const std::string&) + ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string& privs, const std::string& keygiven) { - if (user && IS_LOCAL(user) && !user->IsModeSet('H')) - { - for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++) - { - PushChanMode(v->first, user); - } - } + /* The user may have the +H umode on himself, but +H does not necessarily correspond + * to the +H of m_hideoper. + * However we only add the modewatcher when m_hideoper is loaded, so these + * conditions (mw_added and the user being +H) together mean the user is a hidden oper. + */ + + if (IS_OPER(user) && (!mw_added || !user->IsModeSet('H'))) + privs.push_back('y'); + return MOD_RES_PASSTHRU; } - virtual ~ModuleOperPrefixMode() + void OnPostJoin(Membership* memb) { - ServerInstance->Modes->DelMode(opm); - delete opm; - } + if ((!IS_LOCAL(memb->user)) || (!IS_OPER(memb->user)) || (((mw_added) && (memb->user->IsModeSet('H'))))) + return; - virtual void CleanUser(User* user, bool quitting=false) - { - if (!IS_LOCAL(user)) + if (memb->hasMode(opm.GetModeChar())) return; - 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"); - } + // The user was force joined and OnUserPreJoin() did not run. Set the operprefix now. + std::vector modechange; + modechange.push_back(memb->chan->name); + modechange.push_back("+y"); + modechange.push_back(memb->user->nick); + ServerInstance->SendGlobalMode(modechange, ServerInstance->FakeClient); } - virtual void OnCleanup(int target_type, void* item) + void SetOperPrefix(User* user, bool add) { - if (target_type == TYPE_USER) + std::vector modechange; + modechange.push_back(""); + modechange.push_back(add ? "+y" : "-y"); + modechange.push_back(user->nick); + for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++) { - User* user = (User*)item; - CleanUser(user); + modechange[0] = (*v)->name; + ServerInstance->SendGlobalMode(modechange, ServerInstance->FakeClient); } } - virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message) + void OnPostOper(User* user, const std::string& opername, const std::string& opertype) + { + if (IS_LOCAL(user) && (!mw_added || !user->IsModeSet('H'))) + SetOperPrefix(user, true); + } + + void OnLoadModule(Module* mod) { - CleanUser(user,true); + if ((!mw_added) && (mod->ModuleSourceFile == "m_hideoper.so")) + mw_added = ServerInstance->Modes->AddModeWatcher(&hideoperwatcher); } - virtual void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) + void OnUnloadModule(Module* mod) { - DelPrefixChan(user, chan); + if ((mw_added) && (mod->ModuleSourceFile == "m_hideoper.so") && (ServerInstance->Modes->DelModeWatcher(&hideoperwatcher))) + mw_added = false; } - virtual void OnUserPart(User* user, Channel* channel, std::string &partreason, bool &silent) + ~ModuleOperPrefixMode() { - DelPrefixChan(user, channel); + if (mw_added) + ServerInstance->Modes->DelModeWatcher(&hideoperwatcher); } - virtual Version GetVersion() + Version GetVersion() { - return Version("$Id$", VF_COMMON, API_VERSION); + return Version("Gives opers cmode +y which provides a staff prefix.", VF_VENDOR); + } + + void Prioritize() + { + // 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); } }; -MODULE_INIT(ModuleOperPrefixMode) +void HideOperWatcher::AfterMode(User* source, User* dest, Channel* channel, const std::string& parameter, bool adding, ModeType type) +{ + // If hideoper is being unset because the user is deopering, don't set +y + if (IS_LOCAL(dest) && IS_OPER(dest)) + parentmod->SetOperPrefix(dest, !adding); +} +MODULE_INIT(ModuleOperPrefixMode)