X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_auditorium.cpp;h=180b9477503ea1c22dd501364c65d7b5a2136942;hb=3151d60c1ecc9462e4c335282ee6c31672f45111;hp=c60bed9b9e6151f14b4a10732842f2651cbfcc01;hpb=bb6a9af0cf3ce7c66bc131f4ba37d6c0f7008841;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_auditorium.cpp b/src/modules/m_auditorium.cpp index c60bed9b9..180b94775 100644 --- a/src/modules/m_auditorium.cpp +++ b/src/modules/m_auditorium.cpp @@ -1,158 +1,219 @@ -/* +------------------------------------+ - * | 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) 2013-2014, 2016-2018 Attila Molnar + * Copyright (C) 2013, 2017-2019 Sadie Powell + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2007-2008, 2010 Craig Edwards + * Copyright (C) 2007, 2009 Dennis Friis * - * 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 "users.h" -#include "channels.h" -#include "modules.h" -#include "inspircd.h" -/* $ModDesc: Allows for auditorium channels (+u) where nobody can see others joining and parting or the nick list */ +#include "inspircd.h" +#include "modules/exemption.h" +#include "modules/names.h" +#include "modules/who.h" -class AuditoriumMode : public ModeHandler +class AuditoriumMode : public SimpleChannelModeHandler { public: - AuditoriumMode(InspIRCd* Instance) : ModeHandler(Instance, 'u', 0, 0, false, MODETYPE_CHANNEL, false) { } - - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + AuditoriumMode(Module* Creator) : SimpleChannelModeHandler(Creator, "auditorium", 'u') { - if (channel->IsModeSet('u') != adding) - { - if (IS_LOCAL(source) && (channel->GetStatus(source) < STATUS_OP)) - { - source->WriteServ("482 %s %s :Only channel operators may %sset channel mode +u", source->nick, channel->name, adding ? "" : "un"); - return MODEACTION_DENY; - } - else - { - channel->SetMode('u', adding); - return MODEACTION_ALLOW; - } - } - else - { - return MODEACTION_DENY; - } + ranktoset = ranktounset = OP_VALUE; } }; -class ModuleAuditorium : public Module +class ModuleAuditorium; + +namespace +{ + +/** Hook handler for join client protocol events. + * This allows us to block join protocol events completely, including all associated messages (e.g. MODE, away-notify AWAY). + * This is not the same as OnUserJoin() because that runs only when a real join happens but this runs also when a module + * such as delayjoin or hostcycle generates a join. + */ +class JoinHook : public ClientProtocol::EventHook +{ + ModuleAuditorium* const parentmod; + bool active; + + public: + JoinHook(ModuleAuditorium* mod); + void OnEventInit(const ClientProtocol::Event& ev) CXX11_OVERRIDE; + ModResult OnPreEventSend(LocalUser* user, const ClientProtocol::Event& ev, ClientProtocol::MessageList& messagelist) CXX11_OVERRIDE; +}; + +} + +class ModuleAuditorium + : public Module + , public Names::EventListener + , public Who::EventListener { - private: - AuditoriumMode* aum; + CheckExemption::EventProvider exemptionprov; + AuditoriumMode aum; + bool OpsVisible; + bool OpsCanSee; + bool OperCanSee; + JoinHook joinhook; + public: - ModuleAuditorium(InspIRCd* Me) - : Module::Module(Me) + ModuleAuditorium() + : Names::EventListener(this) + , Who::EventListener(this) + , exemptionprov(this) + , aum(this) + , joinhook(this) + { + } + + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - aum = new AuditoriumMode(ServerInstance); - if (!ServerInstance->AddMode(aum, 'u')) - throw ModuleException("Could not add new modes!"); + ConfigTag* tag = ServerInstance->Config->ConfValue("auditorium"); + OpsVisible = tag->getBool("opvisible"); + OpsCanSee = tag->getBool("opcansee"); + OperCanSee = tag->getBool("opercansee", true); } - - virtual ~ModuleAuditorium() + + Version GetVersion() CXX11_OVERRIDE { - ServerInstance->Modes->DelMode(aum); - DELETE(aum); + return Version("Adds channel mode u (auditorium) which hides unprivileged users in a channel from each other.", VF_VENDOR); } - Priority Prioritize() + /* Can they be seen by everyone? */ + bool IsVisible(Membership* memb) { - /* To ensure that we get priority over namesx for names list generation on +u channels */ - return (Priority)ServerInstance->PriorityBefore("m_namesx.so"); + if (!memb->chan->IsModeSet(&aum)) + return true; + + ModResult res = CheckExemption::Call(exemptionprov, memb->user, memb->chan, "auditorium-vis"); + return res.check(OpsVisible && memb->getRank() >= OP_VALUE); } - virtual Version GetVersion() + /* Can they see this specific membership? */ + bool CanSee(User* issuer, Membership* memb) { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + // If user is oper and operoverride is on, don't touch the list + if (OperCanSee && issuer->HasPrivPermission("channels/auspex")) + return true; + + // You can always see yourself + if (issuer == memb->user) + return true; + + // Can you see the list by permission? + ModResult res = CheckExemption::Call(exemptionprov, issuer, memb->chan, "auditorium-see"); + if (res.check(OpsCanSee && memb->chan->GetPrefixValue(issuer) >= OP_VALUE)) + return true; + + return false; } - void Implements(char* List) + ModResult OnNamesListItem(LocalUser* issuer, Membership* memb, std::string& prefixes, std::string& nick) CXX11_OVERRIDE { - List[I_OnUserJoin] = List[I_OnUserPart] = List[I_OnUserKick] = List[I_OnUserQuit] = List[I_OnUserList] = 1; + if (IsVisible(memb)) + return MOD_RES_PASSTHRU; + + if (CanSee(issuer, memb)) + return MOD_RES_PASSTHRU; + + // Don't display this user in the NAMES list + return MOD_RES_DENY; } - virtual int OnUserList(userrec* user, chanrec* Ptr) + /** Build CUList for showing this join/part/kick */ + void BuildExcept(Membership* memb, CUList& excepts) { - if (Ptr->IsModeSet('u')) + if (IsVisible(memb)) + return; + + const Channel::MemberMap& users = memb->chan->GetUsers(); + for (Channel::MemberMap::const_iterator i = users.begin(); i != users.end(); ++i) { - /* HELLOOO, IS ANYBODY THERE? -- nope, just us. */ - user->WriteServ("353 %s = %s :%s", user->nick, Ptr->name, user->nick); - user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, Ptr->name); - return 1; + if (IS_LOCAL(i->first) && !CanSee(i->first, memb)) + excepts.insert(i->first); } - return 0; - } - - virtual void OnUserJoin(userrec* user, chanrec* channel, bool &silent) - { - if (channel->IsModeSet('u')) - silent = true; } - void OnUserPart(userrec* user, chanrec* channel, const std::string &partmessage, bool &silent) + void OnUserPart(Membership* memb, std::string &partmessage, CUList& excepts) CXX11_OVERRIDE { - if (channel->IsModeSet('u')) - silent = true; + BuildExcept(memb, excepts); } - void OnUserKick(userrec* source, userrec* user, chanrec* chan, const std::string &reason, bool &silent) + void OnUserKick(User* source, Membership* memb, const std::string &reason, CUList& excepts) CXX11_OVERRIDE { - if (chan->IsModeSet('u')) - silent = true; + BuildExcept(memb, excepts); } - void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message) + void OnBuildNeighborList(User* source, IncludeChanList& include, std::map& exception) CXX11_OVERRIDE { - command_t* parthandler = ServerInstance->Parser->GetHandler("PART"); - std::vector to_leave; - const char* parameters[2]; - if (parthandler) + for (IncludeChanList::iterator i = include.begin(); i != include.end(); ) { - for (UCListIter f = user->chans.begin(); f != user->chans.end(); f++) + Membership* memb = *i; + if (IsVisible(memb)) { - if (f->first->IsModeSet('u')) - to_leave.push_back(f->first->name); + ++i; + continue; } - /* We cant do this neatly in one loop, as we are modifying the map we are iterating */ - for (std::vector::iterator n = to_leave.begin(); n != to_leave.end(); n++) + + // this channel should not be considered when listing my neighbors + i = include.erase(i); + // however, that might hide me from ops that can see me... + const Channel::MemberMap& users = memb->chan->GetUsers(); + for(Channel::MemberMap::const_iterator j = users.begin(); j != users.end(); ++j) { - parameters[0] = n->c_str(); - /* This triggers our OnUserPart, above, making the PART silent */ - parthandler->Handle(parameters, 1, user); + if (IS_LOCAL(j->first) && CanSee(j->first, memb)) + exception[j->first] = true; } } } -}; -class ModuleAuditoriumFactory : public ModuleFactory -{ - public: - ModuleAuditoriumFactory() - { - } - - ~ModuleAuditoriumFactory() + ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE { + if (!memb) + return MOD_RES_PASSTHRU; + if (IsVisible(memb)) + return MOD_RES_PASSTHRU; + if (CanSee(source, memb)) + return MOD_RES_PASSTHRU; + return MOD_RES_DENY; } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleAuditorium(Me); - } - }; -extern "C" void * init_module( void ) +JoinHook::JoinHook(ModuleAuditorium* mod) + : ClientProtocol::EventHook(mod, "JOIN", 10) + , parentmod(mod) { - return new ModuleAuditoriumFactory; } +void JoinHook::OnEventInit(const ClientProtocol::Event& ev) +{ + const ClientProtocol::Events::Join& join = static_cast(ev); + active = !parentmod->IsVisible(join.GetMember()); +} + +ModResult JoinHook::OnPreEventSend(LocalUser* user, const ClientProtocol::Event& ev, ClientProtocol::MessageList& messagelist) +{ + if (!active) + return MOD_RES_PASSTHRU; + + const ClientProtocol::Events::Join& join = static_cast(ev); + return ((parentmod->CanSee(user, join.GetMember())) ? MOD_RES_PASSTHRU : MOD_RES_DENY); +} + +MODULE_INIT(ModuleAuditorium)