X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_remove.cpp;h=cf139f4a3d5dbe9032039dd18009e5ad872e3fff;hb=68211809ee3111bdc9609fbd46dc3c875fbb5ea6;hp=e524b6898379e1303b9235a5461657f9b7af608b;hpb=68730d4c9701b34c962302e6410908865fb2ba28;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_remove.cpp b/src/modules/m_remove.cpp index e524b6898..cf139f4a3 100644 --- a/src/modules/m_remove.cpp +++ b/src/modules/m_remove.cpp @@ -1,21 +1,32 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * 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 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 "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. @@ -23,260 +34,207 @@ /** Base class for /FPART and /REMOVE */ -class RemoveBase +class RemoveBase : public Command { - private: + 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) + + public: + RemoveBase(Module* Creator, bool& snk, const char* cmdn) + : Command(Creator, cmdn, 2, 3), supportnokicks(snk) { - 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* const* parameters, int pcnt, User *user, bool neworder) + + CmdResult HandleRMB(const std::vector& parameters, User *user, bool neworder) { - const char* channame; - const char* username; User* target; Channel* channel; - ModeLevel tlevel; - ModeLevel ulevel; 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 ...] */ - 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 ((!target) || (target->registered != REG_ALL) || (!channel)) { - user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick, !target ? username : channame); + user->WriteNumeric(ERR_NOSUCHNICK, "%s %s :No such nick/channel", user->nick.c_str(), !channel ? channame.c_str() : username.c_str()); return CMD_FAILURE; } if (!channel->HasUser(target)) { - user->WriteServ( "NOTICE %s :*** The user %s is not on channel %s", user->nick, target->nick, channel->name); + 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; - } - - /* 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)) - { - ulevel = chartolevel("U"); - } - if (user->GetExt(founderkey)) - { - ulevel = chartolevel("~"); - } - else if (user->GetExt(protectkey)) - { - ulevel = chartolevel("&"); - } - else - { - 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)) - { - tlevel = chartolevel("U"); - } - else if (target->GetExt(founderkey)) - { - tlevel = chartolevel("~"); - } - else if (target->GetExt(protectkey)) - { - tlevel = chartolevel("&"); } - else + + 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)) { - tlevel = chartolevel(channel->GetPrefixChar(target)); + 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; } - - hasnokicks = (ServerInstance->Modules->Find("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 || !hasnokicks)) { /* 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 > PEON) && (ulevel >= tlevel) && (tlevel != OWNER))) + if ((!IS_LOCAL(user)) || ((ulevel > VOICE_VALUE) && (ulevel >= tlevel) && (tlevel != 50000))) { - // no you can't just go from a std::ostringstream to a std::string, Om. -nenolod - // but you can do this, nenolod -brain + // 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; - std::string reasonparam("No reason given"); - /* If a reason is given, use it */ - if(pcnt > 2) - { - /* Join params 2 ... pcnt - 1 (inclusive) into one */ - irc::stringjoiner reason_join(" ", parameters, 2, pcnt - 1); - reasonparam = reason_join.GetJoined(); - } + 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->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()); - 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->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 { /* 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->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; } - /* route me */ return CMD_SUCCESS; } + virtual RouteDescriptor GetRouting(User* user, const std::vector& parameters) = 0; }; /** Handle /REMOVE */ -class CommandRemove : public Command, public RemoveBase +class CommandRemove : public RemoveBase { public: - CommandRemove(InspIRCd* Instance, bool& snk) : Command(Instance, "REMOVE", 0, 2), RemoveBase(Instance, snk) + CommandRemove(Module* Creator, bool& snk) + : RemoveBase(Creator, snk, "REMOVE") { - this->source = "m_remove.so"; syntax = " []"; TRANSLATE4(TR_NICK, TR_TEXT, TR_TEXT, TR_END); } - - CmdResult Handle (const char* const* parameters, int pcnt, User *user) + + CmdResult Handle (const std::vector& parameters, User *user) + { + return HandleRMB(parameters, user, false); + } + + RouteDescriptor GetRouting(User* user, const std::vector& parameters) { - return RemoveBase::Handle(parameters, pcnt, user, false); + User* dest = ServerInstance->FindNick(parameters[0]); + if (dest) + return ROUTE_OPT_UCAST(dest->server); + return ROUTE_LOCALONLY; } }; /** Handle /FPART */ -class CommandFpart : public Command, public RemoveBase +class CommandFpart : public RemoveBase { public: - CommandFpart(InspIRCd* Instance, bool& snk) : Command(Instance, "FPART", 0, 2), RemoveBase(Instance, snk) + CommandFpart(Module* Creator, bool& snk) + : RemoveBase(Creator, snk, "FPART") { - this->source = "m_remove.so"; syntax = " []"; + TRANSLATE4(TR_TEXT, TR_NICK, TR_TEXT, TR_END); } - CmdResult Handle (const char* const* parameters, int pcnt, User *user) + CmdResult Handle (const std::vector& parameters, User *user) { - return RemoveBase::Handle(parameters, pcnt, user, true); + return HandleRMB(parameters, user, true); + } + + 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 ModuleRemove : public Module { - CommandRemove* mycommand; - CommandFpart* mycommand2; + CommandRemove cmd1; + CommandFpart cmd2; bool supportnokicks; - - + + public: - ModuleRemove(InspIRCd* Me) - : Module(Me) + ModuleRemove() : cmd1(this, supportnokicks), cmd2(this, supportnokicks) { - mycommand = new CommandRemove(ServerInstance, supportnokicks); - mycommand2 = new CommandFpart(ServerInstance, supportnokicks); - ServerInstance->AddCommand(mycommand); - ServerInstance->AddCommand(mycommand2); - OnRehash(NULL,""); - Implementation eventlist[] = { I_On005Numeric, I_OnRehash }; - ServerInstance->Modules->Attach(eventlist, this, 2); } + 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 void On005Numeric(std::string &output) { output.append(" REMOVE"); } - - virtual void OnRehash(User* user, const std::string&) + + virtual void OnRehash(User* user) { - ConfigReader conf(ServerInstance); - supportnokicks = conf.ReadFlag("remove", "supportnokicks", 0); + supportnokicks = ServerInstance->Config->ConfValue("remove")->getBool("supportnokicks"); } - + virtual ~ModuleRemove() { } - + virtual Version GetVersion() { - return Version(1, 1, 1, 0, VF_COMMON | VF_VENDOR, API_VERSION); + 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)