X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_remove.cpp;h=4dfa0bfb5c18300f3807c3b49953649f90da4e1e;hb=e94b673532f7833aaa4789f834e61d68e0b4fc56;hp=da4fc49d7c45026b7231e27eb421b5ff7cab9d3d;hpb=ab01aaeeee9aed655df2eec2522072233fe3aa57;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index da4fc49d7..c35b889b9 100644 --- a/src/modules/m_remove.cpp +++ b/src/modules/m_remove.cpp @@ -1,163 +1,235 @@ -/* 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 */ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2017 B00mX0r + * Copyright (C) 2013, 2018, 2020-2021 Sadie Powell + * Copyright (C) 2012-2014, 2016 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2012 Justin Crawford + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Thomas Stagner + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006 Oliver Lupton + * Copyright (C) 2005-2006, 2010 Craig Edwards + * + * 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 . + */ -using namespace std; -#include -#include -#include "users.h" -#include "channels.h" -#include "modules.h" +#include "inspircd.h" -/* $ModDesc: Provides a /remove command, this is mostly an alternative to /kick, except makes users appear to have parted the channel */ - -/* +/* * 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) */ -int chartolevel(std::string privs) -{ - int level; - if(privs == "~") - level = 5; - else - if(privs == "&") - level = 4; - else - if(privs == "@") - level = 3; - else - if(privs == "%") { - level = 2; - } else { - level = 1; - } - return level; -} - -void handle_remove(char **parameters, int pcnt, userrec *user) +/** Base class for /FPART and /REMOVE + */ +class RemoveBase : public Command { - /* Look up the user we're meant to be removing from the channel */ - userrec* target = Srv->FindNick(std::string(parameters[0])); - /* 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) + bool& supportnokicks; + ChanModeReference& nokicksmode; + + public: + unsigned int protectedrank; + + RemoveBase(Module* Creator, bool& snk, ChanModeReference& nkm, const char* cmdn) + : Command(Creator, cmdn, 2, 3) + , supportnokicks(snk) + , nokicksmode(nkm) { - result=result + std::string(" ") + std::string(parameters[n]); - n++; } - - /* If the target nick exists... */ - if (target && channel) + + CmdResult HandleRMB(User* user, const CommandBase::Params& parameters, bool fpart) { - for (int x = 0; x < strlen(parameters[1]); x++) + 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 */ + if (IS_LOCAL(user)) + target = ServerInstance->FindNickOnly(username); + else + target = ServerInstance->FindNick(username); + + /* And the channel we're meant to be removing them from */ + channel = ServerInstance->FindChan(channame); + + /* Fix by brain - someone needs to learn to validate their input! */ + if (!channel) { - 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; - } + user->WriteNumeric(Numerics::NoSuchChannel(channame)); + return CMD_FAILURE; } - - /* 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) + if ((!target) || (target->registered != REG_ALL)) { - /* 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) + user->WriteNumeric(Numerics::NoSuchNick(username)); + return CMD_FAILURE; + } + + if (!channel->HasUser(target)) + { + user->WriteNotice(InspIRCd::Format("*** User %s is not on channel %s", target->nick.c_str(), channel->name.c_str())); + return CMD_FAILURE; + } + + if (target->server->IsULine()) + { + user->WriteNumeric(ERR_CHANOPRIVSNEEDED, 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)))) + { + // 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)) + { + // Send an ENCAP REMOVE with parameters being in the old order which is + // compatible with both 2.0 and 3.0. This also turns FPART into REMOVE. + CommandBase::Params 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 + reasonparam = "No reason given"; + + /* Build up the part reason string. */ + reason = "Removed by " + user->nick + ": " + reasonparam; + + channel->WriteRemoteNotice(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->PartUserFromChannel(target,std::string(parameters[1]), "Remove 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)); - } 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)); + 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 { - Srv->SendTo(NULL,user,"NOTICE "+std::string(user->nick)+" :*** You do not have access to use /remove on "+std::string(channel->name)); } - } -} + 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 (+Q is set)", target->nick.c_str())); + return CMD_FAILURE; + } + return CMD_SUCCESS; + } +}; -class ModuleRemove : public Module +/** Handle /REMOVE + */ +class CommandRemove : public RemoveBase { public: - ModuleRemove() + CommandRemove(Module* Creator, bool& snk, ChanModeReference& nkm) + : RemoveBase(Creator, snk, nkm, "REMOVE") { - Srv = new Server; - Srv->AddCommand("REMOVE", handle_remove, 0, 3, "m_remove.so"); + syntax = " [:]"; + TRANSLATE3(TR_NICK, TR_TEXT, TR_TEXT); } - virtual void On005Numeric(std::string &output) - { - output = output + std::string(" REMOVE"); - } - - virtual ~ModuleRemove() + CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + { + return HandleRMB(user, parameters, false); + } +}; + +/** Handle /FPART + */ +class CommandFpart : public RemoveBase +{ + public: + CommandFpart(Module* Creator, bool& snk, ChanModeReference& nkm) + : RemoveBase(Creator, snk, nkm, "FPART") { - delete Srv; + syntax = " [:]"; + TRANSLATE3(TR_TEXT, TR_NICK, TR_TEXT); } - - virtual Version GetVersion() + + CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE { - return Version(1,0,0,1,VF_VENDOR); + return HandleRMB(user, parameters, 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) { } - - ~ModuleRemoveFactory() + + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { + tokens["REMOVE"]; } - - virtual Module * CreateModule() + + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - return new ModuleRemove; + ConfigTag* tag = ServerInstance->Config->ConfValue("remove"); + supportnokicks = tag->getBool("supportnokicks"); + cmd1.protectedrank = cmd2.protectedrank = tag->getUInt("protectedrank", 50000); } - -}; + Version GetVersion() CXX11_OVERRIDE + { + return Version("Adds the /FPART and /REMOVE commands which allows channel operators to force part users from a channel.", VF_OPTCOMMON | VF_VENDOR); + } +}; -extern "C" void * init_module( void ) -{ - return new ModuleRemoveFactory; -} - +MODULE_INIT(ModuleRemove)