X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_hideoper.cpp;h=3b64c23c4c65f39c95672a7e88e60feb483b5a2a;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=7a2448afc6caa70df3a70a4c62422f7980a3c92b;hpb=b5c1cf4e2cbb3b47134e26e63bbebc3f5d77e150;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp index 7a2448afc..3b64c23c4 100644 --- a/src/modules/m_hideoper.cpp +++ b/src/modules/m_hideoper.cpp @@ -1,95 +1,174 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2019 linuxdaemon + * Copyright (C) 2014 Adam + * Copyright (C) 2013, 2015, 2017-2018 Sadie Powell + * Copyright (C) 2012-2016 Attila Molnar + * Copyright (C) 2012 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2008 Robin Burchell + * Copyright (C) 2008 Geoff Bricker + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006, 2010 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" -/* $ModDesc: Provides support for hiding oper status with user mode +H */ +#include "inspircd.h" +#include "modules/stats.h" +#include "modules/who.h" +#include "modules/whois.h" /** Handles user mode +H */ -class HideOper : public ModeHandler +class HideOper : public SimpleUserModeHandler { public: - HideOper(InspIRCd* Instance) : ModeHandler(Instance, 'H', 0, 0, false, MODETYPE_USER, true) { } + size_t opercount; - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) + HideOper(Module* Creator) : SimpleUserModeHandler(Creator, "hideoper", 'H') + , opercount(0) { + oper = true; + } + + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE + { + if (SimpleUserModeHandler::OnModeChange(source, dest, channel, parameter, adding) == MODEACTION_DENY) + return MODEACTION_DENY; + if (adding) - { - if (!dest->IsModeSet('H')) - { - dest->SetMode('H',true); - return MODEACTION_ALLOW; - } - } + opercount++; else - { - if (dest->IsModeSet('H')) - { - dest->SetMode('H',false); - return MODEACTION_ALLOW; - } - } + opercount--; - return MODEACTION_DENY; + return MODEACTION_ALLOW; } }; -class ModuleHideOper : public Module +class ModuleHideOper + : public Module + , public Stats::EventListener + , public Who::EventListener + , public Whois::LineEventListener { + private: + HideOper hm; + bool active; - HideOper* hm; public: - ModuleHideOper(InspIRCd* Me) - : Module(Me) + ModuleHideOper() + : Stats::EventListener(this) + , Who::EventListener(this) + , Whois::LineEventListener(this) + , hm(this) + , active(false) { - - hm = new HideOper(ServerInstance); - if (!ServerInstance->Modes->AddMode(hm)) - throw ModuleException("Could not add new modes!"); - Implementation eventlist[] = { I_OnWhoisLine }; - ServerInstance->Modules->Attach(eventlist, this, 1); } + Version GetVersion() CXX11_OVERRIDE + { + return Version("Adds user mode H (hideoper) which hides the server operator status of a user from unprivileged users.", VF_VENDOR); + } - virtual ~ModuleHideOper() + void OnUserQuit(User* user, const std::string&, const std::string&) CXX11_OVERRIDE { - ServerInstance->Modes->DelMode(hm); - delete hm; + if (user->IsModeSet(hm)) + hm.opercount--; } - virtual Version GetVersion() + ModResult OnNumeric(User* user, const Numeric::Numeric& numeric) CXX11_OVERRIDE { - return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); + if (numeric.GetNumeric() != RPL_LUSEROP || active || user->HasPrivPermission("users/auspex")) + return MOD_RES_PASSTHRU; + + // If there are no visible operators then we shouldn't send the numeric. + size_t opercount = ServerInstance->Users->all_opers.size() - hm.opercount; + if (opercount) + { + active = true; + user->WriteNumeric(RPL_LUSEROP, opercount, "operator(s) online"); + active = false; + } + return MOD_RES_DENY; } - int OnWhoisLine(User* user, User* dest, int &numeric, std::string &text) + ModResult OnWhoisLine(Whois::Context& whois, Numeric::Numeric& numeric) CXX11_OVERRIDE { /* Dont display numeric 313 (RPL_WHOISOPER) if they have +H set and the * person doing the WHOIS is not an oper */ - if (numeric != 313) - return 0; + if (numeric.GetNumeric() != 313) + return MOD_RES_PASSTHRU; - if (!dest->IsModeSet('H')) - return 0; + if (!whois.GetTarget()->IsModeSet(hm)) + return MOD_RES_PASSTHRU; - if (user->HasPrivPermission("users/auspex")) - return 1; + if (!whois.GetSource()->HasPrivPermission("users/auspex")) + return MOD_RES_DENY; - return 0; + return MOD_RES_PASSTHRU; + } + + ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE + { + if (user->IsModeSet(hm) && !source->HasPrivPermission("users/auspex")) + { + // Hide the line completely if doing a "/who * o" query + if (request.flags['o']) + return MOD_RES_DENY; + + size_t flag_index; + if (!request.GetFieldIndex('f', flag_index)) + return MOD_RES_PASSTHRU; + + // hide the "*" that marks the user as an oper from the /WHO line + // #chan ident localhost insp22.test nick H@ :0 Attila + if (numeric.GetParams().size() <= flag_index) + return MOD_RES_PASSTHRU; + + std::string& param = numeric.GetParams()[flag_index]; + const std::string::size_type pos = param.find('*'); + if (pos != std::string::npos) + param.erase(pos, 1); + } + return MOD_RES_PASSTHRU; } -}; + ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE + { + if (stats.GetSymbol() != 'P') + return MOD_RES_PASSTHRU; + + unsigned int count = 0; + const UserManager::OperList& opers = ServerInstance->Users->all_opers; + for (UserManager::OperList::const_iterator i = opers.begin(); i != opers.end(); ++i) + { + User* oper = *i; + if (!oper->server->IsULine() && (stats.GetSource()->IsOper() || !oper->IsModeSet(hm))) + { + LocalUser* lu = IS_LOCAL(oper); + stats.AddRow(249, oper->nick + " (" + oper->ident + "@" + oper->GetDisplayedHost() + ") Idle: " + + (lu ? ConvToStr(ServerInstance->Time() - lu->idle_lastmsg) + " secs" : "unavailable")); + count++; + } + } + stats.AddRow(249, ConvToStr(count)+" OPER(s)"); + + return MOD_RES_DENY; + } +}; MODULE_INIT(ModuleHideOper)