X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_chanprotect.cpp;h=23924bd0ae21c2aa49095063879fe278d7878de7;hb=2e52ff280dca14d1598b84fab7a8c2e93fa30910;hp=2eabc70a8f08b44ad7353e2b5c238e18e68b4864;hpb=4c48adf20367bba99a5d343ef491220cc9e1f542;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp index 2eabc70a8..23924bd0a 100644 --- a/src/modules/m_chanprotect.cpp +++ b/src/modules/m_chanprotect.cpp @@ -20,6 +20,7 @@ #include "inspircd.h" /* $ModDesc: Provides channel modes +a and +q */ +/* $ModDep: ../../include/u_listmode.h */ #define PROTECT_VALUE 40000 #define FOUNDER_VALUE 50000 @@ -32,6 +33,8 @@ const char* fakevalue = "on"; */ bool unload_kludge = false; +/** Handles basic operation of +qa channel modes + */ class FounderProtectBase { private: @@ -41,8 +44,11 @@ class FounderProtectBase int list; int end; char* dummyptr; + protected: + bool remove_own_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(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) { } @@ -75,19 +81,30 @@ class FounderProtectBase { unload_kludge = true; CUList* cl = channel->GetUsers(); - std::string item = extend+std::string(channel->name); - char moderemove[MAXBUF]; + std::string item = extend + std::string(channel->name); + const char* mode_junk[MAXMODES+1]; userrec* n = new userrec(MyInstance); n->SetFd(FD_MAGIC_NUMBER); + mode_junk[0] = channel->name; + irc::modestacker modestack(false); + std::deque stackresult; 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); + modestack.Push(mc, i->second->nick); + } + } + + while (modestack.GetStackedLine(stackresult)) + { + for (size_t j = 0; j < stackresult.size(); j++) + { + mode_junk[j+1] = stackresult[j].c_str(); } + MyInstance->SendMode(mode_junk, stackresult.size() + 1, n); } + delete n; unload_kludge = false; } @@ -143,13 +160,15 @@ class FounderProtectBase } }; +/** Abstraction of FounderProtectBase for channel mode +q + */ class ChanFounder : public ModeHandler, public FounderProtectBase { char* dummyptr; public: - ChanFounder(InspIRCd* Instance, bool using_prefixes) + ChanFounder(InspIRCd* Instance, bool using_prefixes, bool depriv_self) : ModeHandler(Instance, 'q', 1, 1, true, MODETYPE_CHANNEL, false, using_prefixes ? '~' : 0), - FounderProtectBase(Instance, "cm_founder_", "founder", 386, 387) { } + FounderProtectBase(Instance, "cm_founder_", "founder", 386, 387, depriv_self) { } unsigned int GetPrefixRank() { @@ -180,7 +199,7 @@ class ChanFounder : public ModeHandler, public FounderProtectBase } // 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 ((unload_kludge) || ((source == theuser) && (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); } @@ -199,13 +218,15 @@ class ChanFounder : public ModeHandler, public FounderProtectBase } }; +/** Abstraction of FounderProtectBase for channel mode +a + */ class ChanProtect : public ModeHandler, public FounderProtectBase { char* dummyptr; public: - ChanProtect(InspIRCd* Instance, bool using_prefixes) + ChanProtect(InspIRCd* Instance, bool using_prefixes, bool depriv_self) : ModeHandler(Instance, 'a', 1, 1, true, MODETYPE_CHANNEL, false, using_prefixes ? '&' : 0), - FounderProtectBase(Instance,"cm_protect_","protected user", 388, 389) { } + FounderProtectBase(Instance,"cm_protect_","protected user", 388, 389, depriv_self) { } unsigned int GetPrefixRank() { @@ -236,7 +257,7 @@ class ChanProtect : public ModeHandler, public FounderProtectBase std::string founder = "cm_founder_"+std::string(channel->name); // 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 ((unload_kludge) || ((source == theuser) && (FounderProtectBase::remove_own_privs)) || (ServerInstance->ULine(source->nick)) || (ServerInstance->ULine(source->server)) || (!*source->server) || (source->GetExt(founder,dummyptr)) || (!IS_LOCAL(source))) { return FounderProtectBase::HandleChange(source, theuser, adding, channel, parameter); } @@ -260,21 +281,25 @@ class ModuleChanProtect : public Module bool FirstInGetsFounder; bool QAPrefixes; + bool DeprivSelf; + bool booting; ChanProtect* cp; ChanFounder* cf; char* dummyptr; public: - ModuleChanProtect(InspIRCd* Me) : Module::Module(Me) + ModuleChanProtect(InspIRCd* Me) + : Module::Module(Me), FirstInGetsFounder(false), QAPrefixes(false), DeprivSelf(false), booting(true) { /* Load config stuff */ OnRehash(""); + booting = false; /* Initialise module variables */ - cp = new ChanProtect(ServerInstance,QAPrefixes); - cf = new ChanFounder(ServerInstance,QAPrefixes); + cp = new ChanProtect(ServerInstance,QAPrefixes,DeprivSelf); + cf = new ChanFounder(ServerInstance,QAPrefixes,DeprivSelf); ServerInstance->AddMode(cp, 'a'); ServerInstance->AddMode(cf, 'q'); @@ -307,9 +332,29 @@ class ModuleChanProtect : public Module * stack-allocate it locally. */ ConfigReader Conf(ServerInstance); - + + bool old_qa = QAPrefixes; + FirstInGetsFounder = Conf.ReadFlag("options","noservices",0); QAPrefixes = Conf.ReadFlag("options","qaprefixes",0); + DeprivSelf = Conf.ReadFlag("options","deprotectself",0); + + /* 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_qa != QAPrefixes) && (!booting)) + { + ServerInstance->Modes->DelMode(cp); + ServerInstance->Modes->DelMode(cf); + DELETE(cp); + DELETE(cf); + cp = new ChanProtect(ServerInstance,QAPrefixes,DeprivSelf); + cf = new ChanFounder(ServerInstance,QAPrefixes,DeprivSelf); + 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) @@ -355,6 +400,7 @@ class ModuleChanProtect : public Module // 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; } @@ -428,38 +474,55 @@ 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; } virtual ~ModuleChanProtect() { + ServerInstance->Modes->DelMode(cp); + ServerInstance->Modes->DelMode(cf); DELETE(cp); DELETE(cf); } virtual Version GetVersion() { - return Version(1,0,0,0,VF_STATIC|VF_VENDOR); + return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } virtual void OnSyncChannel(chanrec* chan, Module* proto, void* opaque) { - // 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++) + /* NOTE: If +qa prefix is on, this is propogated by the channel join, + * so we dont need to propogate it manually + */ + if (!QAPrefixes) { - if (i->second->GetExt(founder,dummyptr)) + // 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); + irc::modestacker modestack(true); + std::deque stackresult; + for (CUList::iterator i = cl->begin(); i != cl->end(); i++) { - proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+q "+std::string(i->second->nick)); + if (i->second->GetExt(founder,dummyptr)) + { + modestack.Push('q',i->second->nick); + } + if (i->second->GetExt(protect,dummyptr)) + { + modestack.Push('a',i->second->nick); + } } - if (i->second->GetExt(protect,dummyptr)) + while (modestack.GetStackedLine(stackresult)) { - proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan,"+a "+std::string(i->second->nick)); + irc::stringjoiner mode_join(" ", stackresult, 0, stackresult.size() - 1); + std::string line = mode_join.GetJoined(); + proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan, line); } } }