X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanprotect.cpp;h=affd0c8d674324649a674af542da9834a85ccf2f;hb=4e3d7a6e30eadf714483994681b8b2534229f4a8;hp=87f5756a92ca18c7b71b8191c4d52b5c340f987a;hpb=f84cc5b5e5ad856001c53a89eef18e464260e8cc;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp index 87f5756a9..affd0c8d6 100644 --- a/src/modules/m_chanprotect.cpp +++ b/src/modules/m_chanprotect.cpp @@ -1,16 +1,28 @@ -/* +------------------------------------+ - * | 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) 2006-2009 Robin Burchell + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2008 Pippijn van Steenhoven + * Copyright (C) 2004-2008 Craig Edwards + * Copyright (C) 2007 John Brooks + * Copyright (C) 2007 Dennis Friis * - * 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 . */ + #include "inspircd.h" /* $ModDesc: Provides channel modes +a and +q */ @@ -18,67 +30,48 @@ #define PROTECT_VALUE 40000 #define FOUNDER_VALUE 50000 +struct ChanProtectSettings +{ + bool DeprivSelf; + bool DeprivOthers; + bool FirstInGetsFounder; + bool booting; + ChanProtectSettings() : booting(true) {} +}; + +static ChanProtectSettings settings; + /** Handles basic operation of +qa channel modes */ class FounderProtectBase { private: - InspIRCd* MyInstance; - std::string extend; - std::string type; - int list; - int end; - protected: - bool& remove_own_privs; - bool& remove_other_privs; + const std::string type; + const char mode; + const int list; + const int end; public: - FounderProtectBase(InspIRCd* Instance, const std::string &ext, const std::string &mtype, int l, int e, bool &remove_own, bool &remove_others) : - MyInstance(Instance), extend(ext), type(mtype), list(l), end(e), remove_own_privs(remove_own), remove_other_privs(remove_others) - { - } - - ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) + FounderProtectBase(char Mode, const std::string &mtype, int l, int e) : + type(mtype), mode(Mode), list(l), end(e) { - User* x = MyInstance->FindNick(parameter); - if (x) - { - if (!channel->HasUser(x)) - { - return std::make_pair(false, parameter); - } - else - { - std::string item = extend+std::string(channel->name); - if (x->GetExt(item)) - { - return std::make_pair(true, x->nick); - } - else - { - return std::make_pair(false, parameter); - } - } - } - return std::make_pair(false, parameter); } - void RemoveMode(Channel* channel, char mc, irc::modestacker* stack) + void RemoveMode(Channel* channel, irc::modestacker* stack) { - CUList* cl = channel->GetUsers(); - std::string item = extend + std::string(channel->name); + const UserMembList* cl = channel->GetUsers(); std::vector mode_junk; mode_junk.push_back(channel->name); - irc::modestacker modestack(MyInstance, false); + irc::modestacker modestack(false); std::deque stackresult; - for (CUList::iterator i = cl->begin(); i != cl->end(); i++) + for (UserMembCIter i = cl->begin(); i != cl->end(); i++) { - if (i->first->GetExt(item)) + if (i->second->hasMode(mode)) { if (stack) - stack->Push(mc, i->first->nick); + stack->Push(mode, i->first->nick); else - modestack.Push(mc, i->first->nick); + modestack.Push(mode, i->first->nick); } } @@ -87,21 +80,18 @@ class FounderProtectBase while (modestack.GetStackedLine(stackresult)) { - for (size_t j = 0; j < stackresult.size(); j++) - { - mode_junk.push_back(stackresult[j]); - } - MyInstance->SendMode(mode_junk, MyInstance->FakeClient); + mode_junk.insert(mode_junk.end(), stackresult.begin(), stackresult.end()); + ServerInstance->SendMode(mode_junk, ServerInstance->FakeClient); + mode_junk.erase(mode_junk.begin() + 1, mode_junk.end()); } } void DisplayList(User* user, Channel* channel) { - CUList* cl = channel->GetUsers(); - std::string item = extend+std::string(channel->name); - for (CUList::reverse_iterator i = cl->rbegin(); i != cl->rend(); ++i) + const UserMembList* cl = channel->GetUsers(); + for (UserMembCIter i = cl->begin(); i != cl->end(); ++i) { - if (i->first->GetExt(item)) + if (i->second->hasMode(mode)) { user->WriteServ("%d %s %s %s", list, user->nick.c_str(), channel->name.c_str(), i->first->nick.c_str()); } @@ -109,46 +99,10 @@ class FounderProtectBase user->WriteServ("%d %s %s :End of channel %s list", end, user->nick.c_str(), channel->name.c_str(), type.c_str()); } - User* FindAndVerify(std::string ¶meter, Channel* channel) - { - User* theuser = MyInstance->FindNick(parameter); - if ((!theuser) || (!channel->HasUser(theuser))) - { - parameter.clear(); - return NULL; - } - return theuser; - } - - bool CanRemoveOthers(User* u1, User* u2, Channel* c) + bool CanRemoveOthers(User* u1, Channel* c) { - std::string item = extend+std::string(c->name); - return (remove_other_privs && u1->GetExt(item) && u2->GetExt(item)); - } - - ModeAction HandleChange(User* source, User* theuser, bool adding, Channel* channel, std::string ¶meter) - { - std::string item = extend+std::string(channel->name); - - if (adding) - { - if (!theuser->GetExt(item)) - { - theuser->Extend(item); - parameter = theuser->nick; - return MODEACTION_ALLOW; - } - } - else - { - if (theuser->GetExt(item)) - { - theuser->Shrink(item); - parameter = theuser->nick; - return MODEACTION_ALLOW; - } - } - return MODEACTION_DENY; + Membership* m1 = c->GetUser(u1); + return (settings.DeprivOthers && m1 && m1->hasMode(mode)); } }; @@ -157,61 +111,57 @@ class FounderProtectBase class ChanFounder : public ModeHandler, public FounderProtectBase { public: - ChanFounder(InspIRCd* Instance, char my_prefix, bool &depriv_self, bool &depriv_others) - : ModeHandler(Instance, 'q', 1, 1, true, MODETYPE_CHANNEL, false, my_prefix, 0), - FounderProtectBase(Instance, "cm_founder_", "founder", 386, 387, depriv_self, depriv_others) { } + ChanFounder(Module* Creator) + : ModeHandler(Creator, "founder", 'q', PARAM_ALWAYS, MODETYPE_CHANNEL), + FounderProtectBase('q', "founder", 386, 387) + { + ModeHandler::list = true; + levelrequired = FOUNDER_VALUE; + m_paramtype = TR_NICK; + } - unsigned int GetPrefixRank() + void setPrefix(int pfx) { - return FOUNDER_VALUE; + prefix = pfx; } - ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) + unsigned int GetPrefixRank() { - return FounderProtectBase::ModeSet(source, dest, channel, parameter); + return FOUNDER_VALUE; } void RemoveMode(Channel* channel, irc::modestacker* stack) { - FounderProtectBase::RemoveMode(channel, this->GetModeChar(), stack); + FounderProtectBase::RemoveMode(channel, stack); } void RemoveMode(User* user, irc::modestacker* stack) { } - - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) + + ModResult AccessCheck(User* source, Channel* channel, std::string ¶meter, bool adding) { - User* theuser = FounderProtectBase::FindAndVerify(parameter, channel); - - if (!theuser) - { - return MODEACTION_DENY; - } + User* theuser = ServerInstance->FindNick(parameter); + // remove own privs? + if (source == theuser && !adding && settings.DeprivSelf) + return MOD_RES_ALLOW; - if ((!adding) && FounderProtectBase::CanRemoveOthers(source, theuser, channel)) - { - return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter); - } - // source is a server, or ulined, we'll let them +-q the user. - if (source == ServerInstance->FakeClient || - ((source == theuser) && (!adding) && (FounderProtectBase::remove_own_privs)) || - (ServerInstance->ULine(source->nick.c_str())) || - (ServerInstance->ULine(source->server)) || - (!*source->server) || - (!IS_LOCAL(source))) + if (!adding && FounderProtectBase::CanRemoveOthers(source, channel)) { - return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter); + return MOD_RES_PASSTHRU; } else { - // whoops, someones being naughty! source->WriteNumeric(468, "%s %s :Only servers may set channel mode +q", source->nick.c_str(), channel->name.c_str()); - parameter.clear(); - return MODEACTION_DENY; + return MOD_RES_DENY; } } + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) + { + return MODEACTION_ALLOW; + } + void DisplayList(User* user, Channel* channel) { FounderProtectBase::DisplayList(user,channel); @@ -223,62 +173,63 @@ class ChanFounder : public ModeHandler, public FounderProtectBase class ChanProtect : public ModeHandler, public FounderProtectBase { public: - ChanProtect(InspIRCd* Instance, char my_prefix, bool &depriv_self, bool &depriv_others) - : ModeHandler(Instance, 'a', 1, 1, true, MODETYPE_CHANNEL, false, my_prefix, 0), - FounderProtectBase(Instance,"cm_protect_","protected user", 388, 389, depriv_self, depriv_others) { } + ChanProtect(Module* Creator) + : ModeHandler(Creator, "admin", 'a', PARAM_ALWAYS, MODETYPE_CHANNEL), + FounderProtectBase('a',"protected user", 388, 389) + { + ModeHandler::list = true; + levelrequired = PROTECT_VALUE; + m_paramtype = TR_NICK; + } - unsigned int GetPrefixRank() + void setPrefix(int pfx) { - return PROTECT_VALUE; + prefix = pfx; } - ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) + + unsigned int GetPrefixRank() { - return FounderProtectBase::ModeSet(source, dest, channel, parameter); + return PROTECT_VALUE; } void RemoveMode(Channel* channel, irc::modestacker* stack) { - FounderProtectBase::RemoveMode(channel, this->GetModeChar(), stack); + FounderProtectBase::RemoveMode(channel, stack); } void RemoveMode(User* user, irc::modestacker* stack) { } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) + ModResult AccessCheck(User* source, Channel* channel, std::string ¶meter, bool adding) { - User* theuser = FounderProtectBase::FindAndVerify(parameter, channel); - - if (!theuser) - return MODEACTION_DENY; + User* theuser = ServerInstance->FindNick(parameter); + // source has +q + if (channel->GetPrefixValue(source) > PROTECT_VALUE) + return MOD_RES_ALLOW; - std::string founder = "cm_founder_"+std::string(channel->name); + // removing own privs? + if (source == theuser && !adding && settings.DeprivSelf) + return MOD_RES_ALLOW; - if ((!adding) && FounderProtectBase::CanRemoveOthers(source, theuser, channel)) - { - return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter); - } - // source has +q, is a server, or ulined, we'll let them +-a the user. - if (source == ServerInstance->FakeClient || - ((source == theuser) && (!adding) && (FounderProtectBase::remove_own_privs)) || - (ServerInstance->ULine(source->nick.c_str())) || - (ServerInstance->ULine(source->server)) || - (!*source->server) || - (source->GetExt(founder)) || - (!IS_LOCAL(source))) + if (!adding && FounderProtectBase::CanRemoveOthers(source, channel)) { - return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter); + return MOD_RES_PASSTHRU; } else { - // bzzzt, wrong answer! source->WriteNumeric(482, "%s %s :You are not a channel founder", source->nick.c_str(), channel->name.c_str()); - return MODEACTION_DENY; + return MOD_RES_DENY; } } - virtual void DisplayList(User* user, Channel* channel) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) + { + return MODEACTION_ALLOW; + } + + void DisplayList(User* user, Channel* channel) { FounderProtectBase::DisplayList(user, channel); } @@ -287,205 +238,70 @@ class ChanProtect : public ModeHandler, public FounderProtectBase class ModuleChanProtect : public Module { - - bool FirstInGetsFounder; - char QPrefix; - char APrefix; - bool DeprivSelf; - bool DeprivOthers; - bool booting; - ChanProtect* cp; - ChanFounder* cf; - + ChanProtect cp; + ChanFounder cf; public: + ModuleChanProtect() : cp(this), cf(this) + { + } - ModuleChanProtect(InspIRCd* Me) - : Module(Me), FirstInGetsFounder(false), QPrefix(0), APrefix(0), DeprivSelf(false), DeprivOthers(false), booting(true), cp(NULL), cf(NULL) + void init() { /* Load config stuff */ LoadSettings(); - booting = false; + settings.booting = false; - /* Initialise module variables */ + ServerInstance->Modules->AddService(cf); + ServerInstance->Modules->AddService(cp); - cp = new ChanProtect(ServerInstance, APrefix, DeprivSelf, DeprivOthers); - cf = new ChanFounder(ServerInstance, QPrefix, DeprivSelf, DeprivOthers); - - if (!ServerInstance->Modes->AddMode(cp) || !ServerInstance->Modes->AddMode(cf)) - { - delete cp; - delete cf; - throw ModuleException("Could not add new modes!"); - } - - Implementation eventlist[] = { I_OnUserKick, I_OnUserPart, I_OnUserPreJoin, I_OnPostJoin, I_OnAccessCheck }; - ServerInstance->Modules->Attach(eventlist, this, 5); - } - - virtual void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) - { - // FIX: when someone gets kicked from a channel we must remove their Extensibles! - user->Shrink("cm_founder_"+std::string(chan->name)); - user->Shrink("cm_protect_"+std::string(chan->name)); - } - - virtual void OnUserPart(User* user, Channel* channel, std::string &partreason, bool &silent) - { - // FIX: when someone parts a channel we must remove their Extensibles! - user->Shrink("cm_founder_"+std::string(channel->name)); - user->Shrink("cm_protect_"+std::string(channel->name)); + Implementation eventlist[] = { I_OnUserPreJoin }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } void LoadSettings() { - ConfigReader Conf(ServerInstance); + ConfigTag* tag = ServerInstance->Config->ConfValue("chanprotect"); - FirstInGetsFounder = Conf.ReadFlag("chanprotect", "noservices", 0); + settings.FirstInGetsFounder = tag->getBool("noservices"); - std::string qpre = Conf.ReadValue("chanprotect", "qprefix", 0); - QPrefix = qpre.empty() ? 0 : qpre[0]; + std::string qpre = tag->getString("qprefix"); + char QPrefix = qpre.empty() ? 0 : qpre[0]; - std::string apre = Conf.ReadValue("chanprotect", "aprefix", 0); - APrefix = apre.empty() ? 0 : apre[0]; + std::string apre = tag->getString("aprefix"); + char APrefix = apre.empty() ? 0 : apre[0]; if ((APrefix && QPrefix) && APrefix == QPrefix) throw ModuleException("What the smeg, why are both your +q and +a prefixes the same character?"); - if (cp && ServerInstance->Modes->FindPrefix(APrefix) == cp) - throw ModuleException("Looks like the +a prefix you picked for m_chanprotect is already in use. Pick another."); + if (settings.booting) + { + if (APrefix && ServerInstance->Modes->FindPrefix(APrefix) && ServerInstance->Modes->FindPrefix(APrefix) != &cp) + throw ModuleException("Looks like the +a prefix you picked for m_chanprotect is already in use. Pick another."); - if (cf && ServerInstance->Modes->FindPrefix(QPrefix) == cf) - throw ModuleException("Looks like the +q prefix you picked for m_chanprotect is already in use. Pick another."); + if (QPrefix && ServerInstance->Modes->FindPrefix(QPrefix) && ServerInstance->Modes->FindPrefix(QPrefix) != &cf) + throw ModuleException("Looks like the +q prefix you picked for m_chanprotect is already in use. Pick another."); - DeprivSelf = Conf.ReadFlag("chanprotect","deprotectself", "yes", 0); - DeprivOthers = Conf.ReadFlag("chanprotect","deprotectothers", "yes", 0); + cp.setPrefix(APrefix); + cf.setPrefix(QPrefix); + } + settings.DeprivSelf = tag->getBool("deprotectself", true); + settings.DeprivOthers = tag->getBool("deprotectothers", true); } - virtual int OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven) + ModResult OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs, const std::string &keygiven) { // if the user is the first user into the channel, mark them as the founder, but only if // the config option for it is set - if (FirstInGetsFounder && !chan) - privs = std::string(1, QPrefix) + "@"; - - return 0; - } - - virtual void OnPostJoin(User *user, Channel *channel) - { - // This *must* be in PostJoin, not UserJoin - the former will make it appear to happen - // before the client is in the channel - - // This notice was here originally because it was all done prior to the creation of - // privs in OnUserPreJoin. I've left it because it might still be wanted, but i'm - // not sure it really should be here - ops don't get shown, obviously, and the prefix - // will appear in the names list for the user.. remove if desired -Special + if (settings.FirstInGetsFounder && !chan) + privs += 'q'; - if (FirstInGetsFounder && channel->GetUserCounter() == 1) - user->WriteServ("MODE %s +q %s", channel->name.c_str(), user->nick.c_str()); - } - - virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type) - { - // here we perform access checks, this is the important bit that actually stops kicking/deopping - // etc of protected users. There are many types of access check, we're going to handle - // a relatively small number of them relevent to our module using a switch statement. - // don't allow action if: - // (A) Theyre founder (no matter what) - // (B) Theyre protected, unless you're founder or are protected and DeprivOthers is enabled - // always allow the action if: - // (A) The source is ulined - - // firstly, if a ulined nick, or a server, is setting the mode, then allow them to set the mode - // without any access checks, we're not worthy :p - if ((ServerInstance->ULine(source->nick.c_str())) || (ServerInstance->ULine(source->server)) || (!*source->server)) - return ACR_ALLOW; - - std::string founder("cm_founder_"+channel->name); - std::string protect("cm_protect_"+channel->name); - - // Can do anything to yourself if deprotectself is enabled. - if (DeprivSelf && source == dest) - return ACR_DEFAULT; - - bool candepriv_founder = (DeprivOthers && source->GetExt(founder)); - bool candepriv_protected = (source->GetExt(founder) || (DeprivOthers && source->GetExt(protect))); // Can the source remove +a? - - switch (access_type) - { - // a user has been deopped. Do we let them? hmmm... - case AC_DEOP: - if (dest->GetExt(founder) && !candepriv_founder) - { - source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't deop "+dest->nick+" as they're a channel founder"); - return ACR_DENY; - } - if ((dest->GetExt(protect)) && !candepriv_protected) - { - source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't deop "+dest->nick+" as they're protected (+a)"); - return ACR_DENY; - } - break; - - // a user is being kicked. do we chop off the end of the army boot? - case AC_KICK: - if (dest->GetExt(founder) && !candepriv_founder) - { - source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't kick "+dest->nick+" as they're a channel founder"); - return ACR_DENY; - } - if ((dest->GetExt(protect)) && !candepriv_protected) - { - source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't kick "+dest->nick+" as they're protected (+a)"); - return ACR_DENY; - } - break; - - // a user is being dehalfopped. Yes, we do disallow -h of a +ha user - case AC_DEHALFOP: - if (dest->GetExt(founder) && !candepriv_founder) - { - source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't de-halfop "+dest->nick+" as they're a channel founder"); - return ACR_DENY; - } - if ((dest->GetExt(protect)) && !candepriv_protected) - { - source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't de-halfop "+dest->nick+" as they're protected (+a)"); - return ACR_DENY; - } - break; - - // same with devoice. - case AC_DEVOICE: - if (dest->GetExt(founder) && !candepriv_founder) - { - source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't devoice "+dest->nick+" as they're a channel founder"); - return ACR_DENY; - } - if ((dest->GetExt(protect)) && !candepriv_protected) - { - source->WriteNumeric(484, source->nick+" "+channel->name+" :Can't devoice "+dest->nick+" as they're protected (+a)"); - return ACR_DENY; - } - break; - } - - // we dont know what this access check is, or dont care. just carry on, nothing to see here. - return ACR_DEFAULT; - } - - virtual ~ModuleChanProtect() - { - ServerInstance->Modes->DelMode(cp); - ServerInstance->Modes->DelMode(cf); - delete cp; - delete cf; + return MOD_RES_PASSTHRU; } - virtual Version GetVersion() + Version GetVersion() { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); + return Version("Founder and Protect modes (+qa)", VF_VENDOR); } };