X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_hideoper.cpp;h=888f9ad5f295f296e9e3dc56c592190915ea3685;hb=e94b673532f7833aaa4789f834e61d68e0b4fc56;hp=51b00de92d761ead092be0cecd6beb6513add72d;hpb=a5c00b1548d7c8fc89358c26901fa534f7836cc1;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp index 51b00de92..888f9ad5f 100644 --- a/src/modules/m_hideoper.cpp +++ b/src/modules/m_hideoper.cpp @@ -1,9 +1,16 @@ /* * InspIRCd -- Internet Relay Chat Daemon * + * Copyright (C) 2019 linuxdaemon + * Copyright (C) 2014 Adam + * Copyright (C) 2013, 2015, 2017-2018, 2021 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) 2007 Robin Burchell - * Copyright (C) 2006 Craig Edwards + * Copyright (C) 2006, 2010 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 @@ -20,6 +27,9 @@ #include "inspircd.h" +#include "modules/stats.h" +#include "modules/who.h" +#include "modules/whois.h" /** Handles user mode +H */ @@ -34,7 +44,7 @@ class HideOper : public SimpleUserModeHandler oper = true; } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) + 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; @@ -48,13 +58,21 @@ class HideOper : public SimpleUserModeHandler } }; -class ModuleHideOper : public Module, public Whois::LineEventListener +class ModuleHideOper + : public Module + , public Stats::EventListener + , public Who::EventListener + , public Whois::LineEventListener { + private: HideOper hm; bool active; + public: ModuleHideOper() - : Whois::LineEventListener(this) + : Stats::EventListener(this) + , Who::EventListener(this) + , Whois::LineEventListener(this) , hm(this) , active(false) { @@ -62,7 +80,7 @@ class ModuleHideOper : public Module, public Whois::LineEventListener Version GetVersion() CXX11_OVERRIDE { - return Version("Provides support for hiding oper status with user mode +H", VF_VENDOR); + return Version("Adds user mode H (hideoper) which hides the server operator status of a user from unprivileged users.", VF_VENDOR); } void OnUserQuit(User* user, const std::string&, const std::string&) CXX11_OVERRIDE @@ -73,7 +91,7 @@ class ModuleHideOper : public Module, public Whois::LineEventListener ModResult OnNumeric(User* user, const Numeric::Numeric& numeric) CXX11_OVERRIDE { - if (numeric.GetNumeric() != 252 || active || user->HasPrivPermission("users/auspex")) + 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. @@ -81,7 +99,7 @@ class ModuleHideOper : public Module, public Whois::LineEventListener if (opercount) { active = true; - user->WriteNumeric(252, opercount, "operator(s) online"); + user->WriteNumeric(RPL_LUSEROP, opercount, "operator(s) online"); active = false; } return MOD_RES_DENY; @@ -104,21 +122,27 @@ class ModuleHideOper : public Module, public Whois::LineEventListener return MOD_RES_PASSTHRU; } - ModResult OnSendWhoLine(User* source, const std::vector& params, User* user, Membership* memb, std::string& line) CXX11_OVERRIDE + 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 - std::string::size_type spcolon = line.find(" :"); - if (spcolon == std::string::npos) + // #chan ident localhost insp22.test nick H@ :0 Attila + if (numeric.GetParams().size() <= flag_index) return MOD_RES_PASSTHRU; - std::string::size_type sp = line.rfind(' ', spcolon-1); - std::string::size_type pos = line.find('*', sp); + + std::string& param = numeric.GetParams()[flag_index]; + const std::string::size_type pos = param.find('*'); if (pos != std::string::npos) - line.erase(pos, 1); - // hide the line completely if doing a "/who * o" query - if (params.size() > 1 && params[1].find('o') != std::string::npos) - return MOD_RES_DENY; + param.erase(pos, 1); } return MOD_RES_PASSTHRU; } @@ -136,8 +160,9 @@ class ModuleHideOper : public Module, public Whois::LineEventListener if (!oper->server->IsULine() && (stats.GetSource()->IsOper() || !oper->IsModeSet(hm))) { LocalUser* lu = IS_LOCAL(oper); - stats.AddRow(249, oper->nick + " (" + oper->ident + "@" + oper->dhost + ") Idle: " + - (lu ? ConvToStr(ServerInstance->Time() - lu->idle_lastmsg) + " secs" : "unavailable")); + const std::string idle = lu ? InspIRCd::DurationString(ServerInstance->Time() - lu->idle_lastmsg) : "unavailable"; + stats.AddRow(249, InspIRCd::Format("%s (%s@%s) Idle: %s", oper->nick.c_str(), + oper->ident.c_str(), oper->GetDisplayedHost().c_str(), idle.c_str())); count++; } }