X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namedmodes.cpp;h=f25cc219ca18a455bbea93f0ba1dbdcd8a6f9947;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=4bf8960e15058321147394a4375a2520f2ccd880;hpb=04e097e20747f07cd69722535fa68a6506882d9f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_namedmodes.cpp b/src/modules/m_namedmodes.cpp index 4bf8960e1..f25cc219c 100644 --- a/src/modules/m_namedmodes.cpp +++ b/src/modules/m_namedmodes.cpp @@ -1,135 +1,201 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2017 B00mX0r + * Copyright (C) 2013-2016 Attila Molnar + * Copyright (C) 2013, 2017-2019 Sadie Powell + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2010 Craig Edwards + * Copyright (C) 2009-2010 Daniel De Graaf * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #include "inspircd.h" -class ModuleNamedModes : public Module +enum { - public: - ModuleNamedModes() + // InspIRCd-specific. + RPL_ENDOFPROPLIST = 960, + RPL_PROPLIST = 961 +}; + +static void DisplayList(LocalUser* user, Channel* channel) +{ + Numeric::ParamBuilder<1> numeric(user, RPL_PROPLIST); + numeric.AddStatic(channel->name); + + const ModeParser::ModeHandlerMap& mhs = ServerInstance->Modes->GetModes(MODETYPE_CHANNEL); + for (ModeParser::ModeHandlerMap::const_iterator i = mhs.begin(); i != mhs.end(); ++i) { - Implementation eventlist[] = { I_OnPreMode, I_On005Numeric }; - ServerInstance->Modules->Attach(eventlist, this, 2); + ModeHandler* mh = i->second; + if (!channel->IsModeSet(mh)) + continue; + numeric.Add("+" + mh->name); + ParamModeBase* pm = mh->IsParameterMode(); + if (pm) + { + if ((pm->IsParameterSecret()) && (!channel->HasUser(user)) && (!user->HasPrivPermission("channels/auspex"))) + numeric.Add("<" + mh->name + ">"); + else + numeric.Add(channel->GetModeParameter(mh)); + } } + numeric.Flush(); + user->WriteNumeric(RPL_ENDOFPROPLIST, channel->name, "End of mode list"); +} - Version GetVersion() +class CommandProp : public SplitCommand +{ + public: + CommandProp(Module* parent) + : SplitCommand(parent, "PROP", 1) { - return Version("Provides the ability to manipulate modes via long names.",VF_VENDOR); + syntax = " [[(+|-)] []]"; } - void On005Numeric(std::string& line) + CmdResult HandleLocal(LocalUser* src, const Params& parameters) CXX11_OVERRIDE { - std::string::size_type pos = line.find(" CHANMODES="); - if (pos != std::string::npos) + Channel* const chan = ServerInstance->FindChan(parameters[0]); + if (!chan) { - pos += 11; - while (line[pos] > 'A' && line[pos] < 'Z') - pos++; - line.insert(pos, 1, 'Z'); + src->WriteNumeric(Numerics::NoSuchChannel(parameters[0])); + return CMD_FAILURE; } - } - void DisplayList(User* user, Channel* channel) - { - for(char letter = 'A'; letter <= 'z'; letter++) + if (parameters.size() == 1) { - ModeHandler* mh = ServerInstance->Modes->FindMode(letter, MODETYPE_CHANNEL); - if (!mh || mh->IsListMode()) - continue; - if (!channel->IsModeSet(letter)) + DisplayList(src, chan); + return CMD_SUCCESS; + } + unsigned int i = 1; + Modes::ChangeList modes; + while (i < parameters.size()) + { + std::string prop = parameters[i++]; + if (prop.empty()) continue; - std::string item = mh->name; - if (mh->GetNumParams(true)) - item += "=" + channel->GetModeParameter(letter); - user->WriteNumeric(961, "%s %s %s", user->nick.c_str(), channel->name.c_str(), item.c_str()); + bool plus = prop[0] != '-'; + if (prop[0] == '+' || prop[0] == '-') + prop.erase(prop.begin()); + + ModeHandler* mh = ServerInstance->Modes->FindMode(prop, MODETYPE_CHANNEL); + if (mh) + { + if (mh->NeedsParam(plus)) + { + if (i != parameters.size()) + modes.push(mh, plus, parameters[i++]); + } + else + modes.push(mh, plus); + } } - user->WriteNumeric(960, "%s %s :End of mode list", user->nick.c_str(), channel->name.c_str()); + ServerInstance->Modes->ProcessSingle(src, chan, NULL, modes, ModeParser::MODE_CHECKACCESS); + return CMD_SUCCESS; + } +}; + +class DummyZ : public ModeHandler +{ + public: + DummyZ(Module* parent) : ModeHandler(parent, "namebase", 'Z', PARAM_ALWAYS, MODETYPE_CHANNEL) + { + list = true; } - ModResult OnPreMode(User* source, User* dest, Channel* channel, const std::vector& parameters) + // Handle /MODE #chan Z + void DisplayList(User* user, Channel* chan) CXX11_OVERRIDE + { + LocalUser* luser = IS_LOCAL(user); + if (luser) + ::DisplayList(luser, chan); + } +}; + +class ModuleNamedModes : public Module +{ + CommandProp cmd; + DummyZ dummyZ; + public: + ModuleNamedModes() : cmd(this), dummyZ(this) + { + } + + Version GetVersion() CXX11_OVERRIDE + { + return Version("Provides support for adding and removing modes via their long names.", VF_VENDOR); + } + + void Prioritize() CXX11_OVERRIDE + { + ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_FIRST); + } + + ModResult OnPreMode(User* source, User* dest, Channel* channel, Modes::ChangeList& modes) CXX11_OVERRIDE { if (!channel) return MOD_RES_PASSTHRU; - if (parameters[1].find('Z') == std::string::npos) - return MOD_RES_PASSTHRU; - if (parameters.size() <= 2) - { - DisplayList(source, channel); - return MOD_RES_DENY; - } - std::vector newparms; - newparms.push_back(parameters[0]); - newparms.push_back(parameters[1]); - - std::string modelist = newparms[1]; - bool adding = true; - unsigned int param_at = 2; - for(unsigned int i = 0; i < modelist.length(); i++) + Modes::ChangeList::List& list = modes.getlist(); + for (Modes::ChangeList::List::iterator i = list.begin(); i != list.end(); ) { - unsigned char modechar = modelist[i]; - if (modechar == '+' || modechar == '-') - { - adding = (modechar == '+'); - continue; - } - ModeHandler *mh = ServerInstance->Modes->FindMode(modechar, MODETYPE_CHANNEL); - if (modechar == 'Z') + Modes::Change& curr = *i; + // Replace all namebase (dummyZ) modes being changed with the actual + // mode handler and parameter. The parameter format of the namebase mode is + // [=]. + if (curr.mh == &dummyZ) { - modechar = 0; - std::string name, value; - if (param_at < parameters.size()) - name = parameters[param_at++]; + std::string name = curr.param; + std::string value; std::string::size_type eq = name.find('='); if (eq != std::string::npos) { - value = name.substr(eq + 1); - name = name.substr(0, eq); + value.assign(name, eq + 1, std::string::npos); + name.erase(eq); } - for(char letter = 'A'; modechar == 0 && letter <= 'z'; letter++) + + ModeHandler* mh = ServerInstance->Modes->FindMode(name, MODETYPE_CHANNEL); + if (!mh) + { + // Mode handler not found + i = list.erase(i); + continue; + } + + curr.param.clear(); + if (mh->NeedsParam(curr.adding)) { - mh = ServerInstance->Modes->FindMode(letter, MODETYPE_CHANNEL); - if (mh && mh->name == name) + if (value.empty()) { - if (mh->GetNumParams(adding)) - { - if (!value.empty()) - { - newparms.push_back(value); - modechar = letter; - break; - } - } - else - { - modechar = letter; - break; - } + // Mode needs a parameter but there wasn't one + i = list.erase(i); + continue; } + + // Change parameter to the text after the '=' + curr.param = value; } - if (modechar) - modelist[i] = modechar; - else - modelist.erase(i, 1); - } - else if (mh && mh->GetNumParams(adding) && param_at < parameters.size()) - { - newparms.push_back(parameters[param_at++]); + + // Put the actual ModeHandler in place of the namebase handler + curr.mh = mh; } + + ++i; } - newparms[1] = modelist; - ServerInstance->Modes->Process(newparms, source, false); - return MOD_RES_DENY; + + return MOD_RES_PASSTHRU; } };