X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_servprotect.cpp;h=7ef77c0895bdc558ad525157ff93920be944f922;hb=b4be0c94ab5fb7e5a7a799a195c78de072a5e315;hp=687c45a94467da30a33b6556dff1e2276a7623a5;hpb=8de87c2a9b5f5e68caac1ca06b1021ed69cb3d6a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_servprotect.cpp b/src/modules/m_servprotect.cpp index 687c45a94..7ef77c089 100644 --- a/src/modules/m_servprotect.cpp +++ b/src/modules/m_servprotect.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -12,12 +12,6 @@ */ #include "inspircd.h" -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "configreader.h" /* $ModDesc: Provides support for Austhex style +k / UnrealIRCD +S services mode */ @@ -26,10 +20,18 @@ class ServProtectMode : public ModeHandler { public: - ServProtectMode(InspIRCd* Instance) : ModeHandler(Instance, 'k', 0, 0, false, MODETYPE_USER, true) { } + ServProtectMode(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'k', 0, 0, false, MODETYPE_USER, true) { } - ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool) + ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) { + /* Because this returns MODEACTION_DENY all the time, there is only ONE + * way to add this mode and that is at client introduction in the UID command, + * as this calls OnModeChange for each mode but disregards the return values. + * The mode cannot be manually added or removed, not even by a server or by a remote + * user or uline, which prevents its (ab)use as a kiddie 'god mode' on such networks. + * I'm sure if someone really wants to do that they can make a copy of this module + * that does the job. It won't be me though! + */ return MODEACTION_DENY; } @@ -38,33 +40,29 @@ class ServProtectMode : public ModeHandler class ModuleServProtectMode : public Module { - - ServProtectMode* bm; + ServProtectMode bm; public: ModuleServProtectMode(InspIRCd* Me) - : Module(Me) + : Module(Me), bm(Me, this) { - - bm = new ServProtectMode(ServerInstance); - if (!ServerInstance->Modes->AddMode(bm)) + if (!ServerInstance->Modes->AddMode(&bm)) throw ModuleException("Could not add new modes!"); Implementation eventlist[] = { I_OnWhois, I_OnKill, I_OnWhoisLine, I_OnRawMode, I_OnUserPreKick }; ServerInstance->Modules->Attach(eventlist, this, 5); } - virtual ~ModuleServProtectMode() + ~ModuleServProtectMode() { - ServerInstance->Modes->DelMode(bm); - delete bm; + ServerInstance->Modes->DelMode(&bm); } - virtual Version GetVersion() + Version GetVersion() { - return Version("$Id$",VF_COMMON,API_VERSION); + return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION); } - virtual void OnWhois(User* src, User* dst) + void OnWhois(User* src, User* dst) { if (dst->IsModeSet('k')) { @@ -72,12 +70,12 @@ class ModuleServProtectMode : public Module } } - virtual int OnRawMode(User* user, Channel* chan, const char mode, const std::string ¶m, bool adding, int pcnt, bool servermode) + ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string ¶m, bool adding, int pcnt) { /* Check that the mode is not a server mode, it is being removed, the user making the change is local, there is a parameter, * and the user making the change is not a uline */ - if (!servermode && !adding && chan && IS_LOCAL(user) && !param.empty() && !ServerInstance->ULine(user->server)) + if (!adding && chan && IS_LOCAL(user) && !param.empty() && !ServerInstance->ULine(user->server)) { /* Check if the parameter is a valid nick/uuid */ @@ -92,42 +90,43 @@ class ModuleServProtectMode : public Module { /* BZZZT, Denied! */ user->WriteNumeric(482, "%s %s :You are not permitted to remove privileges from %s services", user->nick.c_str(), chan->name.c_str(), ServerInstance->Config->Network); - return ACR_DENY; + return MOD_RES_DENY; } } } /* Mode allowed */ - return 0; + return MOD_RES_PASSTHRU; } - virtual int OnKill(User* src, User* dst, const std::string &reason) + ModResult OnKill(User* src, User* dst, const std::string &reason) { if (src == NULL) - return 0; + return MOD_RES_PASSTHRU; if (dst->IsModeSet('k')) { src->WriteNumeric(485, "%s :You are not permitted to kill %s services!", src->nick.c_str(), ServerInstance->Config->Network); - ServerInstance->SNO->WriteToSnoMask('A', std::string(src->nick)+" tried to kill service "+dst->nick+" ("+reason+")"); - return 1; + ServerInstance->SNO->WriteGlobalSno('a', std::string(src->nick)+" tried to kill service "+dst->nick+" ("+reason+")"); + return MOD_RES_DENY; } - return 0; + return MOD_RES_PASSTHRU; } - virtual int OnUserPreKick(User *src, User *dst, Channel *c, const std::string &reason) + ModResult OnUserPreKick(User *src, Membership* memb, const std::string &reason) { - if (dst->IsModeSet('k')) + if (memb->user->IsModeSet('k')) { - src->WriteNumeric(484, "%s %s :You are not permitted to kick services", src->nick.c_str(), c->name.c_str()); - return 1; + src->WriteNumeric(484, "%s %s :You are not permitted to kick services", + src->nick.c_str(), memb->chan->name.c_str()); + return MOD_RES_DENY; } - return 0; + return MOD_RES_PASSTHRU; } - virtual int OnWhoisLine(User* src, User* dst, int &numeric, std::string &text) + ModResult OnWhoisLine(User* src, User* dst, int &numeric, std::string &text) { - return ((src != dst) && (numeric == 319) && dst->IsModeSet('k')); + return ((src != dst) && (numeric == 319) && dst->IsModeSet('k')) ? MOD_RES_DENY : MOD_RES_PASSTHRU; } };