X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_operprefix.cpp;h=9f1f6cc5e8f3f25863a940abde3513d133767d46;hb=4e24fb7c19cff866eda602349fbafce78b7e4c51;hp=da1e4d242a7d20ee5afddd1e14a1b4276e1fe0d9;hpb=67a4a9b62355ea57a2f4521ca5fc53bd4eac3a1f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_operprefix.cpp b/src/modules/m_operprefix.cpp index da1e4d242..9f1f6cc5e 100644 --- a/src/modules/m_operprefix.cpp +++ b/src/modules/m_operprefix.cpp @@ -1,16 +1,23 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * 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 */ @@ -24,10 +31,11 @@ class OperPrefixMode : public ModeHandler { public: - OperPrefixMode(Module* Creator, char pfx) : ModeHandler(Creator, "operprefix", 'y', PARAM_ALWAYS, MODETYPE_CHANNEL) + OperPrefixMode(Module* Creator) : ModeHandler(Creator, "operprefix", 'y', PARAM_ALWAYS, MODETYPE_CHANNEL) { + std::string pfx = ServerInstance->Config->ConfValue("operprefix")->getString("prefix", "!"); list = true; - prefix = pfx; + prefix = pfx.empty() ? '!' : pfx[0]; levelrequired = OPERPREFIX_VALUE; m_paramtype = TR_NICK; } @@ -39,102 +47,140 @@ class OperPrefixMode : public ModeHandler ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { - if (IS_SERVER(source) || (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); - Membership* m = channel->GetUser(x); - if (x) - { - if (!m) - { - return std::make_pair(false, parameter); - } - else - { - if (m->hasMode('y')) - return std::make_pair(true, x->nick); - 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() { - ConfigReader Conf; - std::string pfx = Conf.ReadValue("operprefix", "prefix", "!", 0, false); + ModuleOperPrefixMode() + : opm(this), mw_added(false), hideoperwatcher(this) + { + } + + void init() + { + ServerInstance->Modules->AddService(opm); - opm = new OperPrefixMode(this, pfx[0]); - if ((!ServerInstance->Modes->AddMode(opm))) - throw ModuleException("Could not add a new mode!"); + Implementation eventlist[] = { I_OnUserPreJoin, I_OnPostOper, I_OnLoadModule, I_OnUnloadModule, I_OnPostJoin }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); - Implementation eventlist[] = { I_OnPostJoin, I_OnUserQuit, I_OnUserKick, I_OnUserPart, I_OnOper }; - ServerInstance->Modules->Attach(eventlist, this, 5); + /* 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. + */ + + if (ServerInstance->Modules->Find("m_hideoper.so")) + mw_added = ServerInstance->Modes->AddModeWatcher(&hideoperwatcher); } - void PushChanMode(Channel* channel, User* user) + ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string& privs, const std::string& keygiven) + { + /* 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; + } + + void OnPostJoin(Membership* memb) + { + if ((!IS_LOCAL(memb->user)) || (!IS_OPER(memb->user)) || (((mw_added) && (memb->user->IsModeSet('H'))))) + return; + + if (memb->hasMode(opm.GetModeChar())) + return; + + // 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); + } + + void SetOperPrefix(User* user, bool add) { - char modeline[] = "+y"; std::vector modechange; - modechange.push_back(channel->name); - modechange.push_back(modeline); + modechange.push_back(""); + modechange.push_back(add ? "+y" : "-y"); modechange.push_back(user->nick); - ServerInstance->SendMode(modechange,ServerInstance->FakeClient); + for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++) + { + modechange[0] = (*v)->name; + ServerInstance->SendGlobalMode(modechange, ServerInstance->FakeClient); + } } - void OnPostJoin(Membership* memb) + void OnPostOper(User* user, const std::string& opername, const std::string& opertype) { - if (IS_OPER(memb->user) && !memb->user->IsModeSet('H')) - PushChanMode(memb->chan, memb->user); + if (IS_LOCAL(user) && (!mw_added || !user->IsModeSet('H'))) + SetOperPrefix(user, true); } - // XXX: is there a better way to do this? - ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string ¶m, bool adding, int pcnt) + void OnLoadModule(Module* mod) { - /* force event propagation to its ModeHandler */ - if (!IS_SERVER(user) && chan && (mode == 'y')) - return MOD_RES_ALLOW; - return MOD_RES_PASSTHRU; + if ((!mw_added) && (mod->ModuleSourceFile == "m_hideoper.so")) + mw_added = ServerInstance->Modes->AddModeWatcher(&hideoperwatcher); } - void OnOper(User *user, const std::string&) + void OnUnloadModule(Module* mod) { - if (user && !user->IsModeSet('H')) - { - for (UCListIter v = user->chans.begin(); v != user->chans.end(); v++) - { - PushChanMode(*v, user); - } - } + if ((mw_added) && (mod->ModuleSourceFile == "m_hideoper.so") && (ServerInstance->Modes->DelModeWatcher(&hideoperwatcher))) + mw_added = false; } ~ModuleOperPrefixMode() { - delete opm; + if (mw_added) + ServerInstance->Modes->DelModeWatcher(&hideoperwatcher); } Version GetVersion() { - return Version("Gives opers cmode +y which provides a staff prefix.", VF_COMMON | VF_VENDOR); + 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); } }; +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)