X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanprotect.cpp;h=12b5c1db421ca22cef5293ef98d05941ba48afd3;hb=78aabc62e7510af5075b2056f703f0aa42e328a4;hp=880e7c20d489b89707c35e7df0c7e2e903851fd2;hpb=7f9c6c5118261eac40d9bae22ac2c0ede670512d;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp index 880e7c20d..12b5c1db4 100644 --- a/src/modules/m_chanprotect.cpp +++ b/src/modules/m_chanprotect.cpp @@ -2,65 +2,54 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits + * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ -#include "users.h" -#include "channels.h" -#include "modules.h" #include "inspircd.h" +#include "m_override.h" /* $ModDesc: Provides channel modes +a and +q */ #define PROTECT_VALUE 40000 #define FOUNDER_VALUE 50000 -const char* fakevalue = "on"; - -/* When this is set to true, no restrictions apply to setting or - * removal of +qa. This is used while unloading so that the server - * can freely clear all of its users of the modes. - */ -bool unload_kludge = false; - /** Handles basic operation of +qa channel modes */ class FounderProtectBase { private: - InspIRCd* MyInstance; - std::string extend; - std::string type; - int list; - int end; - char* dummyptr; + const std::string type; + const char mode; + const int list; + const int end; + protected: + bool& remove_own_privs; + bool& remove_other_privs; public: - FounderProtectBase(InspIRCd* Instance, const std::string &ext, const std::string &mtype, int l, int e) : MyInstance(Instance), extend(ext), type(mtype), list(l), end(e) + FounderProtectBase(char Mode, const std::string &mtype, int l, int e, bool &remove_own, bool &remove_others) : + type(mtype), mode(Mode), list(l), end(e), remove_own_privs(remove_own), remove_other_privs(remove_others) { } - ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) + ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) { - userrec* x = MyInstance->FindNick(parameter); + User* x = ServerInstance->FindNick(parameter); if (x) { - if (!channel->HasUser(x)) + Membership* memb = channel->GetUser(x); + if (!memb) { return std::make_pair(false, parameter); } else { - std::string item = extend+std::string(channel->name); - if (x->GetExt(item,dummyptr)) + if (memb->hasMode(mode)) { return std::make_pair(true, x->nick); } @@ -73,75 +62,53 @@ class FounderProtectBase return std::make_pair(false, parameter); } - void RemoveMode(chanrec* channel, char mc) + void RemoveMode(Channel* channel, irc::modestacker* stack) { - unload_kludge = true; - CUList* cl = channel->GetUsers(); - std::string item = extend+std::string(channel->name); - char moderemove[MAXBUF]; - userrec* n = new userrec(MyInstance); - n->SetFd(FD_MAGIC_NUMBER); - for (CUList::iterator i = cl->begin(); i != cl->end(); i++) - { - if (i->second->GetExt(item, dummyptr)) - { - sprintf(moderemove,"-%c",mc); - const char* parameters[] = { channel->name, moderemove, i->second->nick }; - MyInstance->SendMode(parameters, 3, n); - } - } - delete n; - unload_kludge = false; - } + const UserMembList* cl = channel->GetUsers(); + std::vector mode_junk; + mode_junk.push_back(channel->name); + irc::modestacker modestack(false); + std::deque stackresult; - void DisplayList(userrec* user, chanrec* channel) - { - CUList* cl = channel->GetUsers(); - std::string item = extend+std::string(channel->name); - for (CUList::iterator i = cl->begin(); i != cl->end(); i++) + for (UserMembCIter i = cl->begin(); i != cl->end(); i++) { - if (i->second->GetExt(item, dummyptr)) + if (i->second->hasMode(mode)) { - user->WriteServ("%d %s %s %s", list, user->nick, channel->name,i->second->nick); + if (stack) + stack->Push(mode, i->first->nick); + else + modestack.Push(mode, i->first->nick); } } - user->WriteServ("%d %s %s :End of channel %s list", end, user->nick, channel->name, type.c_str()); - } - userrec* FindAndVerify(std::string ¶meter, chanrec* channel) - { - userrec* theuser = MyInstance->FindNick(parameter); - if ((!theuser) || (!channel->HasUser(theuser))) + if (stack) + return; + + while (modestack.GetStackedLine(stackresult)) { - parameter = ""; - return NULL; + 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()); } - return theuser; } - ModeAction HandleChange(userrec* source, userrec* theuser, bool adding, chanrec* channel, std::string ¶meter) + void DisplayList(User* user, Channel* channel) { - std::string item = extend+std::string(channel->name); - - if (adding) + const UserMembList* cl = channel->GetUsers(); + for (UserMembCIter i = cl->begin(); i != cl->end(); ++i) { - if (!theuser->GetExt(item, dummyptr)) + if (i->second->hasMode(mode)) { - theuser->Extend(item, fakevalue); - parameter = theuser->nick; - return MODEACTION_ALLOW; + user->WriteServ("%d %s %s %s", list, user->nick.c_str(), channel->name.c_str(), i->first->nick.c_str()); } } - else - { - if (theuser->GetExt(item, dummyptr)) - { - theuser->Shrink(item); - parameter = theuser->nick; - return MODEACTION_ALLOW; - } - } - return MODEACTION_DENY; + user->WriteServ("%d %s %s :End of channel %s list", end, user->nick.c_str(), channel->name.c_str(), type.c_str()); + } + + bool CanRemoveOthers(User* u1, Channel* c) + { + Membership* m1 = c->GetUser(u1); + return (remove_other_privs && m1 && m1->hasMode(mode)); } }; @@ -149,55 +116,64 @@ class FounderProtectBase */ class ChanFounder : public ModeHandler, public FounderProtectBase { - char* dummyptr; public: - ChanFounder(InspIRCd* Instance, bool using_prefixes) - : ModeHandler(Instance, 'q', 1, 1, true, MODETYPE_CHANNEL, false, using_prefixes ? '~' : 0), - FounderProtectBase(Instance, "cm_founder_", "founder", 386, 387) { } + ChanFounder(Module* Creator, char my_prefix, bool &depriv_self, bool &depriv_others) + : ModeHandler(Creator, 'q', PARAM_ALWAYS, MODETYPE_CHANNEL), + FounderProtectBase('q', "founder", 386, 387, depriv_self, depriv_others) + { + ModeHandler::list = true; + prefix = my_prefix; + levelrequired = FOUNDER_VALUE; + m_paramtype = TR_NICK; + } unsigned int GetPrefixRank() { return FOUNDER_VALUE; } - ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) + ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) { return FounderProtectBase::ModeSet(source, dest, channel, parameter); } - void RemoveMode(chanrec* channel) + void RemoveMode(Channel* channel, irc::modestacker* stack) { - FounderProtectBase::RemoveMode(channel, this->GetModeChar()); + FounderProtectBase::RemoveMode(channel, stack); } - void RemoveMode(userrec* user) + void RemoveMode(User* user, irc::modestacker* stack) { } - - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + + ModResult AccessCheck(User* source, Channel* channel, std::string ¶meter, bool adding) { - userrec* theuser = FounderProtectBase::FindAndVerify(parameter, channel); + User* theuser = ServerInstance->FindNick(parameter); + // remove own privs? + if (source == theuser && !adding && FounderProtectBase::remove_own_privs) + return MOD_RES_ALLOW; - if (!theuser) - { - return MODEACTION_DENY; - } - - // source is a server, or ulined, we'll let them +-q the user. - if ((unload_kludge) || (ServerInstance->ULine(source->nick)) || (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->WriteServ("468 %s %s :Only servers may set channel mode +q",source->nick, channel->name); - parameter = ""; - return MODEACTION_DENY; + source->WriteNumeric(468, "%s %s :Only servers may set channel mode +q", source->nick.c_str(), channel->name.c_str()); + return MOD_RES_DENY; } } - void DisplayList(userrec* user, chanrec* channel) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) + { + User* theuser = ServerInstance->FindNick(parameter); + + if (!theuser) + return MODEACTION_DENY; + return MODEACTION_ALLOW; + } + + void DisplayList(User* user, Channel* channel) { FounderProtectBase::DisplayList(user,channel); } @@ -207,54 +183,69 @@ class ChanFounder : public ModeHandler, public FounderProtectBase */ class ChanProtect : public ModeHandler, public FounderProtectBase { - char* dummyptr; public: - ChanProtect(InspIRCd* Instance, bool using_prefixes) - : ModeHandler(Instance, 'a', 1, 1, true, MODETYPE_CHANNEL, false, using_prefixes ? '&' : 0), - FounderProtectBase(Instance,"cm_protect_","protected user", 388, 389) { } + ChanProtect(Module* Creator, char my_prefix, bool &depriv_self, bool &depriv_others) + : ModeHandler(Creator, 'a', PARAM_ALWAYS, MODETYPE_CHANNEL), + FounderProtectBase('a',"protected user", 388, 389, depriv_self, depriv_others) + { + ModeHandler::list = true; + prefix = my_prefix; + levelrequired = PROTECT_VALUE; + m_paramtype = TR_NICK; + } unsigned int GetPrefixRank() { return PROTECT_VALUE; } - ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string ¶meter) + ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) { return FounderProtectBase::ModeSet(source, dest, channel, parameter); } - void RemoveMode(chanrec* channel) + void RemoveMode(Channel* channel, irc::modestacker* stack) { - FounderProtectBase::RemoveMode(channel, this->GetModeChar()); + FounderProtectBase::RemoveMode(channel, stack); } - void RemoveMode(userrec* user) + void RemoveMode(User* user, irc::modestacker* stack) { } - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + ModResult AccessCheck(User* source, Channel* channel, std::string ¶meter, bool adding) { - userrec* 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 && FounderProtectBase::remove_own_privs) + return MOD_RES_ALLOW; - // source has +q, is a server, or ulined, we'll let them +-a the user. - if ((unload_kludge) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server) || (source->GetExt(founder,dummyptr)) || (!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->WriteServ("482 %s %s :You are not a channel founder",source->nick, channel->name); - return MODEACTION_DENY; + source->WriteNumeric(482, "%s %s :You are not a channel founder", source->nick.c_str(), channel->name.c_str()); + return MOD_RES_DENY; } } - virtual void DisplayList(userrec* user, chanrec* channel) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) + { + User* theuser = ServerInstance->FindNick(parameter); + + if (!theuser) + return MODEACTION_DENY; + + return MODEACTION_ALLOW; + } + + void DisplayList(User* user, Channel* channel) { FounderProtectBase::DisplayList(user, channel); } @@ -263,247 +254,89 @@ class ChanProtect : public ModeHandler, public FounderProtectBase class ModuleChanProtect : public Module { - + bool FirstInGetsFounder; - bool QAPrefixes; + char QPrefix; + char APrefix; + bool DeprivSelf; + bool DeprivOthers; + bool booting; ChanProtect* cp; ChanFounder* cf; - char* dummyptr; - + public: - - ModuleChanProtect(InspIRCd* Me) : Module::Module(Me) - { + + ModuleChanProtect() + : FirstInGetsFounder(false), QPrefix(0), APrefix(0), DeprivSelf(false), DeprivOthers(false), booting(true), cp(NULL), cf(NULL) + { /* Load config stuff */ - OnRehash(""); + LoadSettings(); + booting = false; /* Initialise module variables */ - cp = new ChanProtect(ServerInstance,QAPrefixes); - cf = new ChanFounder(ServerInstance,QAPrefixes); + cp = new ChanProtect(this, APrefix, DeprivSelf, DeprivOthers); + cf = new ChanFounder(this, QPrefix, DeprivSelf, DeprivOthers); - ServerInstance->AddMode(cp, 'a'); - ServerInstance->AddMode(cf, 'q'); - } + if (!ServerInstance->Modes->AddMode(cp) || !ServerInstance->Modes->AddMode(cf)) + { + delete cp; + delete cf; + throw ModuleException("Could not add new modes!"); + } - void Implements(char* List) - { - List[I_OnUserKick] = List[I_OnUserPart] = List[I_OnRehash] = List[I_OnUserJoin] = List[I_OnAccessCheck] = List[I_OnSyncChannel] = 1; + Implementation eventlist[] = { I_OnUserKick, I_OnUserPart, I_OnUserPreJoin }; + ServerInstance->Modules->Attach(eventlist, this, 3); } - virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) + void LoadSettings() { - // 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)); - } + ConfigReader Conf; - virtual void OnUserPart(userrec* user, chanrec* channel, const std::string &partreason) - { - // 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)); - } + FirstInGetsFounder = Conf.ReadFlag("chanprotect", "noservices", 0); - virtual void OnRehash(const std::string ¶meter) - { - /* Create a configreader class and read our flag, - * in old versions this was heap-allocated and the - * object was kept between rehashes...now we just - * stack-allocate it locally. - */ - ConfigReader Conf(ServerInstance); - - FirstInGetsFounder = Conf.ReadFlag("options","noservices",0); - QAPrefixes = Conf.ReadFlag("options","qaprefixes",0); - } - - virtual void OnUserJoin(userrec* user, chanrec* channel) - { - // 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) - { - if (channel->GetUserCounter() == 1) - { - // we're using Extensible::Extend to add data into user objects. - // this way is best as it adds data thats accessible to other modules - // (so long as you document your code properly) without breaking anything - // because its encapsulated neatly in a map. - - // Change requested by katsklaw... when the first in is set to get founder, - // to make it clearer that +q has been given, send that one user the +q notice - // so that their client's syncronization and their sanity are left intact. - user->WriteServ("MODE %s +q %s",channel->name,user->nick); - if (user->Extend("cm_founder_"+std::string(channel->name),fakevalue)) - { - ServerInstance->Log(DEBUG,"Marked user "+std::string(user->nick)+" as founder for "+std::string(channel->name)); - } - } - } - } - - virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* 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. - - ServerInstance->Log(DEBUG,"chanprotect OnAccessCheck %d",access_type); - // don't allow action if: - // (A) Theyre founder (no matter what) - // (B) Theyre protected, and you're not - // 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)) || (ServerInstance->ULine(source->server)) || (!*source->server)) - { - ServerInstance->Log(DEBUG,"chanprotect OnAccessCheck returns ALLOW"); - return ACR_ALLOW; - } + std::string qpre = Conf.ReadValue("chanprotect", "qprefix", 0); + QPrefix = qpre.empty() ? 0 : qpre[0]; - std::string founder = "cm_founder_"+std::string(channel->name); - std::string protect = "cm_protect_"+std::string(channel->name); + std::string apre = Conf.ReadValue("chanprotect", "aprefix", 0); + APrefix = apre.empty() ? 0 : apre[0]; - switch (access_type) - { - // a user has been deopped. Do we let them? hmmm... - case AC_DEOP: - ServerInstance->Log(DEBUG,"OnAccessCheck AC_DEOP"); - if (dest->GetExt(founder,dummyptr)) - { - ServerInstance->Log(DEBUG,"Has %s",founder.c_str()); - source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're a channel founder"); - return ACR_DENY; - } - else - { - ServerInstance->Log(DEBUG,"Doesnt have %s",founder.c_str()); - } - if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr))) - { - source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're protected (+a)"); - return ACR_DENY; - } - break; + if ((APrefix && QPrefix) && APrefix == QPrefix) + throw ModuleException("What the smeg, why are both your +q and +a prefixes the same character?"); - // a user is being kicked. do we chop off the end of the army boot? - case AC_KICK: - ServerInstance->Log(DEBUG,"OnAccessCheck AC_KICK"); - if (dest->GetExt(founder,dummyptr)) - { - source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're a channel founder"); - return ACR_DENY; - } - if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr))) - { - source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're protected (+a)"); - return ACR_DENY; - } - break; + 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."); - // a user is being dehalfopped. Yes, we do disallow -h of a +ha user - case AC_DEHALFOP: - if (dest->GetExt(founder,dummyptr)) - { - source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as they're a channel founder"); - return ACR_DENY; - } - if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr))) - { - source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as they're protected (+a)"); - return ACR_DENY; - } - break; + 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."); - // same with devoice. - case AC_DEVOICE: - if (dest->GetExt(founder,dummyptr)) - { - source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're a channel founder"); - return ACR_DENY; - } - if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr))) - { - source->WriteServ("484 "+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(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. - ServerInstance->Log(DEBUG,"chanprotect OnAccessCheck returns DEFAULT"); - return ACR_DEFAULT; - } - - virtual ~ModuleChanProtect() - { - ServerInstance->Modes->DelMode(cp); - ServerInstance->Modes->DelMode(cf); - DELETE(cp); - DELETE(cf); - } - - virtual Version GetVersion() - { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); - } - - virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque) - { - /* NOTE: If +qa prefix is on, this is propogated by the channel join, - * so we dont need to propogate it manually - */ - if (!QAPrefixes) - { - // this is called when the server is linking into a net and wants to sync channel data. - // we should send our mode changes for the channel here to ensure that other servers - // know whos +q/+a on the channel. - CUList* cl = chan->GetUsers(); - string_list commands; - std::string founder = "cm_founder_"+std::string(chan->name); - std::string protect = "cm_protect_"+std::string(chan->name); - for (CUList::iterator i = cl->begin(); i != cl->end(); i++) - { - if (i->second->GetExt(founder,dummyptr)) - { - proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+q "+std::string(i->second->nick)); - } - if (i->second->GetExt(protect,dummyptr)) - { - proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+a "+std::string(i->second->nick)); - - } - } - } + DeprivSelf = Conf.ReadFlag("chanprotect","deprotectself", "yes", 0); + DeprivOthers = Conf.ReadFlag("chanprotect","deprotectothers", "yes", 0); } -}; + 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 += 'q'; -class ModuleChanProtectFactory : public ModuleFactory -{ - public: - ModuleChanProtectFactory() - { + return MOD_RES_PASSTHRU; } - - ~ModuleChanProtectFactory() + + ~ModuleChanProtect() { + ServerInstance->Modes->DelMode(cp); + ServerInstance->Modes->DelMode(cf); + delete cp; + delete cf; } - - virtual Module * CreateModule(InspIRCd* Me) + + Version GetVersion() { - return new ModuleChanProtect(Me); + return Version("Founder and Protect modes (+qa)", VF_COMMON | VF_VENDOR); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleChanProtectFactory; -} +MODULE_INIT(ModuleChanProtect)