X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanprotect.cpp;h=6df309cde100893f93373f4da10760e634f379da;hb=35a644c0660b9ddb16c86e4d84d0d9809f3c0b31;hp=c811d985f8ae671d63a3bf5412e1740ff7193ac6;hpb=1f9ef4081211739c7c04211a9d77549d25c09f7a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp index c811d985f..6df309cde 100644 --- a/src/modules/m_chanprotect.cpp +++ b/src/modules/m_chanprotect.cpp @@ -18,14 +18,6 @@ #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 @@ -36,7 +28,6 @@ class FounderProtectBase std::string type; int list; int end; - char* dummyptr; protected: bool& remove_own_privs; bool& remove_other_privs; @@ -58,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); } @@ -71,9 +62,8 @@ 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]; @@ -83,12 +73,18 @@ class FounderProtectBase 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++) @@ -97,8 +93,6 @@ class FounderProtectBase } MyInstance->SendMode(mode_junk, stackresult.size() + 1, MyInstance->FakeClient); } - - unload_kludge = false; } void DisplayList(User* user, Channel* channel) @@ -107,7 +101,7 @@ 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); } @@ -129,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 (u1->GetExt(item) && u2->GetExt(item)); } ModeAction HandleChange(User* source, User* theuser, bool adding, Channel* channel, std::string ¶meter) @@ -138,16 +132,16 @@ class FounderProtectBase if (adding) { - if (!theuser->GetExt(item, dummyptr)) + if (!theuser->GetExt(item)) { - theuser->Extend(item, fakevalue); + 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; @@ -162,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), @@ -178,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) { } @@ -201,7 +194,12 @@ 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)) || + (ServerInstance->ULine(source->server)) || + (!*source->server) || + (!IS_LOCAL(source))) { return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter); } @@ -224,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), @@ -240,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) { } @@ -263,7 +260,13 @@ 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)) || + (ServerInstance->ULine(source->server)) || + (!*source->server) || + (source->GetExt(founder)) || + (!IS_LOCAL(source))) { return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter); } @@ -293,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 */ @@ -316,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) @@ -334,7 +336,7 @@ class ModuleChanProtect : public Module 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 @@ -343,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); @@ -354,36 +353,20 @@ 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 CoreException("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 CoreException("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 CoreException("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 @@ -432,12 +415,12 @@ class ModuleChanProtect : public Module { // a user has been deopped. Do we let them? hmmm... case AC_DEOP: - if (dest->GetExt(founder,dummyptr)) + if (dest->GetExt(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"); return ACR_DENY; } - if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr))) + if ((dest->GetExt(protect)) && (!source->GetExt(protect))) { source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't deop "+std::string(dest->nick)+" as they're protected (+a)"); return ACR_DENY; @@ -446,12 +429,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,dummyptr)) + if (dest->GetExt(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"); return ACR_DENY; } - if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr))) + if ((dest->GetExt(protect)) && (!source->GetExt(protect))) { source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't kick "+std::string(dest->nick)+" as they're protected (+a)"); return ACR_DENY; @@ -460,12 +443,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,dummyptr)) + if (dest->GetExt(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"); return ACR_DENY; } - if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr))) + if ((dest->GetExt(protect)) && (!source->GetExt(protect))) { source->WriteNumeric(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; @@ -474,12 +457,12 @@ class ModuleChanProtect : public Module // same with devoice. case AC_DEVOICE: - if (dest->GetExt(founder,dummyptr)) + if (dest->GetExt(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"); return ACR_DENY; } - if ((dest->GetExt(protect,dummyptr)) && (!source->GetExt(protect,dummyptr))) + if ((dest->GetExt(protect)) && (!source->GetExt(protect))) { source->WriteNumeric(484, ""+std::string(source->nick)+" "+std::string(channel->name)+" :Can't devoice "+std::string(dest->nick)+" as they're protected (+a)"); return ACR_DENY;