X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_knock.cpp;h=e7e55f0e90216f5469b061ffc4199d8c5b3303f0;hb=80e81e3b81b779901fd9d67f8ae030ee30c0bcec;hp=3a104bb67b7002e9380bee5d04ea64ca9079857d;hpb=71ad308979d9c9129507fdf85d4305fd12e18bea;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_knock.cpp b/src/modules/m_knock.cpp index 3a104bb67..e7e55f0e9 100644 --- a/src/modules/m_knock.cpp +++ b/src/modules/m_knock.cpp @@ -1,163 +1,152 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. - * This program is free but copyrighted software; see - * the file COPYING for details. + * Copyright (C) 2017 B00mX0r + * Copyright (C) 2013, 2018, 2020 Sadie Powell + * Copyright (C) 2012-2013, 2016, 2018 Attila Molnar + * Copyright (C) 2012, 2019 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2009 Uli Schlachter + * Copyright (C) 2007 Robin Burchell + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2004, 2006, 2008, 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 "configreader.h" #include "inspircd.h" -/* $ModDesc: Provides support for /KNOCK and mode +K */ - - +enum +{ + // From UnrealIRCd. + ERR_CANNOTKNOCK = 480, + + // From ircd-ratbox. + RPL_KNOCK = 710, + RPL_KNOCKDLVR = 711, + ERR_CHANOPEN = 713, + ERR_KNOCKONCHAN = 714 +}; -class cmd_knock : public command_t +/** Handles the /KNOCK command + */ +class CommandKnock : public Command { + SimpleChannelModeHandler& noknockmode; + ChanModeReference inviteonlymode; + public: - cmd_knock (InspIRCd* Instance) : command_t(Instance,"KNOCK", 0, 2) + bool sendnotice; + bool sendnumeric; + CommandKnock(Module* Creator, SimpleChannelModeHandler& Noknockmode) + : Command(Creator,"KNOCK", 2, 2) + , noknockmode(Noknockmode) + , inviteonlymode(Creator, "inviteonly") { - this->source = "m_knock.so"; - syntax = " "; + syntax = " :"; + Penalty = 5; } - - CmdResult Handle (const char** parameters, int pcnt, userrec *user) - { - chanrec* c = ServerInstance->FindChan(parameters[0]); + CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE + { + Channel* c = ServerInstance->FindChan(parameters[0]); if (!c) { - user->WriteServ("401 %s %s :No such channel",user->nick, parameters[0]); + user->WriteNumeric(Numerics::NoSuchChannel(parameters[0])); return CMD_FAILURE; } - std::string line = ""; - - if (c->IsModeSet('K')) + if (c->HasUser(user)) { - user->WriteServ("480 %s :Can't KNOCK on %s, +K is set.",user->nick, c->name); + user->WriteNumeric(ERR_KNOCKONCHAN, c->name, InspIRCd::Format("Can't KNOCK on %s, you are already on that channel.", c->name.c_str())); return CMD_FAILURE; } - for (int i = 1; i < pcnt - 1; i++) + if (c->IsModeSet(noknockmode)) { - line = line + std::string(parameters[i]) + " "; + user->WriteNumeric(ERR_CANNOTKNOCK, InspIRCd::Format("Can't KNOCK on %s, +K is set.", c->name.c_str())); + return CMD_FAILURE; } - line = line + std::string(parameters[pcnt-1]); - if (c->modes[CM_INVITEONLY]) + if (!c->IsModeSet(inviteonlymode)) { - c->WriteChannelWithServ((char*)ServerInstance->Config->ServerName, "NOTICE %s :User %s is KNOCKing on %s (%s)", c->name, user->nick, c->name, line.c_str()); - user->WriteServ("NOTICE %s :KNOCKing on %s",user->nick,c->name); - return CMD_SUCCESS; - } - else - { - user->WriteServ("480 %s :Can't KNOCK on %s, channel is not invite only so knocking is pointless!",user->nick, c->name); + user->WriteNumeric(ERR_CHANOPEN, c->name, InspIRCd::Format("Can't KNOCK on %s, channel is not invite only so knocking is pointless!", c->name.c_str())); return CMD_FAILURE; } - return CMD_SUCCESS; - } -}; - -class Knock : public ModeHandler -{ - public: - Knock(InspIRCd* Instance) : ModeHandler(Instance, 'K', 0, 0, false, MODETYPE_CHANNEL, false) { } - - ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding) - { - if (adding) - { - if (!channel->IsModeSet('K')) - { - channel->SetMode('K',true); - return MODEACTION_ALLOW; - } - } - else + if (sendnotice) { - if (channel->IsModeSet('K')) - { - channel->SetMode('K',false); - return MODEACTION_ALLOW; - } + c->WriteNotice(InspIRCd::Format("User %s is KNOCKing on %s (%s)", user->nick.c_str(), c->name.c_str(), parameters[1].c_str())); + user->WriteNotice("KNOCKing on " + c->name); } - return MODEACTION_DENY; - } -}; + if (sendnumeric) + { + Numeric::Numeric numeric(RPL_KNOCK); + numeric.push(c->name).push(user->GetFullHost()).push("is KNOCKing: " + parameters[1]); -class ModuleKnock : public Module -{ - cmd_knock* mycommand; - Knock* kn; - public: - ModuleKnock(InspIRCd* Me) : Module::Module(Me) - { - - kn = new Knock(ServerInstance); - ServerInstance->AddMode(kn, 'K'); - mycommand = new cmd_knock(ServerInstance); - ServerInstance->AddCommand(mycommand); - } + ClientProtocol::Messages::Numeric numericmsg(numeric, c->name); + c->Write(ServerInstance->GetRFCEvents().numeric, numericmsg); - void Implements(char* List) - { - } + user->WriteNumeric(RPL_KNOCKDLVR, c->name, "KNOCKing on channel"); + } - virtual ~ModuleKnock() - { - ServerInstance->Modes->DelMode(kn); - DELETE(kn); + return CMD_SUCCESS; } - virtual Version GetVersion() + RouteDescriptor GetRouting(User* user, const Params& parameters) CXX11_OVERRIDE { - return Version(1,0,0,1,VF_COMMON|VF_VENDOR); + return ROUTE_OPT_BCAST; } }; -// stuff down here is the module-factory stuff. For basic modules you can ignore this. - -class ModuleKnockFactory : public ModuleFactory +class ModuleKnock : public Module { + SimpleChannelModeHandler kn; + CommandKnock cmd; + public: - ModuleKnockFactory() + ModuleKnock() + : kn(this, "noknock", 'K') + , cmd(this, kn) { } - - ~ModuleKnockFactory() + + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { + std::string knocknotify = ServerInstance->Config->ConfValue("knock")->getString("notify"); + if (stdalgo::string::equalsci(knocknotify, "numeric")) + { + cmd.sendnotice = false; + cmd.sendnumeric = true; + } + else if (stdalgo::string::equalsci(knocknotify, "both")) + { + cmd.sendnotice = true; + cmd.sendnumeric = true; + } + else + { + cmd.sendnotice = true; + cmd.sendnumeric = false; + } } - - virtual Module * CreateModule(InspIRCd* Me) + + Version GetVersion() CXX11_OVERRIDE { - return new ModuleKnock(Me); + return Version("Adds the /KNOCK command which allows users to request access to an invite-only channel and channel mode K (noknock) which allows channels to disable usage of this command.", VF_OPTCOMMON | VF_VENDOR); } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleKnockFactory; -} - +MODULE_INIT(ModuleKnock)