X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanprotect.cpp;h=a1107b6ce031afe5dc249909d873a93ed5e085a5;hb=39897f56f5f84d8d4c8903fb46a03c2fdcf733ec;hp=a1f1fe960819454b11fa6c485edd8c00bfd30dda;hpb=6a63702d274731e9a8d8f651795d4c4cf4b137b3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp index a1f1fe960..a1107b6ce 100644 --- a/src/modules/m_chanprotect.cpp +++ b/src/modules/m_chanprotect.cpp @@ -18,12 +18,6 @@ #define PROTECT_VALUE 40000 #define FOUNDER_VALUE 50000 -/* 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 @@ -34,7 +28,6 @@ class FounderProtectBase std::string type; int list; int end; - char* dummyptr; protected: bool& remove_own_privs; bool& remove_other_privs; @@ -56,7 +49,7 @@ class FounderProtectBase else { std::string item = extend+std::string(channel->name); - if (x->GetExt(item,dummyptr)) + if (x->GetExt(item)) { return std::make_pair(true, x->nick); } @@ -69,34 +62,37 @@ class FounderProtectBase return std::make_pair(false, parameter); } - void RemoveMode(Channel* channel, char mc) + void RemoveMode(Channel* channel, char mc, irc::modestacker* stack) { - unload_kludge = true; CUList* cl = channel->GetUsers(); std::string item = extend + std::string(channel->name); - const char* mode_junk[MAXMODES+2]; - mode_junk[0] = channel->name; - irc::modestacker modestack(false); - std::deque stackresult; + std::vector mode_junk; + mode_junk.push_back(channel->name); + irc::modestacker modestack(MyInstance, false); + std::deque stackresult; for (CUList::iterator i = cl->begin(); i != cl->end(); i++) { - if (i->first->GetExt(item, dummyptr)) + if (i->first->GetExt(item)) { - modestack.Push(mc, i->first->nick); + if (stack) + stack->Push(mc, i->first->nick); + else + modestack.Push(mc, i->first->nick); } } + if (stack) + return; + while (modestack.GetStackedLine(stackresult)) { for (size_t j = 0; j < stackresult.size(); j++) { - mode_junk[j+1] = stackresult[j].c_str(); + mode_junk.push_back(stackresult[j]); } - MyInstance->SendMode(mode_junk, stackresult.size() + 1, MyInstance->FakeClient); + MyInstance->SendMode(mode_junk, MyInstance->FakeClient); } - - unload_kludge = false; } void DisplayList(User* user, Channel* channel) @@ -105,12 +101,12 @@ class FounderProtectBase std::string item = extend+std::string(channel->name); for (CUList::reverse_iterator i = cl->rbegin(); i != cl->rend(); ++i) { - if (i->first->GetExt(item, dummyptr)) + if (i->first->GetExt(item)) { - user->WriteServ("%d %s %s %s", list, user->nick, channel->name,i->first->nick); + user->WriteServ("%d %s %s %s", list, user->nick.c_str(), channel->name.c_str(), i->first->nick.c_str()); } } - user->WriteServ("%d %s %s :End of channel %s list", end, user->nick, channel->name, type.c_str()); + 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) @@ -127,7 +123,7 @@ class FounderProtectBase bool CanRemoveOthers(User* u1, User* u2, Channel* c) { std::string item = extend+std::string(c->name); - return (u1->GetExt(item, dummyptr) && u2->GetExt(item, dummyptr)); + return (remove_other_privs && u1->GetExt(item) && u2->GetExt(item)); } ModeAction HandleChange(User* source, User* theuser, bool adding, Channel* channel, std::string ¶meter) @@ -136,16 +132,16 @@ class FounderProtectBase if (adding) { - if (!theuser->GetExt(item, dummyptr)) + if (!theuser->GetExt(item)) { - theuser->Extend(item, "on"); + theuser->Extend(item); parameter = theuser->nick; return MODEACTION_ALLOW; } } else { - if (theuser->GetExt(item, dummyptr)) + if (theuser->GetExt(item)) { theuser->Shrink(item); parameter = theuser->nick; @@ -160,7 +156,6 @@ class FounderProtectBase */ class ChanFounder : public ModeHandler, public FounderProtectBase { - char* dummyptr; 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), @@ -176,12 +171,12 @@ class ChanFounder : public ModeHandler, public FounderProtectBase return FounderProtectBase::ModeSet(source, dest, channel, parameter); } - void RemoveMode(Channel* channel) + void RemoveMode(Channel* channel, irc::modestacker* stack) { - FounderProtectBase::RemoveMode(channel, this->GetModeChar()); + FounderProtectBase::RemoveMode(channel, this->GetModeChar(), stack); } - void RemoveMode(User* user) + void RemoveMode(User* user, irc::modestacker* stack) { } @@ -199,14 +194,19 @@ class ChanFounder : public ModeHandler, public FounderProtectBase 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) && (!adding) && (FounderProtectBase::remove_own_privs)) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server) || (!IS_LOCAL(source))) + 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))) { return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter); } else { // whoops, someones being naughty! - source->WriteNumeric(468, "%s %s :Only servers may set channel mode +q",source->nick, channel->name); + 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; } @@ -222,7 +222,6 @@ class ChanFounder : public ModeHandler, public FounderProtectBase */ class ChanProtect : public ModeHandler, public FounderProtectBase { - char* dummyptr; 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), @@ -238,12 +237,12 @@ class ChanProtect : public ModeHandler, public FounderProtectBase return FounderProtectBase::ModeSet(source, dest, channel, parameter); } - void RemoveMode(Channel* channel) + void RemoveMode(Channel* channel, irc::modestacker* stack) { - FounderProtectBase::RemoveMode(channel, this->GetModeChar()); + FounderProtectBase::RemoveMode(channel, this->GetModeChar(), stack); } - void RemoveMode(User* user) + void RemoveMode(User* user, irc::modestacker* stack) { } @@ -261,14 +260,20 @@ class ChanProtect : public ModeHandler, public FounderProtectBase 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))) + 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))) { return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter); } else { // bzzzt, wrong answer! - source->WriteNumeric(482, "%s %s :You are not a channel founder",source->nick, channel->name); + source->WriteNumeric(482, "%s %s :You are not a channel founder", source->nick.c_str(), channel->name.c_str()); return MODEACTION_DENY; } } @@ -282,7 +287,7 @@ class ChanProtect : public ModeHandler, public FounderProtectBase class ModuleChanProtect : public Module { - + bool FirstInGetsFounder; char QPrefix; char APrefix; @@ -291,15 +296,14 @@ class ModuleChanProtect : public Module bool booting; ChanProtect* cp; ChanFounder* cf; - char* dummyptr; - + public: - + ModuleChanProtect(InspIRCd* Me) - : Module(Me), FirstInGetsFounder(false), QPrefix(0), APrefix(0), DeprivSelf(false), DeprivOthers(false), booting(true) - { + : Module(Me), FirstInGetsFounder(false), QPrefix(0), APrefix(0), DeprivSelf(false), DeprivOthers(false), booting(true), cp(NULL), cf(NULL) + { /* Load config stuff */ - OnRehash(NULL,""); + LoadSettings(); booting = false; /* Initialise module variables */ @@ -314,8 +318,8 @@ class ModuleChanProtect : public Module throw ModuleException("Could not add new modes!"); } - Implementation eventlist[] = { I_OnUserKick, I_OnUserPart, I_OnRehash, I_OnUserPreJoin, I_OnPostJoin, I_OnAccessCheck }; - ServerInstance->Modules->Attach(eventlist, this, 6); + 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) @@ -325,14 +329,14 @@ 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)); user->Shrink("cm_protect_"+std::string(channel->name)); } - virtual void OnRehash(User* user, const std::string ¶meter) + void LoadSettings() { /* Create a configreader class and read our flag, * in old versions this was heap-allocated and the @@ -341,9 +345,6 @@ class ModuleChanProtect : public Module */ ConfigReader Conf(ServerInstance); - char old_q = QPrefix; - char old_a = APrefix; - FirstInGetsFounder = Conf.ReadFlag("options", "noservices", 0); std::string qpre = Conf.ReadValue("options", "qprefix", 0); @@ -352,60 +353,44 @@ class ModuleChanProtect : public Module std::string apre = Conf.ReadValue("options", "aprefix", 0); APrefix = apre.empty() ? 0 : apre[0]; - DeprivSelf = Conf.ReadFlag("options","deprotectself",0); - DeprivOthers = Conf.ReadFlag("options","deprotectothers",0); + if ((APrefix && QPrefix) && APrefix == QPrefix) + throw ModuleException("What the smeg, why are both your +q and +a prefixes the same character?"); - ServerInstance->Logs->Log("chanprotect", DEBUG, "qprefix is %c and aprefix is %c", QPrefix, APrefix); + 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."); - /* Did the user change the QA prefixes on the fly? - * If so, remove all instances of the mode, and reinit - * the module with prefixes enabled. - */ - if ((old_q != QPrefix) && (!booting)) - { - ServerInstance->Modes->DelMode(cf); - delete cf; - cf = new ChanFounder(ServerInstance, QPrefix, DeprivSelf, DeprivOthers); - /* These wont fail, we already owned the mode characters before */ - ServerInstance->Modes->AddMode(cf); - ServerInstance->SNO->WriteToSnoMask('A', "WARNING: +qa prefixes were enabled or disabled via a REHASH. Clients will probably need to reconnect to pick up this change."); - } + 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 ((old_a != APrefix) && (!booting)) - { - ServerInstance->Modes->DelMode(cp); - delete cp; - cp = new ChanProtect(ServerInstance, APrefix, DeprivSelf, DeprivOthers); - ServerInstance->Modes->AddMode(cp); - ServerInstance->SNO->WriteToSnoMask('A', "WARNING: +qa prefixes were enabled or disabled via a REHASH. Clients will probably need to reconnect to pick up this change."); - } + DeprivSelf = Conf.ReadFlag("options","deprotectself",0); + DeprivOthers = Conf.ReadFlag("options","deprotectothers",0); } - - virtual int OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs) + + 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 // 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); + 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 @@ -413,82 +398,88 @@ 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)) || (ServerInstance->ULine(source->server)) || (!*source->server)) + if ((ServerInstance->ULine(source->nick.c_str())) || (ServerInstance->ULine(source->server)) || (!*source->server)) return ACR_ALLOW; - std::string founder = "cm_founder_"+std::string(channel->name); - std::string protect = "cm_protect_"+std::string(channel->name); + 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,dummyptr)) + if (dest->GetExt(founder) && !candepriv_founder) { - source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're a channel 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,dummyptr)) && (!source->GetExt(protect,dummyptr))) + if ((dest->GetExt(protect)) && !candepriv_protected) { - source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're protected (+a)"); + 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,dummyptr)) + if (dest->GetExt(founder) && !candepriv_founder) { - source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're a channel 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,dummyptr)) && (!source->GetExt(protect,dummyptr))) + if ((dest->GetExt(protect)) && !candepriv_protected) { - source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're protected (+a)"); + 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,dummyptr)) + if (dest->GetExt(founder) && !candepriv_founder) { - source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as they're a channel 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,dummyptr)) && (!source->GetExt(protect,dummyptr))) + if ((dest->GetExt(protect)) && !candepriv_protected) { - source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't de-halfop "+std::string(dest->nick)+" as they're protected (+a)"); + 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,dummyptr)) + if (dest->GetExt(founder) && !candepriv_founder) { - source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're a channel 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,dummyptr)) && (!source->GetExt(protect,dummyptr))) + if ((dest->GetExt(protect)) && !candepriv_protected) { - source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're protected (+a)"); + 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); @@ -496,10 +487,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); } };