X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namesx.cpp;h=020fb99bd142bcd79772ebae16cdef86d5668d6b;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=4ba8613d88c2fd517d24572b503139bdb3a2401c;hpb=1858feabd342636df0b52780c978979b4e049fc3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp index 4ba8613d8..020fb99bd 100644 --- a/src/modules/m_namesx.cpp +++ b/src/modules/m_namesx.cpp @@ -1,10 +1,13 @@ /* * InspIRCd -- Internet Relay Chat Daemon * - * Copyright (C) 2009 Daniel De Graaf - * Copyright (C) 2006, 2008 Craig Edwards + * 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) 2007 Robin Burchell + * Copyright (C) 2006, 2008 Craig Edwards * * 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 @@ -21,35 +24,43 @@ #include "inspircd.h" -#include "m_cap.h" - -/* $ModDesc: Provides the NAMESX (CAP multi-prefix) capability. */ - -class ModuleNamesX : public Module +#include "modules/cap.h" +#include "modules/names.h" +#include "modules/who.h" +#include "modules/whois.h" + +class ModuleNamesX + : public Module + , public Names::EventListener + , public Who::EventListener + , public Whois::LineEventListener { - GenericCap cap; - public: - ModuleNamesX() : cap(this, "multi-prefix") - { - } + private: + Cap::Capability cap; - void init() + public: + ModuleNamesX() + : Names::EventListener(this) + , Who::EventListener(this) + , Whois::LineEventListener(this) + , cap(this, "multi-prefix") { - Implementation eventlist[] = { I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent, I_OnSendWhoLine }; - ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } - Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version("Provides the NAMESX (CAP multi-prefix) capability.",VF_VENDOR); + return Version("Provides the IRCv3 multi-prefix client capability.", VF_VENDOR); } - void On005Numeric(std::map& tokens) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - tokens["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, LocalUser *user, bool validated, const std::string &original_line) + ModResult OnPreCommand(std::string& command, CommandBase::Params& parameters, LocalUser* user, bool validated) CXX11_OVERRIDE { /* We don't actually create a proper command handler class for PROTOCTL, * because other modules might want to have PROTOCTL hooks too. @@ -58,68 +69,87 @@ class ModuleNamesX : public Module */ 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, Membership* memb, 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; - - /* Some module hid this from being displayed, dont bother */ - if (nick.empty()) - return; + if (cap.get(issuer)) + prefixes = memb->GetAllPrefixChars(); - prefixes = memb->chan->GetAllPrefixChars(memb->user); + return MOD_RES_PASSTHRU; } - void OnSendWhoLine(User* source, const std::vector& params, User* user, std::string& line) + ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE { - if (!cap.ext.get(source)) - return; - - // Channel names can contain ":", and ":" as a 'start-of-token' delimiter is - // only ever valid after whitespace, so... find the actual delimiter first! - // Thanks to FxChiP for pointing this out. - std::string::size_type pos = line.find(" :"); - if (pos == std::string::npos || pos == 0) - return; - pos--; - // Don't do anything if the user has no prefixes - if ((line[pos] == 'H') || (line[pos] == 'G') || (line[pos] == '*')) - return; - - // 352 21DAAAAAB #chan ident localhost insp21.test 21DAAAAAB H@ :0 a - // a b pos - std::string::size_type a = 4 + source->nick.length() + 1; - std::string::size_type b = line.find(' ', a); - if (b == std::string::npos) - return; - - // Try to find this channel - std::string channame = line.substr(a, b-a); - Channel* chan = ServerInstance->FindChan(channame); - if (!chan) - return; + if ((!memb) || (!cap.get(source))) + return MOD_RES_PASSTHRU; // Don't do anything if the user has only one prefix - std::string prefixes = chan->GetAllPrefixChars(user); + std::string prefixes = memb->GetAllPrefixChars(); if (prefixes.length() <= 1) - return; + 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; - line.erase(pos, 1); - line.insert(pos, prefixes); + 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; } };