X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_samode.cpp;h=b1642e47085b9ce4b3a61b096ce9a37460a7b556;hb=e59cb85871f75b7603c63c6cd274d57536cf6794;hp=fb379310f3dc1bdee95aa62d0e5cf2fd0b699743;hpb=94afde43b086f092bf8128d76d418cb63840e8eb;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_samode.cpp b/src/modules/m_samode.cpp index fb379310f..b1642e470 100644 --- a/src/modules/m_samode.cpp +++ b/src/modules/m_samode.cpp @@ -1,17 +1,24 @@ -/* +------------------------------------+ - * | 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) 2007 Dennis Friis + * Copyright (C) 2006-2007 Robin Burchell + * Copyright (C) 2004-2005 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 . */ -/* $ModDesc: Provides more advanced UnrealIRCd SAMODE command */ #include "inspircd.h" @@ -19,73 +26,112 @@ */ class CommandSamode : public Command { + bool logged; + public: - CommandSamode (InspIRCd* Instance) : Command(Instance,"SAMODE", 'o', 2, false, 0) + bool active; + CommandSamode(Module* Creator) : Command(Creator,"SAMODE", 2) { - this->source = "m_samode.so"; - syntax = " {}"; + allow_empty_last_param = false; + flags_needed = 'o'; syntax = " (+|-) []"; + active = false; } - CmdResult Handle (const char** parameters, int pcnt, User *user) + CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE { - /* - * Handles an SAMODE request. Notifies all +s users. - */ - ServerInstance->SendMode(parameters, pcnt, ServerInstance->FakeClient); - - if (ServerInstance->Modes->GetLastParse().length()) + if (parameters[0].c_str()[0] != '#') { - ServerInstance->SNO->WriteToSnoMask('O', std::string(user->nick) + " used SAMODE: " + ServerInstance->Modes->GetLastParse()); - - std::deque n; - irc::spacesepstream spaced(ServerInstance->Modes->GetLastParse()); - std::string one = "*"; - while (spaced.GetToken(one)) - n.push_back(one); - - Event rmode((char *)&n, NULL, "send_mode"); - rmode.Send(ServerInstance); - - n.clear(); - n.push_back(std::string(user->nick) + " used SAMODE: " + ServerInstance->Modes->GetLastParse()); - Event rmode2((char *)&n, NULL, "send_opers"); - rmode2.Send(ServerInstance); - - /* XXX: Yes, this is right. We dont want to propagate the - * actual SAMODE command, just the MODE command generated - * by the send_mode - */ - return CMD_LOCALONLY; + User* target = ServerInstance->FindNickOnly(parameters[0]); + if ((!target) || (target->registered != REG_ALL)) + { + user->WriteNumeric(Numerics::NoSuchNick(parameters[0])); + return CMD_FAILURE; + } + + // Changing the modes of another user requires a special permission + if ((target != user) && (!user->HasPrivPermission("users/samode-usermodes"))) + { + user->WriteNotice("*** You are not allowed to /SAMODE other users (the privilege users/samode-usermodes is needed to /SAMODE others)."); + return CMD_FAILURE; + } } - else + + // XXX: Make ModeParser clear LastParse + Modes::ChangeList emptychangelist; + ServerInstance->Modes->ProcessSingle(ServerInstance->FakeClient, NULL, ServerInstance->FakeClient, emptychangelist); + + logged = false; + this->active = true; + ServerInstance->Parser.CallHandler("MODE", parameters, user); + this->active = false; + + if (!logged) { - user->WriteServ("NOTICE %s :*** Invalid SAMODE sequence.", user->nick); + // If we haven't logged anything yet then the client queried the list of a listmode + // (e.g. /SAMODE #chan b), which was handled internally by the MODE command handler. + // + // Viewing the modes of a user or a channel could also result in this, but + // that is not possible with /SAMODE because we require at least 2 parameters. + LogUsage(user, stdalgo::string::join(parameters)); } - return CMD_FAILURE; + return CMD_SUCCESS; + } + + void LogUsage(const User* user, const std::string& text) + { + logged = true; + ServerInstance->SNO->WriteGlobalSno('a', user->nick + " used SAMODE: " + text); } }; class ModuleSaMode : public Module { - CommandSamode* mycommand; + CommandSamode cmd; public: - ModuleSaMode(InspIRCd* Me) - : Module(Me) + ModuleSaMode() + : cmd(this) { - - mycommand = new CommandSamode(ServerInstance); - ServerInstance->AddCommand(mycommand); + } + Version GetVersion() CXX11_OVERRIDE + { + return Version("Provides the SAMODE command, allows opers to change modes on channels and users", VF_VENDOR); } - - virtual ~ModuleSaMode() + + ModResult OnPreMode(User* source, User* dest, Channel* channel, Modes::ChangeList& modes) CXX11_OVERRIDE { + if (cmd.active) + return MOD_RES_ALLOW; + return MOD_RES_PASSTHRU; } - - virtual Version GetVersion() + + void OnMode(User* user, User* destuser, Channel* destchan, const Modes::ChangeList& modes, ModeParser::ModeProcessFlag processflags) CXX11_OVERRIDE { - return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION); + if (!cmd.active) + return; + + std::string logtext = (destuser ? destuser->nick : destchan->name); + logtext.push_back(' '); + logtext += ClientProtocol::Messages::Mode::ToModeLetters(modes); + + for (Modes::ChangeList::List::const_iterator i = modes.getlist().begin(); i != modes.getlist().end(); ++i) + { + const Modes::Change& item = *i; + if (!item.param.empty()) + logtext.append(1, ' ').append(item.param); + } + + cmd.LogUsage(user, logtext); + } + + void Prioritize() CXX11_OVERRIDE + { + Module* disable = ServerInstance->Modules->Find("m_disable.so"); + ServerInstance->Modules->SetPriority(this, I_OnRawMode, PRIORITY_BEFORE, disable); + + Module *override = ServerInstance->Modules->Find("m_override.so"); + ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_BEFORE, override); } };