/*
* InspIRCd -- Internet Relay Chat Daemon
*
+ * Copyright (C) 2019 linuxdaemon <linuxdaemon.irc@gmail.com>
+ * Copyright (C) 2014 Adam <Adam@anope.org>
+ * Copyright (C) 2013, 2015, 2017-2018 Sadie Powell <sadie@witchery.services>
+ * Copyright (C) 2012-2016 Attila Molnar <attilamolnar@hush.com>
+ * Copyright (C) 2012 Robby <robby@chatbelgie.be>
+ * Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2008 Geoff Bricker <geoff.bricker@gmail.com>
* Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
- * Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
- * Copyright (C) 2006 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2006, 2010 Craig Edwards <brain@inspircd.org>
*
* 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
#include "inspircd.h"
#include "modules/stats.h"
+#include "modules/who.h"
+#include "modules/whois.h"
/** Handles user mode +H
*/
}
};
-class ModuleHideOper : public Module, public Stats::EventListener, public Whois::LineEventListener
+class ModuleHideOper
+ : public Module
+ , public Stats::EventListener
+ , public Who::EventListener
+ , public Whois::LineEventListener
{
+ private:
HideOper hm;
bool active;
+
public:
ModuleHideOper()
: Stats::EventListener(this)
+ , Who::EventListener(this)
, Whois::LineEventListener(this)
, hm(this)
, active(false)
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
return MOD_RES_PASSTHRU;
}
- ModResult OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, Membership* memb, Numeric::Numeric& numeric) 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 ((params.size() > 1) && (params[1].find('o') != std::string::npos))
+ 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() < 6)
+ if (numeric.GetParams().size() <= flag_index)
return MOD_RES_PASSTHRU;
- std::string& param = numeric.GetParams()[5];
+ std::string& param = numeric.GetParams()[flag_index];
const std::string::size_type pos = param.find('*');
if (pos != std::string::npos)
param.erase(pos, 1);