X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanprotect.cpp;h=6d99ed10bcba7c755ad46fab9b6ac6a57bfd6386;hb=b7e299c2e10d915d5e59df4cb3f54951c8daa999;hp=04c35bb5a40776aee161fb063b795f5c8e0858fa;hpb=93a5caf71ee92f2edc2ec8ca385785d61f082858;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp index 04c35bb5a..6d99ed10b 100644 --- a/src/modules/m_chanprotect.cpp +++ b/src/modules/m_chanprotect.cpp @@ -2,22 +2,19 @@ * | 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-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits + * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ +#include "inspircd.h" #include "users.h" #include "channels.h" #include "modules.h" -#include "inspircd.h" /* $ModDesc: Provides channel modes +a and +q */ /* $ModDep: ../../include/u_listmode.h */ @@ -45,10 +42,11 @@ class FounderProtectBase int end; char* dummyptr; protected: - bool remove_own_privs; + bool& remove_own_privs; + bool& remove_other_privs; public: - FounderProtectBase(InspIRCd* Instance, const std::string &ext, const std::string &mtype, int l, int e, bool remove_own) : - MyInstance(Instance), extend(ext), type(mtype), list(l), end(e), remove_own_privs(remove_own) + 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) { } @@ -82,7 +80,7 @@ class FounderProtectBase unload_kludge = true; CUList* cl = channel->GetUsers(); std::string item = extend + std::string(channel->name); - const char* mode_junk[MAXMODES+1]; + const char* mode_junk[MAXMODES+2]; userrec* n = new userrec(MyInstance); n->SetFd(FD_MAGIC_NUMBER); mode_junk[0] = channel->name; @@ -90,9 +88,9 @@ class FounderProtectBase std::deque stackresult; for (CUList::iterator i = cl->begin(); i != cl->end(); i++) { - if (i->second->GetExt(item, dummyptr)) + if (i->first->GetExt(item, dummyptr)) { - modestack.Push(mc, i->second->nick); + modestack.Push(mc, i->first->nick); } } @@ -109,15 +107,15 @@ class FounderProtectBase unload_kludge = false; } - void DisplayList(userrec* user, chanrec* channel) + 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 (CUList::reverse_iterator i = cl->rbegin(); i != cl->rend(); ++i) { - if (i->second->GetExt(item, dummyptr)) + if (i->first->GetExt(item, dummyptr)) { - user->WriteServ("%d %s %s %s", list, user->nick, channel->name,i->second->nick); + user->WriteServ("%d %s %s %s", list, user->nick, channel->name,i->first->nick); } } user->WriteServ("%d %s %s :End of channel %s list", end, user->nick, channel->name, type.c_str()); @@ -128,12 +126,18 @@ class FounderProtectBase userrec* theuser = MyInstance->FindNick(parameter); if ((!theuser) || (!channel->HasUser(theuser))) { - parameter = ""; + parameter.clear(); return NULL; } return theuser; } + bool CanRemoveOthers(userrec* u1, userrec* u2, chanrec* c) + { + std::string item = extend+std::string(c->name); + return (u1->GetExt(item, dummyptr) && u2->GetExt(item, dummyptr)); + } + ModeAction HandleChange(userrec* source, userrec* theuser, bool adding, chanrec* channel, std::string ¶meter) { std::string item = extend+std::string(channel->name); @@ -166,9 +170,9 @@ class ChanFounder : public ModeHandler, public FounderProtectBase { char* dummyptr; public: - ChanFounder(InspIRCd* Instance, bool using_prefixes, bool depriv_self) + ChanFounder(InspIRCd* Instance, bool using_prefixes, bool &depriv_self, bool &depriv_others) : ModeHandler(Instance, 'q', 1, 1, true, MODETYPE_CHANNEL, false, using_prefixes ? '~' : 0), - FounderProtectBase(Instance, "cm_founder_", "founder", 386, 387, depriv_self) { } + FounderProtectBase(Instance, "cm_founder_", "founder", 386, 387, depriv_self, depriv_others) { } unsigned int GetPrefixRank() { @@ -198,8 +202,12 @@ class ChanFounder : public ModeHandler, public FounderProtectBase return MODEACTION_DENY; } + 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 ((unload_kludge) || ((source == theuser) && (FounderProtectBase::remove_own_privs)) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server) || (!IS_LOCAL(source))) + if ((unload_kludge) || ((source == theuser) && (!adding) && (FounderProtectBase::remove_own_privs)) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server) || (!IS_LOCAL(source))) { return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter); } @@ -207,7 +215,7 @@ class ChanFounder : public ModeHandler, public FounderProtectBase { // whoops, someones being naughty! source->WriteServ("468 %s %s :Only servers may set channel mode +q",source->nick, channel->name); - parameter = ""; + parameter.clear(); return MODEACTION_DENY; } } @@ -224,9 +232,9 @@ class ChanProtect : public ModeHandler, public FounderProtectBase { char* dummyptr; public: - ChanProtect(InspIRCd* Instance, bool using_prefixes, bool depriv_self) + ChanProtect(InspIRCd* Instance, bool using_prefixes, bool &depriv_self, bool &depriv_others) : ModeHandler(Instance, 'a', 1, 1, true, MODETYPE_CHANNEL, false, using_prefixes ? '&' : 0), - FounderProtectBase(Instance,"cm_protect_","protected user", 388, 389, depriv_self) { } + FounderProtectBase(Instance,"cm_protect_","protected user", 388, 389, depriv_self, depriv_others) { } unsigned int GetPrefixRank() { @@ -256,6 +264,10 @@ class ChanProtect : public ModeHandler, public FounderProtectBase std::string founder = "cm_founder_"+std::string(channel->name); + 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 ((unload_kludge) || ((source == theuser) && (!adding) && (FounderProtectBase::remove_own_privs)) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server) || (source->GetExt(founder,dummyptr)) || (!IS_LOCAL(source))) { @@ -282,6 +294,7 @@ class ModuleChanProtect : public Module bool FirstInGetsFounder; bool QAPrefixes; bool DeprivSelf; + bool DeprivOthers; bool booting; ChanProtect* cp; ChanFounder* cf; @@ -290,41 +303,41 @@ class ModuleChanProtect : public Module public: ModuleChanProtect(InspIRCd* Me) - : Module::Module(Me), FirstInGetsFounder(false), QAPrefixes(false), DeprivSelf(false), booting(true) + : Module(Me), FirstInGetsFounder(false), QAPrefixes(false), DeprivSelf(false), DeprivOthers(false), booting(true) { /* Load config stuff */ - OnRehash(""); + OnRehash(NULL,""); booting = false; /* Initialise module variables */ - cp = new ChanProtect(ServerInstance,QAPrefixes,DeprivSelf); - cf = new ChanFounder(ServerInstance,QAPrefixes,DeprivSelf); + cp = new ChanProtect(ServerInstance,QAPrefixes,DeprivSelf,DeprivOthers); + cf = new ChanFounder(ServerInstance,QAPrefixes,DeprivSelf,DeprivOthers); - ServerInstance->AddMode(cp, 'a'); - ServerInstance->AddMode(cf, 'q'); + if (!ServerInstance->AddMode(cp, 'a') || !ServerInstance->AddMode(cf, 'q')) + 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; + List[I_OnUserKick] = List[I_OnUserPart] = List[I_OnRehash] = List[I_OnUserPreJoin] = List[I_OnPostJoin] = List[I_OnAccessCheck] = List[I_OnSyncChannel] = 1; } - virtual void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason) + virtual void OnUserKick(userrec* source, userrec* user, chanrec* 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(userrec* user, chanrec* channel, const std::string &partreason) + virtual void OnUserPart(userrec* user, chanrec* channel, const 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)); } - virtual void OnRehash(const std::string ¶meter) + virtual void OnRehash(userrec* user, const std::string ¶meter) { /* Create a configreader class and read our flag, * in old versions this was heap-allocated and the @@ -338,6 +351,7 @@ class ModuleChanProtect : public Module FirstInGetsFounder = Conf.ReadFlag("options","noservices",0); QAPrefixes = Conf.ReadFlag("options","qaprefixes",0); DeprivSelf = Conf.ReadFlag("options","deprotectself",0); + DeprivOthers = Conf.ReadFlag("options","deprotectothers",0); /* Did the user change the QA prefixes on the fly? * If so, remove all instances of the mode, and reinit @@ -349,37 +363,38 @@ class ModuleChanProtect : public Module ServerInstance->Modes->DelMode(cf); DELETE(cp); DELETE(cf); - cp = new ChanProtect(ServerInstance,QAPrefixes,DeprivSelf); - cf = new ChanFounder(ServerInstance,QAPrefixes,DeprivSelf); + cp = new ChanProtect(ServerInstance,QAPrefixes,DeprivSelf,DeprivOthers); + cf = new ChanFounder(ServerInstance,QAPrefixes,DeprivSelf,DeprivOthers); + /* These wont fail, we already owned the mode characters before */ ServerInstance->AddMode(cp, 'a'); ServerInstance->AddMode(cf, 'q'); ServerInstance->WriteOpers("*** WARNING: +qa prefixes were enabled or disabled via a REHASH. Clients will probably need to reconnect to pick up this change."); } } - virtual void OnUserJoin(userrec* user, chanrec* channel) + virtual int OnUserPreJoin(userrec *user, chanrec *chan, const char *cname, std::string &privs) { // 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)); - } - } - } + + if (FirstInGetsFounder && !chan) + privs = "~@"; + + return 0; + } + + virtual void OnPostJoin(userrec *user, chanrec *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 (FirstInGetsFounder && channel->GetUserCounter() == 1) + user->WriteServ("MODE %s +q %s", channel->name, user->nick); } virtual int OnAccessCheck(userrec* source,userrec* dest,chanrec* channel,int access_type) @@ -387,8 +402,6 @@ class ModuleChanProtect : public Module // 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 @@ -399,10 +412,7 @@ class ModuleChanProtect : public Module // 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 founder = "cm_founder_"+std::string(channel->name); std::string protect = "cm_protect_"+std::string(channel->name); @@ -411,17 +421,11 @@ class ModuleChanProtect : public Module { // 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)"); @@ -431,7 +435,6 @@ class ModuleChanProtect : public Module // 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"); @@ -474,7 +477,6 @@ class ModuleChanProtect : public Module } // 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; } @@ -509,13 +511,13 @@ class ModuleChanProtect : public Module std::deque stackresult; for (CUList::iterator i = cl->begin(); i != cl->end(); i++) { - if (i->second->GetExt(founder,dummyptr)) + if (i->first->GetExt(founder,dummyptr)) { - modestack.Push('q',i->second->nick); + modestack.Push('q',i->first->nick); } - if (i->second->GetExt(protect,dummyptr)) + if (i->first->GetExt(protect,dummyptr)) { - modestack.Push('a',i->second->nick); + modestack.Push('a',i->first->nick); } } while (modestack.GetStackedLine(stackresult)) @@ -529,27 +531,4 @@ class ModuleChanProtect : public Module }; - -class ModuleChanProtectFactory : public ModuleFactory -{ - public: - ModuleChanProtectFactory() - { - } - - ~ModuleChanProtectFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleChanProtect(Me); - } - -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleChanProtectFactory; -} +MODULE_INIT(ModuleChanProtect)