X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_remove.cpp;h=d643bc0cd46475c0130c2bd5a175d85863711ec7;hb=f9fd78c01623514a060c607534fc52cb73140200;hp=afd02d0f9735c26939e96823afb8021a2baa4659;hpb=73b3492de62e3ee36d99df5ceeaa3c6f9930c0f6;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index afd02d0f9..d643bc0cd 100644 --- a/src/modules/m_remove.cpp +++ b/src/modules/m_remove.cpp @@ -1,179 +1,224 @@ -/* Support for a dancer-style /remove command, an alternative to /kick to try and avoid auto-rejoin-on-kick scripts */ -/* Written by Om, 25-03-05 */ - -using namespace std; - -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" - -/* $ModDesc: Provides a /remove command, this is mostly an alternative to /kick, except makes users appear to have parted the channel */ - -/* +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Pippijn van Steenhoven + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2005, 2007 Robin Burchell + * Copyright (C) 2005-2006 Craig Edwards + * Copyright (C) 2006 Oliver Lupton + * + * 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" + +/* * This module supports the use of the +q and +a usermodes, but should work without them too. * Usage of the command is restricted to +hoaq, and you cannot remove a user with a "higher" level than yourself. * eg: +h can remove +hv and users with no modes. +a can remove +aohv and users with no modes. */ -Server *Srv; - -/* This little function just converts a chanmode character (~ & @ & +) into an integer (5 4 3 2 1) */ -/* XXX - this could be handy in the core, so it can be used elsewhere */ -int chartolevel(std::string privs) -{ - /* XXX - if we just passed this a char, we could do a switch. Look nicer, really. */ - - if (privs == "~") - return 5; - else if (privs == "&") - return 4; - else if (privs == "@") - return 3; - else if (privs == "%") - return 2; - else - return 1; -} - -class cmd_remove : public command_t +/** Base class for /FPART and /REMOVE + */ +class RemoveBase : public Command { + bool& supportnokicks; + ChanModeReference& nokicksmode; + public: - cmd_remove () : command_t("REMOVE", 0, 2) + unsigned int protectedrank; + + RemoveBase(Module* Creator, bool& snk, ChanModeReference& nkm, const char* cmdn) + : Command(Creator, cmdn, 2, 3) + , supportnokicks(snk) + , nokicksmode(nkm) { - this->source = "m_remove.so"; } - void Handle (char **parameters, int pcnt, userrec *user) + CmdResult HandleRMB(const std::vector& parameters, User *user, bool fpart) { + User* target; + Channel* channel; + std::string reason; + + // If the command is a /REMOVE then detect the parameter order + bool neworder = ((fpart) || (parameters[0][0] == '#')); + + /* Set these to the parameters needed, the new version of this module switches it's parameters around + * supplying a new command with the new order while keeping the old /remove with the older order. + * /remove [reason ...] + * /fpart [reason ...] + */ + const std::string& channame = parameters[neworder ? 0 : 1]; + const std::string& username = parameters[neworder ? 1 : 0]; + /* Look up the user we're meant to be removing from the channel */ - userrec* target = Srv->FindNick(std::string(parameters[0])); + if (IS_LOCAL(user)) + target = ServerInstance->FindNickOnly(username); + else + target = ServerInstance->FindNick(username); + /* And the channel we're meant to be removing them from */ - chanrec* channel = Srv->FindChannel(std::string(parameters[1])); - /* And see if the person calling the command has access to use it on the channel */ - std::string privs = Srv->ChanMode(user, channel); - /* Check what privs the person being removed has */ - std::string targetprivs = Srv->ChanMode(target, channel); - int tlevel; - int ulevel; - int n = 2; - std::string result; - - /* This turns all the parameters after the first two into a single string, so the part reason can be multi-word */ - while (n < pcnt) + channel = ServerInstance->FindChan(channame); + + /* Fix by brain - someone needs to learn to validate their input! */ + if ((!target) || (target->registered != REG_ALL) || (!channel)) { - result=result + std::string(" ") + std::string(parameters[n]); - n++; + user->WriteNumeric(Numerics::NoSuchNick(channel ? username.c_str() : channame.c_str())); + return CMD_FAILURE; } - - /* If the target nick exists... */ - if (target && channel) + + if (!channel->HasUser(target)) { - for (unsigned int x = 0; x < strlen(parameters[1]); x++) - { - if ((parameters[1][0] != '#') || (parameters[1][x] == ' ') || (parameters[1][x] == ',')) - { - Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** Invalid characters in channel name"); - return; - } - } - - /* This is adding support for the +q and +a channel modes, basically if they are enabled, and the remover has them set. */ - /* Then we change the @|%|+ to & if they are +a, or ~ if they are +q */ - if (user->GetExt("cm_protect_"+std::string(channel->name))) - privs = std::string("&"); - if (user->GetExt("cm_founder_"+std::string(channel->name))) - privs = std::string("~"); - - /* Now it's the same idea, except for the target */ - if (target->GetExt("cm_protect_"+std::string(channel->name))) - targetprivs = std::string("&"); - if (target->GetExt("cm_founder_"+std::string(channel->name))) - targetprivs = std::string("~"); - - tlevel = chartolevel(targetprivs); - ulevel = chartolevel(privs); - - /* If the user calling the command is either an admin, owner, operator or a half-operator on the channel */ - if(ulevel > 1) + user->WriteNotice(InspIRCd::Format("*** The user %s is not on channel %s", target->nick.c_str(), channel->name.c_str())); + return CMD_FAILURE; + } + + if (target->server->IsULine()) + { + user->WriteNumeric(482, channame, "Only a u-line may remove a u-line from a channel."); + return CMD_FAILURE; + } + + /* We support the +Q channel mode via. the m_nokicks module, if the module is loaded and the mode is set then disallow the /remove */ + if ((!IS_LOCAL(user)) || (!supportnokicks) || (!channel->IsModeSet(nokicksmode))) + { + /* We'll let everyone remove their level and below, eg: + * ops can remove ops, halfops, voices, and those with no mode (no moders actually are set to 1) + * a ulined target will get a higher level than it's possible for a /remover to get..so they're safe. + * Nobody may remove people with >= protectedrank rank. + */ + unsigned int ulevel = channel->GetPrefixValue(user); + unsigned int tlevel = channel->GetPrefixValue(target); + if ((!IS_LOCAL(user)) || ((ulevel > VOICE_VALUE) && (ulevel >= tlevel) && ((protectedrank == 0) || (tlevel < protectedrank)))) { - /* For now, we'll let everyone remove their level and below, eg ops can remove ops, halfops, voices, and those with no mode (no moders actually are set to 1) */ - if(ulevel >= tlevel) + // REMOVE will be sent to the target's server and it will reply with a PART (or do nothing if it doesn't understand the command) + if (!IS_LOCAL(target)) { - Srv->PartUserFromChannel(target,std::string(parameters[1]), "Removed by "+std::string(user->nick)+":"+result); - Srv->SendTo(NULL,user,"NOTICE "+std::string(channel->name)+" : "+std::string(user->nick)+" removed "+std::string(target->nick)+ " from the channel"); - Srv->SendTo(NULL,target,"NOTICE "+std::string(target->nick)+" :*** "+std::string(user->nick)+" removed you from "+std::string(channel->name)+" with the message:"+std::string(result)); + // Send an ENCAP REMOVE with parameters being in the old order which is + // compatible with both 2.0 and 2.2. This also turns FPART into REMOVE. + std::vector p; + p.push_back(target->uuid); + p.push_back(channel->name); + if (parameters.size() > 2) + p.push_back(":" + parameters[2]); + ServerInstance->PI->SendEncapsulatedData(target->server->GetName(), "REMOVE", p, user); + + return CMD_SUCCESS; } + + std::string reasonparam; + + /* If a reason is given, use it */ + if(parameters.size() > 2) + reasonparam = parameters[2]; else - { - Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** You do not have access to remove "+std::string(target->nick)+" from the "+std::string(channel->name)); - } + reasonparam = "No reason given"; + + /* Build up the part reason string. */ + reason = "Removed by " + user->nick + ": " + reasonparam; + + channel->WriteNotice(InspIRCd::Format("%s removed %s from the channel", user->nick.c_str(), target->nick.c_str())); + target->WriteNotice("*** " + user->nick + " removed you from " + channel->name + " with the message: " + reasonparam); + + channel->PartUser(target, reason); } else { - Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** You do not have access to use /remove on "+std::string(channel->name)); + user->WriteNotice(InspIRCd::Format("*** You do not have access to /remove %s from %s", target->nick.c_str(), channel->name.c_str())); + return CMD_FAILURE; } } + else + { + /* m_nokicks.so was loaded and +Q was set, block! */ + user->WriteNumeric(ERR_RESTRICTED, channel->name, InspIRCd::Format("Can't remove user %s from channel (nokicks mode is set)", target->nick.c_str())); + return CMD_FAILURE; + } + + return CMD_SUCCESS; } }; -class ModuleRemove : public Module +/** Handle /REMOVE + */ +class CommandRemove : public RemoveBase { - cmd_remove* mycommand; public: - ModuleRemove(Server* Me) - : Module::Module(Me) + CommandRemove(Module* Creator, bool& snk, ChanModeReference& nkm) + : RemoveBase(Creator, snk, nkm, "REMOVE") { - Srv = Me; - mycommand = new cmd_remove(); - Srv->AddCommand(mycommand); + syntax = " []"; + TRANSLATE3(TR_NICK, TR_TEXT, TR_TEXT); } - void Implements(char* List) + CmdResult Handle (const std::vector& parameters, User *user) { - List[I_On005Numeric] = 1; + return HandleRMB(parameters, user, false); } +}; - virtual void On005Numeric(std::string &output) - { - output = output + std::string(" REMOVE"); - } - - virtual ~ModuleRemove() +/** Handle /FPART + */ +class CommandFpart : public RemoveBase +{ + public: + CommandFpart(Module* Creator, bool& snk, ChanModeReference& nkm) + : RemoveBase(Creator, snk, nkm, "FPART") { + syntax = " []"; + TRANSLATE3(TR_TEXT, TR_NICK, TR_TEXT); } - - virtual Version GetVersion() + + CmdResult Handle (const std::vector& parameters, User *user) { - return Version(1,0,0,1,VF_VENDOR); + return HandleRMB(parameters, user, true); } - }; -// stuff down here is the module-factory stuff. For basic modules you can ignore this. - -class ModuleRemoveFactory : public ModuleFactory +class ModuleRemove : public Module { + ChanModeReference nokicksmode; + CommandRemove cmd1; + CommandFpart cmd2; + bool supportnokicks; + public: - ModuleRemoveFactory() + ModuleRemove() + : nokicksmode(this, "nokick") + , cmd1(this, supportnokicks, nokicksmode) + , cmd2(this, supportnokicks, nokicksmode) + { + } + + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { + tokens["REMOVE"]; } - - ~ModuleRemoveFactory() + + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { + ConfigTag* tag = ServerInstance->Config->ConfValue("remove"); + supportnokicks = tag->getBool("supportnokicks"); + cmd1.protectedrank = cmd2.protectedrank = tag->getInt("protectedrank", 50000); } - - virtual Module * CreateModule(Server* Me) + + Version GetVersion() CXX11_OVERRIDE { - return new ModuleRemove(Me); + return Version("Provides a /remove command, this is mostly an alternative to /kick, except makes users appear to have parted the channel", VF_OPTCOMMON | VF_VENDOR); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleRemoveFactory; -} - +MODULE_INIT(ModuleRemove)