X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_remove.cpp;h=f0eff03cab0dd9bf08a2bfb7eb65a93dd493ba4e;hb=b4a174ee9c32d62ea6bf010e837e8c5b1c3d36a3;hp=16cc8a67935d0f530161a452d1081a36663bfc5f;hpb=42d5b9571eff06b0c33093dc9118c29f9603fd2b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index 16cc8a679..cd59f07bc 100644 --- a/src/modules/m_remove.cpp +++ b/src/modules/m_remove.cpp @@ -1,26 +1,36 @@ -/* +------------------------------------+ - * | 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) 2017 B00mX0r + * Copyright (C) 2013, 2018, 2020 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 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 -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "configreader.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 */ +#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. @@ -28,184 +38,124 @@ /** Base class for /FPART and /REMOVE */ -class RemoveBase +class RemoveBase : public Command { - private: bool& supportnokicks; - InspIRCd* ServerInstance; - - protected: - RemoveBase(InspIRCd* Instance, bool& snk) : supportnokicks(snk), ServerInstance(Instance) - { - } - - enum ModeLevel { PEON = 0, HALFOP = 1, OP = 2, ADMIN = 3, OWNER = 4, ULINE = 5 }; - - /* This little function just converts a chanmode character (U ~ & @ & +) into an integer (5 4 3 2 1 0) */ - /* XXX - We should probably use the new mode prefix rank stuff - * for this instead now -- Brain */ - ModeLevel chartolevel(const std::string &privs) + 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) { - if(privs.empty()) - { - return PEON; - } - - switch (privs[0]) - { - case 'U': - /* Ulined */ - return ULINE; - case '~': - /* Owner */ - return OWNER; - case '&': - /* Admin */ - return ADMIN; - case '@': - /* Operator */ - return OP; - case '%': - /* Halfop */ - return HALFOP; - default: - /* Peon */ - return PEON; - } } - - CmdResult Handle (const char** parameters, int pcnt, userrec *user, bool neworder) + + CmdResult HandleRMB(User* user, const CommandBase::Params& parameters, bool fpart) { - const char* channame; - const char* username; - userrec* target; - chanrec* channel; - ModeLevel tlevel; - ModeLevel ulevel; + User* target; + Channel* channel; std::string reason; - std::string protectkey; - std::string founderkey; - bool hasnokicks; - + + // 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 ...] */ - channame = parameters[ neworder ? 0 : 1]; - username = parameters[ neworder ? 1 : 0]; - + 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 */ - target = ServerInstance->FindNick(username); - + 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 (!target || !channel) + if (!channel) { - user->WriteServ("401 %s %s :No such nick/channel", user->nick, !target ? username : channame); + user->WriteNumeric(Numerics::NoSuchChannel(channame)); return CMD_FAILURE; } - - if (!channel->HasUser(target)) + if ((!target) || (target->registered != REG_ALL)) { - user->WriteServ( "NOTICE %s :*** The user %s is not on channel %s", user->nick, target->nick, channel->name); + user->WriteNumeric(Numerics::NoSuchNick(username)); 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 */ - protectkey = "cm_protect_" + std::string(channel->name); - founderkey = "cm_founder_" + std::string(channel->name); - - if (ServerInstance->ULine(user->server) || ServerInstance->ULine(user->nick)) - { - ServerInstance->Log(DEBUG, "Setting ulevel to U"); - ulevel = chartolevel("U"); - } - if (user->GetExt(founderkey)) - { - ServerInstance->Log(DEBUG, "Setting ulevel to ~"); - ulevel = chartolevel("~"); - } - else if (user->GetExt(protectkey)) - { - ServerInstance->Log(DEBUG, "Setting ulevel to &"); - ulevel = chartolevel("&"); - } - else - { - ServerInstance->Log(DEBUG, "Setting ulevel to %s", channel->GetPrefixChar(user)); - ulevel = chartolevel(channel->GetPrefixChar(user)); - } - - /* Now it's the same idea, except for the target. If they're ulined make sure they get a higher level than the sender can */ - if (ServerInstance->ULine(target->server) || ServerInstance->ULine(target->nick)) - { - ServerInstance->Log(DEBUG, "Setting tlevel to U"); - tlevel = chartolevel("U"); - } - else if (target->GetExt(founderkey)) - { - ServerInstance->Log(DEBUG, "Setting tlevel to ~"); - tlevel = chartolevel("~"); } - else if (target->GetExt(protectkey)) + + if (!channel->HasUser(target)) { - ServerInstance->Log(DEBUG, "Setting tlevel to &"); - tlevel = chartolevel("&"); + user->WriteNotice(InspIRCd::Format("*** User %s is not on channel %s", target->nick.c_str(), channel->name.c_str())); + return CMD_FAILURE; } - else + + if (target->server->IsULine()) { - ServerInstance->Log(DEBUG, "Setting tlevel to %s", channel->GetPrefixChar(target)); - tlevel = chartolevel(channel->GetPrefixChar(target)); + user->WriteNumeric(ERR_CHANOPRIVSNEEDED, channame, "Only a U-line may remove a U-line from a channel."); + return CMD_FAILURE; } - - hasnokicks = (ServerInstance->FindModule("m_nokicks.so") && channel->IsModeSet('Q')); - + /* 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 || !hasnokicks || (ulevel == ULINE))) + 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 a founder. + * Nobody may remove people with >= protectedrank rank. */ - if ((!IS_LOCAL(user)) || ((ulevel > PEON) && (ulevel >= tlevel) && (tlevel != OWNER))) + 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)))) { - // no you can't just go from a std::ostringstream to a std::string, Om. -nenolod - // but you can do this, nenolod -brain - - std::string reasonparam("No reason given"); - - /* If a reason is given, use it */ - if(pcnt > 2) + // 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)) { - /* Join params 2 ... pcnt - 1 (inclusive) into one */ - irc::stringjoiner reason_join(" ", parameters, 2, pcnt - 1); - reasonparam = reason_join.GetJoined(); + // 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 = std::string("Removed by ") + user->nick + ": " + reasonparam; + reason = "Removed by " + user->nick + ": " + reasonparam; - channel->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s removed %s from the channel", channel->name, user->nick, target->nick); - target->WriteServ("NOTICE %s :*** %s removed you from %s with the message: %s", target->nick, user->nick, channel->name, reasonparam.c_str()); + 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); - if (!channel->PartUser(target, reason.c_str())) - delete channel; + channel->PartUser(target, reason); } else { - user->WriteServ( "NOTICE %s :*** You do not have access to /remove %s from %s", user->nick, target->nick, 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->WriteServ( "484 %s %s :Can't remove user %s from channel (+Q set)", user->nick, channel->name, target->nick); + 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; } @@ -215,107 +165,71 @@ class RemoveBase /** Handle /REMOVE */ -class cmd_remove : public command_t, public RemoveBase +class CommandRemove : public RemoveBase { public: - cmd_remove(InspIRCd* Instance, bool& snk) : command_t(Instance, "REMOVE", 0, 2), RemoveBase(Instance, snk) + CommandRemove(Module* Creator, bool& snk, ChanModeReference& nkm) + : RemoveBase(Creator, snk, nkm, "REMOVE") { - this->source = "m_remove.so"; - syntax = " []"; + syntax = " [:]"; + TRANSLATE3(TR_NICK, TR_TEXT, TR_TEXT); } - - CmdResult Handle (const char** parameters, int pcnt, userrec *user) + + CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE { - return RemoveBase::Handle(parameters, pcnt, user, false); + return HandleRMB(user, parameters, false); } }; /** Handle /FPART */ -class cmd_fpart : public command_t, public RemoveBase +class CommandFpart : public RemoveBase { public: - cmd_fpart(InspIRCd* Instance, bool& snk) : command_t(Instance, "FPART", 0, 2), RemoveBase(Instance, snk) + CommandFpart(Module* Creator, bool& snk, ChanModeReference& nkm) + : RemoveBase(Creator, snk, nkm, "FPART") { - this->source = "m_remove.so"; - syntax = " []"; + syntax = " [:]"; + TRANSLATE3(TR_TEXT, TR_NICK, TR_TEXT); } - CmdResult Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE { - return RemoveBase::Handle(parameters, pcnt, user, true); + return HandleRMB(user, parameters, true); } }; class ModuleRemove : public Module { - cmd_remove* mycommand; - cmd_fpart* mycommand2; + ChanModeReference nokicksmode; + CommandRemove cmd1; + CommandFpart cmd2; bool supportnokicks; - - + public: - ModuleRemove(InspIRCd* Me) - : Module::Module(Me) + ModuleRemove() + : nokicksmode(this, "nokick") + , cmd1(this, supportnokicks, nokicksmode) + , cmd2(this, supportnokicks, nokicksmode) { - mycommand = new cmd_remove(ServerInstance, supportnokicks); - mycommand2 = new cmd_fpart(ServerInstance, supportnokicks); - ServerInstance->AddCommand(mycommand); - ServerInstance->AddCommand(mycommand2); - OnRehash(NULL,""); } - void Implements(char* List) + void On005Numeric(std::map& tokens) CXX11_OVERRIDE { - List[I_On005Numeric] = List[I_OnRehash] = 1; + tokens["REMOVE"]; } - virtual void On005Numeric(std::string &output) - { - output.append(" REMOVE"); - } - - virtual void OnRehash(userrec* user, const std::string&) - { - ConfigReader conf(ServerInstance); - supportnokicks = conf.ReadFlag("remove", "supportnokicks", 0); - } - - virtual ~ModuleRemove() - { - delete mycommand; - delete mycommand2; - } - - virtual Version GetVersion() + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - return Version(1,1,1,0,VF_VENDOR,API_VERSION); + ConfigTag* tag = ServerInstance->Config->ConfValue("remove"); + supportnokicks = tag->getBool("supportnokicks"); + cmd1.protectedrank = cmd2.protectedrank = tag->getUInt("protectedrank", 50000); } - -}; -// stuff down here is the module-factory stuff. For basic modules you can ignore this. - -class ModuleRemoveFactory : public ModuleFactory -{ - public: - ModuleRemoveFactory() - { - } - - ~ModuleRemoveFactory() + 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); } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleRemove(Me); - } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleRemoveFactory; -} +MODULE_INIT(ModuleRemove)