X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_namesx.cpp;h=020fb99bd142bcd79772ebae16cdef86d5668d6b;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=e5ebf6909223ff64db33cc63fb51cbf631a43df8;hpb=cadc11999ee28545e9beb92de116c151832af5c4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp index e5ebf6909..020fb99bd 100644 --- a/src/modules/m_namesx.cpp +++ b/src/modules/m_namesx.cpp @@ -1,126 +1,156 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/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" - -static const char* dummy = "ON"; -/* $ModDesc: Provides aliases of commands. */ - -class ModuleNamesX : public Module +#include "inspircd.h" +#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 { - public: - - ModuleNamesX(InspIRCd* Me) - : Module(Me) - { - Implementation eventlist[] = { I_OnSyncUserMetaData, I_OnPreCommand, I_OnUserList, I_On005Numeric }; - ServerInstance->Modules->Attach(eventlist, this, 4); - } - - void Implements(char* List) - { - List[I_OnSyncUserMetaData] = List[I_OnPreCommand] = List[I_OnUserList] = List[I_On005Numeric] = 1; - } - - virtual ~ModuleNamesX() - { - } + private: + Cap::Capability cap; - void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable) + public: + ModuleNamesX() + : Names::EventListener(this) + , Who::EventListener(this) + , Whois::LineEventListener(this) + , cap(this, "multi-prefix") { - if ((displayable) && (extname == "NAMESX")) - proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, "Enabled"); } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version(1,1,0,1,VF_VENDOR,API_VERSION); + return Version("Provides the IRCv3 multi-prefix client capability.", VF_VENDOR); } - virtual 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"]; } - virtual int OnPreCommand(const std::string &command, const char** parameters, int pcnt, 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 ((pcnt) && (!strcasecmp(parameters[0],"NAMESX"))) + if (!parameters.empty() && irc::equals(parameters[0], "NAMESX")) { - user->Extend("NAMESX",dummy); - return 1; + cap.set(user, true); + return MOD_RES_DENY; } } - return 0; + return MOD_RES_PASSTHRU; } - virtual int OnUserList(User* user, Channel* Ptr, CUList* &ulist) + ModResult OnNamesListItem(LocalUser* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE { - if (user->GetExt("NAMESX")) - { - char list[MAXBUF]; - size_t dlen, curlen; - dlen = curlen = snprintf(list,MAXBUF,"353 %s %c %s :", user->nick, Ptr->IsModeSet('s') ? '@' : Ptr->IsModeSet('p') ? '*' : '=', Ptr->name); - int numusers = 0; - char* ptr = list + dlen; + if (cap.get(issuer)) + prefixes = memb->GetAllPrefixChars(); - if (!ulist) - ulist = Ptr->GetUsers(); + return MOD_RES_PASSTHRU; + } - bool has_user = Ptr->HasUser(user); - for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++) + 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; + + // 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; + } + + ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) CXX11_OVERRIDE + { + 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) { - if ((!has_user) && (i->first->IsModeSet('i'))) - continue; - - if (i->first->Visibility && !i->first->Visibility->VisibleTo(user)) - continue; - - size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", Ptr->GetAllPrefixChars(i->first), i->second.c_str()); - /* OnUserList can change this - reset it back to normal */ - i->second = i->first->nick; - curlen += ptrlen; - ptr += ptrlen; - numusers++; - if (curlen > (480-NICKMAX)) - { - /* list overflowed into multiple numerics */ - user->WriteServ(std::string(list)); - /* reset our lengths */ - dlen = curlen = snprintf(list,MAXBUF,"353 %s %c %s :", user->nick, Ptr->IsModeSet('s') ? '@' : Ptr->IsModeSet('p') ? '*' : '=', Ptr->name); - ptr = list + dlen; - ptrlen = 0; - numusers = 0; - } + // Should never happen. + newchannels << channel << ' '; + continue; } - /* if whats left in the list isnt empty, send it */ - if (numusers) + + Membership* memb = chan->GetUser(whois.GetTarget()); + if (!memb) { - user->WriteServ(std::string(list)); + // Should never happen. + newchannels << channel << ' '; + continue; } - user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, Ptr->name); - return 1; + + newchannels << memb->GetAllPrefixChars() << chan->name << ' '; } - return 0; - } + + numeric.GetParams().back() = newchannels.str(); + return MOD_RES_PASSTHRU; + } }; MODULE_INIT(ModuleNamesX)