From: w00t Date: Tue, 1 Apr 2008 13:53:27 +0000 (+0000) Subject: Configurable prefixes for chanmodes +qa: prefixes can be turned on or off individuall... X-Git-Tag: v2.0.23~3585 X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=1f9ef4081211739c7c04211a9d77549d25c09f7a;p=user%2Fhenk%2Fcode%2Finspircd.git Configurable prefixes for chanmodes +qa: prefixes can be turned on or off individually and seperately, per server as well as per mode, and prefixes are no longer limited to ~&. *** SERVICES AUTHORS *** This involves a protocol change. FJOIN now sends the userlist with format modes,nick instead of prefixes,nick. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9241 e03df62e-2008-0410-955e-edbf42e46eb7 --- diff --git a/docs/inspircd.conf.example b/docs/inspircd.conf.example index 0e755f9fa..a4f1ad5bd 100644 --- a/docs/inspircd.conf.example +++ b/docs/inspircd.conf.example @@ -742,7 +742,7 @@ #-#-#-#-#-#-#-#-#-#-#-#-#- SERVER OPTIONS -#-#-#-#-#-#-#-#-#-#-#-#-# # # -# Settings to define which features are usable on your server. # +# Settings to define which features are usable on your server. # # # # prefixquit - A prefix to be placed on the start of a client's # # quit message # @@ -775,10 +775,13 @@ # only useful on networks running the m_chanprotect # # module without services. # # # -# qaprefixes - If qaprefixes is true, yes, or 1, then users # -# with +q or +a will get the ~ or & prefixes # -# used in unreal. This is only useful on networks # -# running the m_chanprotect module # +# qprefix - qprefix is used by the chanprotect module to give # +# a visible prefix to users set +q (founder) in chan # +# It should be set to something sensible like ~ or ! # +# If not set, no prefix is applied to users with +q # +# # +# aprefix - aprefix is the same as qprefix, except it is for # +# giving users with mode +a (protected) a prefix # # # # deprotectself - If this value is set to yes, true, or 1, then any # # user with +q or +a may remove the +q or +a from # @@ -984,7 +987,8 @@ netbuffersize="10240" maxwho="128" noservices="no" - qaprefixes="no" + qprefix="" + aprefix="" deprotectself="no" deprotectothers="no" somaxconn="128" diff --git a/include/channels.h b/include/channels.h index 693f429f4..7ef73bb10 100644 --- a/include/channels.h +++ b/include/channels.h @@ -491,6 +491,12 @@ class CoreExport Channel : public Extensible */ const char* GetAllPrefixChars(User* user); + /** Returns all of the prefix MODES a user has on channel. + * @param user The user to look up + * @return A list of all prefix modes. + */ + const char *GetAllPrefixModes(User *user); + /** Get the value of a users prefix on this channel. * @param user The user to look up * @return The module or core-defined value of the users prefix. diff --git a/src/channels.cpp b/src/channels.cpp index 15288ef09..dd41d1344 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -980,6 +980,7 @@ const char* Channel::GetPrefixChar(User *user) return pf; } + const char* Channel::GetAllPrefixChars(User* user) { static char prefix[MAXBUF]; @@ -1000,6 +1001,35 @@ const char* Channel::GetAllPrefixChars(User* user) return prefix; } + +const char* Channel::GetAllPrefixModes(User* user) +{ + static char prefix[MAXBUF]; + int ctr = 0; + *prefix = 0; + + prefixlist::iterator n = prefixes.find(user); + if (n != prefixes.end()) + { + for (std::vector::iterator x = n->second.begin(); x != n->second.end(); x++) + { + ModeHandler *mh = ServerInstance->Modes->FindPrefix(x->first); + + if (!mh) + { + ServerInstance->Logs->Log("MODES", DEFAULT, "WTF: Can't find mode from prefix %c", x->first); + throw CoreException("I can't find a mode from prefix, HALP!"); + } + else + prefix[ctr++] = mh->GetModeChar(); + } + } + + prefix[ctr] = 0; + + return prefix; +} + unsigned int Channel::GetPrefixValue(User* user) { prefixlist::iterator n = prefixes.find(user); diff --git a/src/modules/m_chanprotect.cpp b/src/modules/m_chanprotect.cpp index 853d65159..c811d985f 100644 --- a/src/modules/m_chanprotect.cpp +++ b/src/modules/m_chanprotect.cpp @@ -164,8 +164,8 @@ class ChanFounder : public ModeHandler, public FounderProtectBase { char* dummyptr; public: - ChanFounder(InspIRCd* Instance, bool using_prefixes, bool &depriv_self, bool &depriv_others) - : ModeHandler(Instance, 'q', 1, 1, true, MODETYPE_CHANNEL, false, using_prefixes ? '~' : 0, 0), + ChanFounder(InspIRCd* Instance, char my_prefix, bool &depriv_self, bool &depriv_others) + : ModeHandler(Instance, 'q', 1, 1, true, MODETYPE_CHANNEL, false, my_prefix, 0), FounderProtectBase(Instance, "cm_founder_", "founder", 386, 387, depriv_self, depriv_others) { } unsigned int GetPrefixRank() @@ -226,8 +226,8 @@ class ChanProtect : public ModeHandler, public FounderProtectBase { char* dummyptr; public: - ChanProtect(InspIRCd* Instance, bool using_prefixes, bool &depriv_self, bool &depriv_others) - : ModeHandler(Instance, 'a', 1, 1, true, MODETYPE_CHANNEL, false, using_prefixes ? '&' : 0, 0), + ChanProtect(InspIRCd* Instance, char my_prefix, bool &depriv_self, bool &depriv_others) + : ModeHandler(Instance, 'a', 1, 1, true, MODETYPE_CHANNEL, false, my_prefix, 0), FounderProtectBase(Instance,"cm_protect_","protected user", 388, 389, depriv_self, depriv_others) { } unsigned int GetPrefixRank() @@ -286,7 +286,8 @@ class ModuleChanProtect : public Module { bool FirstInGetsFounder; - bool QAPrefixes; + char QPrefix; + char APrefix; bool DeprivSelf; bool DeprivOthers; bool booting; @@ -297,7 +298,7 @@ class ModuleChanProtect : public Module public: ModuleChanProtect(InspIRCd* Me) - : Module(Me), FirstInGetsFounder(false), QAPrefixes(false), DeprivSelf(false), DeprivOthers(false), booting(true) + : Module(Me), FirstInGetsFounder(false), QPrefix(0), APrefix(0), DeprivSelf(false), DeprivOthers(false), booting(true) { /* Load config stuff */ OnRehash(NULL,""); @@ -305,8 +306,8 @@ class ModuleChanProtect : public Module /* Initialise module variables */ - cp = new ChanProtect(ServerInstance,QAPrefixes,DeprivSelf,DeprivOthers); - cf = new ChanFounder(ServerInstance,QAPrefixes,DeprivSelf,DeprivOthers); + cp = new ChanProtect(ServerInstance, APrefix, DeprivSelf, DeprivOthers); + cf = new ChanFounder(ServerInstance, QPrefix, DeprivSelf, DeprivOthers); if (!ServerInstance->Modes->AddMode(cp) || !ServerInstance->Modes->AddMode(cf)) { @@ -315,8 +316,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, I_OnSyncChannel }; - ServerInstance->Modules->Attach(eventlist, this, 7); + Implementation eventlist[] = { I_OnUserKick, I_OnUserPart, I_OnRehash, I_OnUserPreJoin, I_OnPostJoin, I_OnAccessCheck }; + ServerInstance->Modules->Attach(eventlist, this, 6); } virtual void OnUserKick(User* source, User* user, Channel* chan, const std::string &reason, bool &silent) @@ -342,30 +343,44 @@ class ModuleChanProtect : public Module */ ConfigReader Conf(ServerInstance); - bool old_qa = QAPrefixes; + char old_q = QPrefix; + char old_a = APrefix; + + FirstInGetsFounder = Conf.ReadFlag("options", "noservices", 0); + + std::string qpre = Conf.ReadValue("options", "qprefix", 0); + QPrefix = qpre.empty() ? 0 : qpre[0]; + + std::string apre = Conf.ReadValue("options", "aprefix", 0); + APrefix = apre.empty() ? 0 : apre[0]; - FirstInGetsFounder = Conf.ReadFlag("options","noservices",0); - QAPrefixes = Conf.ReadFlag("options","qaprefixes",0); DeprivSelf = Conf.ReadFlag("options","deprotectself",0); DeprivOthers = Conf.ReadFlag("options","deprotectothers",0); + ServerInstance->Logs->Log("chanprotect", DEBUG, "qprefix is %c and aprefix is %c", QPrefix, APrefix); + /* 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)) + if ((old_q != QPrefix) && (!booting)) { - ServerInstance->Modes->DelMode(cp); ServerInstance->Modes->DelMode(cf); - delete cp; delete cf; - cp = new ChanProtect(ServerInstance,QAPrefixes,DeprivSelf,DeprivOthers); - cf = new ChanFounder(ServerInstance,QAPrefixes,DeprivSelf,DeprivOthers); + cf = new ChanFounder(ServerInstance, QPrefix, DeprivSelf, DeprivOthers); /* These wont fail, we already owned the mode characters before */ - ServerInstance->Modes->AddMode(cp); 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 ((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."); + } } virtual int OnUserPreJoin(User *user, Channel *chan, const char *cname, std::string &privs) @@ -374,7 +389,7 @@ class ModuleChanProtect : public Module // the config option for it is set if (FirstInGetsFounder && !chan) - privs = "~@"; + privs = QPrefix + "@"; return 0; } @@ -488,43 +503,6 @@ class ModuleChanProtect : public Module { return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); } - - virtual void OnSyncChannel(Channel* chan, Module* proto, void* opaque) - { - /* NOTE: If +qa prefix is on, this is propagated by the channel join, - * so we dont need to propagate it manually - */ - if (!QAPrefixes) - { - // 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++) - { - if (i->first->GetExt(founder,dummyptr)) - { - modestack.Push('q',i->first->nick); - } - if (i->first->GetExt(protect,dummyptr)) - { - modestack.Push('a',i->first->nick); - } - } - while (modestack.GetStackedLine(stackresult)) - { - irc::stringjoiner mode_join(" ", stackresult, 0, stackresult.size() - 1); - std::string line = mode_join.GetJoined(); - proto->ProtoSendMode(opaque,TYPE_CHANNEL,chan, line); - } - } - } - }; MODULE_INIT(ModuleChanProtect) diff --git a/src/modules/m_spanningtree/fjoin.cpp b/src/modules/m_spanningtree/fjoin.cpp index a4fe5836a..0f33d65bd 100644 --- a/src/modules/m_spanningtree/fjoin.cpp +++ b/src/modules/m_spanningtree/fjoin.cpp @@ -112,22 +112,26 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque &p const char* usr = item.c_str(); if (usr && *usr) { - const char* permissions = usr; - /* Iterate through all the prefix values, convert them from prefixes to mode letters */ + const char* unparsedmodes = usr; std::string modes; - while ((*permissions) && (*permissions != ',')) + + + /* Iterate through all modes for this user and check they are valid. */ + while ((*unparsedmodes) && (*unparsedmodes != ',')) { - ModeHandler* mh = Instance->Modes->FindPrefix(*permissions); + ModeHandler *mh = Instance->Modes->FindMode(*unparsedmodes, MODETYPE_CHANNEL); if (mh) - modes = modes + mh->GetModeChar(); + modes += *unparsedmodes; else { - this->SendError(std::string("Invalid prefix '")+(*permissions)+"' in FJOIN"); + this->SendError(std::string("Invalid prefix '")+(*unparsedmodes)+"' in FJOIN"); return false; } + usr++; - permissions++; + unparsedmodes++; } + /* Advance past the comma, to the nick */ usr++; @@ -140,7 +144,7 @@ bool TreeSocket::ForceJoin(const std::string &source, std::deque &p if ((!route_back_again) || (route_back_again->GetSocket() != this)) continue; - /* Add any permissions this user had to the mode stack */ + /* Add any modes this user had to the mode stack */ for (std::string::iterator x = modes.begin(); x != modes.end(); ++x) modestack.Push(*x, who->nick); diff --git a/src/modules/m_spanningtree/netburst.cpp b/src/modules/m_spanningtree/netburst.cpp index d1fcc928b..4e6c1dfd1 100644 --- a/src/modules/m_spanningtree/netburst.cpp +++ b/src/modules/m_spanningtree/netburst.cpp @@ -97,7 +97,7 @@ void TreeSocket::SendFJoins(TreeServer* Current, Channel* c) for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) { // The first parameter gets a : before it - size_t ptrlen = snprintf(ptr, MAXBUF, " %s%s,%s", !numusers ? ":" : "", c->GetAllPrefixChars(i->first), i->first->uuid); + size_t ptrlen = snprintf(ptr, MAXBUF, " %s%s,%s", !numusers ? ":" : "", c->GetAllPrefixModes(i->first), i->first->uuid); curlen += ptrlen; ptr += ptrlen;