X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanprotect.cpp;h=85c8660a25c8ecced6d663f3c23d16a0bc20ab27;hb=f14271bdb80dd6af67cde4fb97df9716613a7177;hp=a79eda993eb6b50696676f4f670d476c870cbc38;hpb=7d7250484c352c13830e63ae41ee8faae40a9bd5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp index a79eda993..85c8660a2 100644 --- a/src/modules/m_chanprotect.cpp +++ b/src/modules/m_chanprotect.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team + * InspIRCd: (C) 2002-2009 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -12,6 +12,7 @@ */ #include "inspircd.h" +#include "m_override.h" /* $ModDesc: Provides channel modes +a and +q */ @@ -68,8 +69,8 @@ class FounderProtectBase std::string item = extend + std::string(channel->name); std::vector mode_junk; mode_junk.push_back(channel->name); - irc::modestacker modestack(ServerInstance, false); - std::deque stackresult; + irc::modestacker modestack(MyInstance, false); + std::deque stackresult; for (CUList::iterator i = cl->begin(); i != cl->end(); i++) { @@ -123,7 +124,7 @@ class FounderProtectBase bool CanRemoveOthers(User* u1, User* u2, Channel* c) { std::string item = extend+std::string(c->name); - return (u1->GetExt(item) && u2->GetExt(item)); + return (remove_other_privs && u1->GetExt(item) && u2->GetExt(item)); } ModeAction HandleChange(User* source, User* theuser, bool adding, Channel* channel, std::string ¶meter) @@ -193,13 +194,23 @@ class ChanFounder : public ModeHandler, public FounderProtectBase { return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter); } + + char isoverride=0; + Module *Override = ServerInstance->Modules->FindFeature("Override"); + if (Override) + { + OVRrequest ovr(NULL,Override,source,"OTHERMODE"); + const char * tmp = ovr.Send(); + isoverride = tmp[0]; + } // 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))) + (!IS_LOCAL(source)) || + isoverride) { return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter); } @@ -259,14 +270,25 @@ class ChanProtect : public ModeHandler, public FounderProtectBase { return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter); } + + char isoverride=0; + Module *Override = ServerInstance->Modules->FindFeature("Override"); + if (Override) + { + OVRrequest ovr(NULL,Override,source,"OTHERMODE"); + const char * tmp = ovr.Send(); + isoverride = tmp[0]; + } // 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)) || + ((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))) + (!IS_LOCAL(source)) || + isoverride + ) { return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter); } @@ -287,7 +309,7 @@ class ChanProtect : public ModeHandler, public FounderProtectBase class ModuleChanProtect : public Module { - + bool FirstInGetsFounder; char QPrefix; char APrefix; @@ -296,9 +318,9 @@ class ModuleChanProtect : public Module bool booting; ChanProtect* cp; ChanFounder* cf; - + public: - + ModuleChanProtect(InspIRCd* Me) : Module(Me), FirstInGetsFounder(false), QPrefix(0), APrefix(0), DeprivSelf(false), DeprivOthers(false), booting(true), cp(NULL), cf(NULL) { @@ -329,7 +351,7 @@ class ModuleChanProtect : public Module user->Shrink("cm_protect_"+std::string(chan->name)); } - virtual void OnUserPart(User* user, Channel* channel, const std::string &partreason, bool &silent) + 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)); @@ -338,19 +360,14 @@ class ModuleChanProtect : public Module void LoadSettings() { - /* 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); + FirstInGetsFounder = Conf.ReadFlag("chanprotect", "noservices", 0); - std::string qpre = Conf.ReadValue("options", "qprefix", 0); + std::string qpre = Conf.ReadValue("chanprotect", "qprefix", 0); QPrefix = qpre.empty() ? 0 : qpre[0]; - std::string apre = Conf.ReadValue("options", "aprefix", 0); + std::string apre = Conf.ReadValue("chanprotect", "aprefix", 0); APrefix = apre.empty() ? 0 : apre[0]; if ((APrefix && QPrefix) && APrefix == QPrefix) @@ -362,26 +379,26 @@ class ModuleChanProtect : public Module 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."); - DeprivSelf = Conf.ReadFlag("options","deprotectself",0); - DeprivOthers = Conf.ReadFlag("options","deprotectothers",0); + DeprivSelf = Conf.ReadFlag("chanprotect","deprotectself", "yes", 0); + DeprivOthers = Conf.ReadFlag("chanprotect","deprotectothers", "yes", 0); } - + virtual int 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 = QPrefix + "@"; - + 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 @@ -390,7 +407,7 @@ class ModuleChanProtect : public Module 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 @@ -398,11 +415,10 @@ class ModuleChanProtect : public Module // 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, and you're not + // (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)) @@ -411,16 +427,23 @@ class ModuleChanProtect : public Module 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)) + 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)) && (!source->GetExt(protect))) + 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; @@ -429,12 +452,12 @@ class ModuleChanProtect : public Module // a user is being kicked. do we chop off the end of the army boot? case AC_KICK: - if (dest->GetExt(founder)) + 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)) && (!source->GetExt(protect))) + 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; @@ -443,12 +466,12 @@ class ModuleChanProtect : public Module // a user is being dehalfopped. Yes, we do disallow -h of a +ha user case AC_DEHALFOP: - if (dest->GetExt(founder)) + 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)) && (!source->GetExt(protect))) + 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; @@ -457,23 +480,23 @@ class ModuleChanProtect : public Module // same with devoice. case AC_DEVOICE: - if (dest->GetExt(founder)) + 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)) && (!source->GetExt(protect))) + 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); @@ -481,10 +504,10 @@ class ModuleChanProtect : public Module delete cp; delete cf; } - + virtual Version GetVersion() { - return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); } };