-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ * 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>
*
- * 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 <http://www.gnu.org/licenses/>.
*/
-#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(Module* Creator) : ModeHandler(Creator, "hideoper", 'H', PARAM_NONE, MODETYPE_USER)
+ size_t opercount;
+
+ HideOper(Module* Creator) : SimpleUserModeHandler(Creator, "hideoper", 'H')
+ , opercount(0)
{
oper = true;
}
- ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, 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;
+
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;
+
public:
ModuleHideOper()
- : hm(this)
+ : Stats::EventListener(this)
+ , Who::EventListener(this)
+ , Whois::LineEventListener(this)
+ , hm(this)
+ , active(false)
{
- if (!ServerInstance->Modes->AddMode(&hm))
- throw ModuleException("Could not add new modes!");
- Implementation eventlist[] = { I_OnWhoisLine, I_OnSendWhoLine };
- ServerInstance->Modules->Attach(eventlist, this, 2);
}
+ Version GetVersion() CXX11_OVERRIDE
+ {
+ return Version("Provides support for hiding oper status with user mode +H", VF_VENDOR);
+ }
- virtual ~ModuleHideOper()
+ void OnUserQuit(User* user, const std::string&, const std::string&) CXX11_OVERRIDE
{
+ if (user->IsModeSet(hm))
+ hm.opercount--;
}
- virtual Version GetVersion()
+ ModResult OnNumeric(User* user, const Numeric::Numeric& numeric) CXX11_OVERRIDE
{
- return Version("Provides support for hiding oper status with user mode +H", VF_COMMON | VF_VENDOR);
+ 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;
}
- ModResult 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)
+ if (numeric.GetNumeric() != 313)
return MOD_RES_PASSTHRU;
- if (!dest->IsModeSet('H'))
+ if (!whois.GetTarget()->IsModeSet(hm))
return MOD_RES_PASSTHRU;
- if (!user->HasPrivPermission("users/auspex"))
+ if (!whois.GetSource()->HasPrivPermission("users/auspex"))
return MOD_RES_DENY;
return MOD_RES_PASSTHRU;
}
- void OnSendWhoLine(User* source, User* user, Channel* channel, std::string& line)
+ ModResult OnWhoLine(const Who::Request& request, LocalUser* source, User* user, Membership* memb, Numeric::Numeric& numeric) CXX11_OVERRIDE
{
- if (user->IsModeSet('H') && !source->HasPrivPermission("users/auspex"))
+ 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 = 5;
+ if (request.whox)
+ {
+ // We only need to fiddle with the flags if they are present.
+ if (!request.whox_fields['f'])
+ return MOD_RES_PASSTHRU;
+
+ // WHOX makes this a bit tricky as we need to work out the parameter which the flags are in.
+ flag_index = 0;
+ static const char* flags = "tcuihsn";
+ for (size_t i = 0; i < strlen(flags); ++i)
+ {
+ if (request.whox_fields[flags[i]])
+ flag_index += 1;
+ }
+ }
+
// hide the "*" that marks the user as an oper from the /WHO line
- std::string::size_type pos = line.find("* ");
+ // #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)
- line.erase(pos);
+ 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)