X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_hideoper.cpp;h=9d50bd2e5342b410ef4715c492c6ffdf50502944;hb=571714e28b26cc59cbc8d27098a5ba981240ee2d;hp=c322fdf3f67d48f8e7804b03075497d8bf2e22ff;hpb=76d7e8a0684b38a82e6c05ebd7538b69660e1bef;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_hideoper.cpp b/src/modules/m_hideoper.cpp index c322fdf3f..9d50bd2e5 100644 --- a/src/modules/m_hideoper.cpp +++ b/src/modules/m_hideoper.cpp @@ -1,115 +1,161 @@ -/* +------------------------------------+ - * | 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) 2007 Dennis Friis + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2006 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" -#include "users.h" -#include "channels.h" -#include "modules.h" /* $ModDesc: Provides support for hiding oper status with user mode +H */ -/** Handles user mode +B +/** Handles user mode +H */ -class HideOper : public ModeHandler +class HideOper : public SimpleUserModeHandler { public: - HideOper(InspIRCd* Instance) : ModeHandler(Instance, 'H', 0, 'o', false, MODETYPE_USER, true) { } + size_t opercount; + + HideOper(Module* Creator) : SimpleUserModeHandler(Creator, "hideoper", 'H') + , opercount(0) + { + oper = true; + } - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) { - if (source != dest) + 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; - } - } - - return MODEACTION_DENY; + opercount--; + + return MODEACTION_ALLOW; } }; class ModuleHideOper : public Module { - - HideOper* hm; + HideOper hm; + bool active; public: - ModuleHideOper(InspIRCd* Me) - : Module(Me) + ModuleHideOper() + : hm(this) + , active(false) { - - hm = new HideOper(ServerInstance); - if (!ServerInstance->AddMode(hm, 'H')) - throw ModuleException("Could not add new modes!"); } - void Implements(char* List) + void init() { - List[I_OnWhoisLine] = 1; + ServerInstance->Modules->AddService(hm); + Implementation eventlist[] = { I_OnWhoisLine, I_OnSendWhoLine, I_OnStats, I_OnNumeric, I_OnUserQuit }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } - + + virtual ~ModuleHideOper() { - ServerInstance->Modes->DelMode(hm); - DELETE(hm); } - + virtual Version GetVersion() { - return Version(1,1,0,0,VF_COMMON|VF_VENDOR,API_VERSION); + return Version("Provides support for hiding oper status with user mode +H", VF_VENDOR); + } + + void OnUserQuit(User* user, const std::string&, const std::string&) + { + if (user->IsModeSet('H')) + hm.opercount--; + } + + ModResult OnNumeric(User* user, unsigned int numeric, const std::string& text) + { + if (numeric != 252 || 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(252, "%s %lu :operator(s) online", user->nick.c_str(), opercount); + active = false; + } + return MOD_RES_DENY; } - int OnWhoisLine(userrec* user, userrec* dest, int &numeric, std::string &text) + ModResult OnWhoisLine(User* user, User* dest, int &numeric, std::string &text) { /* Dont display numeric 313 (RPL_WHOISOPER) if they have +H set and the * person doing the WHOIS is not an oper */ - return ((!IS_OPER(user)) && (numeric == 313) && dest->IsModeSet('H')); - } -}; + if (numeric != 313) + return MOD_RES_PASSTHRU; -class ModuleHideOperFactory : public ModuleFactory -{ - public: - ModuleHideOperFactory() - { + if (!dest->IsModeSet('H')) + return MOD_RES_PASSTHRU; + + if (!user->HasPrivPermission("users/auspex")) + return MOD_RES_DENY; + + return MOD_RES_PASSTHRU; } - - ~ModuleHideOperFactory() + + void OnSendWhoLine(User* source, const std::vector& params, User* user, std::string& line) { + if (user->IsModeSet('H') && !source->HasPrivPermission("users/auspex")) + { + // 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) + return; // Another module hid the user completely + std::string::size_type sp = line.rfind(' ', spcolon-1); + std::string::size_type pos = line.find('*', sp); + 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) + line.clear(); + } } - - virtual Module * CreateModule(InspIRCd* Me) + + ModResult OnStats(char symbol, User* user, string_list &results) { - return new ModuleHideOper(Me); + if (symbol != 'P') + return MOD_RES_PASSTHRU; + + unsigned int count = 0; + for (std::list::const_iterator i = ServerInstance->Users->all_opers.begin(); i != ServerInstance->Users->all_opers.end(); ++i) + { + User* oper = *i; + if (!ServerInstance->ULine(oper->server) && (IS_OPER(user) || !oper->IsModeSet('H'))) + { + results.push_back(ServerInstance->Config->ServerName+" 249 " + user->nick + " :" + oper->nick + " (" + oper->ident + "@" + oper->dhost + ") Idle: " + + (IS_LOCAL(oper) ? ConvToStr(ServerInstance->Time() - oper->idle_lastmsg) + " secs" : "unavailable")); + count++; + } + } + results.push_back(ServerInstance->Config->ServerName+" 249 "+user->nick+" :"+ConvToStr(count)+" OPER(s)"); + + return MOD_RES_DENY; } - }; -extern "C" DllExport void * init_module( void ) -{ - return new ModuleHideOperFactory; -} +MODULE_INIT(ModuleHideOper)