X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namesx.cpp;h=020fb99bd142bcd79772ebae16cdef86d5668d6b;hb=HEAD;hp=d0970ef9c09c2dcb8e46a4a7ed5893802b4e7efb;hpb=6d57bbe05c31c79eaad02fe81cfb9c1ed6b79c58;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp index d0970ef9c..020fb99bd 100644 --- a/src/modules/m_namesx.cpp +++ b/src/modules/m_namesx.cpp @@ -1,80 +1,155 @@ -/* +------------------------------------+ - * | 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) 2019 linuxdaemon + * Copyright (C) 2013, 2018-2021 Sadie Powell + * Copyright (C) 2012-2016 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006, 2008 Craig Edwards * - * 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" -#include "m_cap.h" -/* $ModDesc: Provides the NAMESX (CAP multi-prefix) capability. */ +#include "inspircd.h" +#include "modules/cap.h" +#include "modules/names.h" +#include "modules/who.h" +#include "modules/whois.h" -class ModuleNamesX : public Module +class ModuleNamesX + : public Module + , public Names::EventListener + , public Who::EventListener + , public Whois::LineEventListener { - public: - GenericCap cap; - ModuleNamesX(InspIRCd* Me) : Module(Me), cap(this, "multi-prefix") - { - Implementation eventlist[] = { I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent }; - ServerInstance->Modules->Attach(eventlist, this, 4); - } + private: + Cap::Capability cap; - - ~ModuleNamesX() + public: + ModuleNamesX() + : Names::EventListener(this) + , Who::EventListener(this) + , Whois::LineEventListener(this) + , cap(this, "multi-prefix") { } - Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version("$Id$",VF_VENDOR); + return Version("Provides the IRCv3 multi-prefix client capability.", VF_VENDOR); } - void On005Numeric(std::string &output) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - output.append(" NAMESX"); + // The legacy PROTOCTL system is a wrapper around the cap. + dynamic_reference_nocheck capmanager(this, "capmanager"); + if (capmanager) + tokens["NAMESX"]; } - ModResult OnPreCommand(std::string &command, std::vector ¶meters, User *user, bool validated, const std::string &original_line) + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE { - irc::string c = command.c_str(); /* We don't actually create a proper command handler class for PROTOCTL, * because other modules might want to have PROTOCTL hooks too. * Therefore, we just hook its as an unvalidated command therefore we * can capture it even if it doesnt exist! :-) */ - if (c == "PROTOCTL") + if (command == "PROTOCTL") { - if ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"NAMESX"))) + if (!parameters.empty() && irc::equals(parameters[0], "NAMESX")) { - cap.ext.set(user, 1); + cap.set(user, true); return MOD_RES_DENY; } } return MOD_RES_PASSTHRU; } - void OnNamesListItem(User* issuer, User* user, Channel* channel, std::string &prefixes, std::string &nick) + ModResult OnNamesListItem(LocalUser* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE { - if (!cap.ext.get(issuer)) - return; + if (cap.get(issuer)) + prefixes = memb->GetAllPrefixChars(); - /* Some module hid this from being displayed, dont bother */ - if (nick.empty()) - return; + return MOD_RES_PASSTHRU; + } + + ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE + { + if ((!memb) || (!cap.get(source))) + return MOD_RES_PASSTHRU; - prefixes = channel->GetAllPrefixChars(user); + // Don't do anything if the user has only one prefix + std::string prefixes = memb->GetAllPrefixChars(); + if (prefixes.length() <= 1) + return MOD_RES_PASSTHRU; + + size_t flag_index; + if (!request.GetFieldIndex('f', flag_index)) + return MOD_RES_PASSTHRU; + + // #chan ident localhost insp22.test nick H@ :0 Attila + if (numeric.GetParams().size() <= flag_index) + return MOD_RES_PASSTHRU; + + numeric.GetParams()[flag_index].append(prefixes, 1, std::string::npos); + return MOD_RES_PASSTHRU; } - void OnEvent(Event *ev) + ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) CXX11_OVERRIDE { - cap.HandleEvent(ev); + if (numeric.GetNumeric() != RPL_WHOISCHANNELS || !cap.get(whois.GetSource())) + return MOD_RES_PASSTHRU; + + // :testnet.inspircd.org 319 test Sadie :#test ~#inspircd + if (numeric.GetParams().size() < 2 || numeric.GetParams().back().empty()) + return MOD_RES_PASSTHRU; + + std::stringstream newchannels; + irc::spacesepstream channelstream(numeric.GetParams().back()); + for (std::string channel; channelstream.GetToken(channel); ) + { + size_t hashpos = channel.find('#'); + if (!hashpos || hashpos == std::string::npos) + { + // The entry is malformed or the user has no privs. + newchannels << channel << ' '; + continue; + } + + Channel* chan = ServerInstance->FindChan(channel.substr(hashpos)); + if (!chan) + { + // Should never happen. + newchannels << channel << ' '; + continue; + } + + Membership* memb = chan->GetUser(whois.GetTarget()); + if (!memb) + { + // Should never happen. + newchannels << channel << ' '; + continue; + } + + newchannels << memb->GetAllPrefixChars() << chan->name << ' '; + } + + numeric.GetParams().back() = newchannels.str(); + return MOD_RES_PASSTHRU; } };