X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_remove.cpp;h=cf139f4a3d5dbe9032039dd18009e5ad872e3fff;hb=402a1bb010522a35600325c1a3084e092b40ca22;hp=7662ef5d44a85efb37ea92ce4249dfb52ecacdd9;hpb=a7b0c26a4c56440e4bc5ddc6d3ecfeb36089dbb2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index 7662ef5d4..cf139f4a3 100644 --- a/src/modules/m_remove.cpp +++ b/src/modules/m_remove.cpp @@ -1,193 +1,240 @@ -/* 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" -#include "helperfuncs.h" +/* + * 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" /* $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. */ -static 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) +/** Base class for /FPART and /REMOVE + */ +class RemoveBase : public Command { - const char* n = privs.c_str(); + private: + bool& supportnokicks; - switch (*n) - { - case '~': - return 5; - break; - case '&': - return 4; - break; - case '@': - return 3; - break; - case '%': - return 2; - break; - default: - return 1; - break; - } - return 1; -} - -class cmd_remove : public command_t -{ public: - cmd_remove () : command_t("REMOVE", 0, 2) + RemoveBase(Module* Creator, bool& snk, const char* cmdn) + : Command(Creator, cmdn, 2, 3), supportnokicks(snk) { - this->source = "m_remove.so"; } - void Handle (char **parameters, int pcnt, userrec *user) + CmdResult HandleRMB(const std::vector& parameters, User *user, bool neworder) { - userrec* target; - chanrec* channel; - int tlevel, ulevel; - std::string tprivs, uprivs, reason; - - + User* target; + Channel* channel; + std::string reason; + std::string protectkey; + std::string founderkey; + bool hasnokicks; + + /* 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 */ - target = Srv->FindNick(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 */ - channel = Srv->FindChannel(parameters[1]); + channel = ServerInstance->FindChan(channame); /* Fix by brain - someone needs to learn to validate their input! */ - if (!target || !channel) + if ((!target) || (target->registered != REG_ALL) || (!channel)) { - WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, !target ? parameters[0] : parameters[1]); - return; + user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), !channel ? channame.c_str() : username.c_str()); + return CMD_FAILURE; } - /* And see if the person calling the command has access to use it on the channel */ - uprivs = Srv->ChanMode(user, channel); - - /* Check what privs the person being removed has */ - tprivs = Srv->ChanMode(target, channel); + if (!channel->HasUser(target)) + { + user->WriteServ( "NOTICE %s :*** The user %s is not on channel %s", user->nick.c_str(), target->nick.c_str(), channel->name.c_str()); + return CMD_FAILURE; + } - if(pcnt > 2) - reason = "Removed by " + std::string(user->nick) + ":"; - else - reason = "Removed by " + std::string(user->nick); - - /* This turns all the parameters after the first two into a single string, so the part reason can be multi-word */ - for (int n = 2; n < pcnt; n++) + int ulevel = channel->GetPrefixValue(user); + int tlevel = channel->GetPrefixValue(target); + + hasnokicks = (ServerInstance->Modules->Find("m_nokicks.so") && channel->IsModeSet('Q')); + + if (ServerInstance->ULine(target->server)) { - reason += " "; - reason += parameters[n]; + user->WriteNumeric(482, "%s %s :Only a u-line may remove a u-line from a channel.", user->nick.c_str(), channame.c_str()); + 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))) - uprivs = "&"; - if (user->GetExt("cm_founder_"+std::string(channel->name))) - uprivs = "~"; - - /* Now it's the same idea, except for the target */ - if (target->GetExt("cm_protect_"+std::string(channel->name))) - tprivs = "&"; - if (target->GetExt("cm_founder_"+std::string(channel->name))) - tprivs = "~"; - - tlevel = chartolevel(tprivs); - ulevel = chartolevel(uprivs); - - /* If the user calling the command is either an admin, owner, operator or a half-operator on the channel */ - if (ulevel > 1) + + /* 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)) { - /* 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 && tlevel != 5) + /* 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. + */ + if ((!IS_LOCAL(user)) || ((ulevel > VOICE_VALUE) && (ulevel >= tlevel) && (tlevel != 50000))) { - Srv->PartUserFromChannel(target, channel->name, reason); - WriteServ(user->fd, "NOTICE %s :%s removed %s from the channel", channel->name, user->nick, target->nick); - WriteServ(target->fd, "NOTICE %s :*** %s removed you from %s with the message:%s", target->nick, user->nick, channel->name, reason.c_str()); + // REMOVE/FPART 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)) + 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->WriteChannelWithServ(ServerInstance->Config->ServerName, "NOTICE %s :%s removed %s from the channel", channel->name.c_str(), user->nick.c_str(), target->nick.c_str()); + target->WriteServ("NOTICE %s :*** %s removed you from %s with the message: %s", target->nick.c_str(), user->nick.c_str(), channel->name.c_str(), reasonparam.c_str()); + + channel->PartUser(target, reason); } else { - WriteServ(user->fd, "NOTICE %s :*** You do not have access to /remove %s from %s", user->nick, target->nick, channel->name); + user->WriteServ( "NOTICE %s :*** You do not have access to /remove %s from %s", user->nick.c_str(), target->nick.c_str(), channel->name.c_str()); + return CMD_FAILURE; } } else { - WriteServ(user->fd, "NOTICE %s :*** You do not have access to use /remove on %s", user->nick, channel->name); + /* 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.c_str(), channel->name.c_str(), target->nick.c_str()); + return CMD_FAILURE; } + + return CMD_SUCCESS; } + virtual RouteDescriptor GetRouting(User* user, const std::vector& parameters) = 0; }; -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) + : RemoveBase(Creator, snk, "REMOVE") { - Srv = Me; - mycommand = new cmd_remove(); - Srv->AddCommand(mycommand); + syntax = " []"; + TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END); } - 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) + RouteDescriptor GetRouting(User* user, const std::vector& parameters) { - output = output + std::string(" REMOVE"); + User* dest = ServerInstance->FindNick(parameters[0]); + if (dest) + return ROUTE_OPT_UCAST(dest->server); + return ROUTE_LOCALONLY; } - - virtual ~ModuleRemove() +}; + +/** Handle /FPART + */ +class CommandFpart : public RemoveBase +{ + public: + CommandFpart(Module* Creator, bool& snk) + : RemoveBase(Creator, snk, "FPART") { + syntax = " []"; + TRANSLATE4(TR_TEXT, TR_NICK, TR_TEXT, TR_END); } - - 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. + RouteDescriptor GetRouting(User* user, const std::vector& parameters) + { + User* dest = ServerInstance->FindNick(parameters[1]); + if (dest) + return ROUTE_OPT_UCAST(dest->server); + return ROUTE_LOCALONLY; + } +}; -class ModuleRemoveFactory : public ModuleFactory +class ModuleRemove : public Module { + CommandRemove cmd1; + CommandFpart cmd2; + bool supportnokicks; + + public: - ModuleRemoveFactory() + ModuleRemove() : cmd1(this, supportnokicks), cmd2(this, supportnokicks) { } - - ~ModuleRemoveFactory() + + void init() { + ServerInstance->Modules->AddService(cmd1); + ServerInstance->Modules->AddService(cmd2); + OnRehash(NULL); + Implementation eventlist[] = { I_On005Numeric, I_OnRehash }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } - - virtual Module * CreateModule(Server* Me) + + virtual void On005Numeric(std::string &output) { - return new ModuleRemove(Me); + output.append(" REMOVE"); } - -}; + virtual void OnRehash(User* user) + { + supportnokicks = ServerInstance->Config->ConfValue("remove")->getBool("supportnokicks"); + } -extern "C" void * init_module( void ) -{ - return new ModuleRemoveFactory; -} + virtual ~ModuleRemove() + { + } + + virtual Version GetVersion() + { + 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); + } + +}; + +MODULE_INIT(ModuleRemove)