X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_jumpserver.cpp;h=9ee224704ce46925b409f58601636b2af410ac1a;hb=bc8664c5c49f4ac9adbc5e3937a584e4a6b35614;hp=28694403e2b05809fbb9fbae2113ef87c456b254;hpb=4e5347348dd9fedaf4521a784db67300582ffdb3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp index 28694403e..9ee224704 100644 --- a/src/modules/m_jumpserver.cpp +++ b/src/modules/m_jumpserver.cpp @@ -1,188 +1,181 @@ -/* +------------------------------------+ - * | 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) 2007-2008 Craig Edwards + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2007 Robin Burchell * - * 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 -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "inspircd.h" -/* $ModDesc: Provides support for unreal-style SAPART command */ +#include "inspircd.h" +#include "modules/ssl.h" -/** Handle /SAPART +/** Handle /JUMPSERVER */ -class cmd_jumpserver : public command_t +class CommandJumpserver : public Command { public: - bool redirect_all_immediately; bool redirect_new_users; - bool direction; std::string redirect_to; std::string reason; int port; + int sslport; - cmd_jumpserver (InspIRCd* Instance) : command_t(Instance, "JUMPSERVER", 'o', 0) + CommandJumpserver(Module* Creator) : Command(Creator, "JUMPSERVER", 0, 4) { - this->source = "m_jumpserver.so"; - syntax = "[ <+/-a> :]"; - redirect_to = reason = ""; + flags_needed = 'o'; + syntax = "[ [:] <+/-an> ]"; port = 0; - redirect_all_immediately = redirect_new_users = false; + sslport = 0; + redirect_new_users = false; } - CmdResult Handle (const char** parameters, int pcnt, userrec *user) + CmdResult Handle (const std::vector ¶meters, User *user) { int n_done = 0; - reason = (pcnt < 4) ? "Please use this server/port instead" : parameters[3]; - redirect_all_immediately = false; + reason = (parameters.size() < 4) ? "Please use this server/port instead" : parameters[3]; + bool redirect_all_immediately = false; redirect_new_users = true; - direction = true; + bool direction = true; std::string n_done_s; /* No parameters: jumpserver disabled */ - if (!pcnt) + if (!parameters.size()) { if (port) - user->WriteServ("NOTICE %s :*** Disabled jumpserver (previously set to '%s:%d')", user->nick, redirect_to.c_str(), port); + user->WriteNotice("*** Disabled jumpserver (previously set to '" + redirect_to + ":" + ConvToStr(port) + "')"); else - user->WriteServ("NOTICE %s :*** jumpserver was not enabled.", user->nick); + user->WriteNotice("*** Jumpserver was not enabled."); port = 0; - redirect_to = ""; - return CMD_LOCALONLY; + sslport = 0; + redirect_to.clear(); + return CMD_SUCCESS; } port = 0; - redirect_to = ""; + redirect_to.clear(); - for (const char* n = parameters[2]; *n; n++) + if (parameters.size() >= 3) { - switch (*n) + for (std::string::const_iterator n = parameters[2].begin(); n != parameters[2].end(); ++n) { - case '+': - direction = true; - break; - case '-': - direction = false; - break; - case 'a': - redirect_all_immediately = direction; - break; - case 'n': - redirect_new_users = direction; - break; + switch (*n) + { + case '+': + direction = true; + break; + case '-': + direction = false; + break; + case 'a': + redirect_all_immediately = direction; + break; + case 'n': + redirect_new_users = direction; + break; + default: + user->WriteNotice("*** Invalid JUMPSERVER flag: " + ConvToStr(*n)); + return CMD_FAILURE; + break; + } } - } - if (redirect_all_immediately) - { - /* Redirect everyone but the oper sending the command */ - for (std::vector::const_iterator i = ServerInstance->local_users.begin(); i != ServerInstance->local_users.end(); i++) + size_t delimpos = parameters[1].find(':'); + port = ConvToInt(parameters[1].substr(0, delimpos ? delimpos : std::string::npos)); + sslport = (delimpos == std::string::npos ? 0 : ConvToInt(parameters[1].substr(delimpos + 1))); + + if (parameters[1].find_first_not_of("0123456789:") != std::string::npos + || parameters[1].rfind(':') != delimpos + || port > 65535 || sslport > 65535) { - userrec* t = *i; - if (!IS_OPER(t)) - { - t->WriteServ("010 %s %s %s :%s", user->nick, parameters[0], parameters[1], reason.c_str()); - userrec::QuitUser(ServerInstance, t, reason); - n_done++; - } + user->WriteNotice("*** Invalid port number"); + return CMD_FAILURE; } - if (n_done) + + if (redirect_all_immediately) { - n_done_s = ConvToStr(n_done); + /* Redirect everyone but the oper sending the command */ + for (UserManager::LocalList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); ++i) + { + LocalUser* t = *i; + if (!t->IsOper()) + { + t->WriteNumeric(RPL_REDIR, "%s %d :Please use this Server/Port instead", parameters[0].c_str(), GetPort(t)); + ServerInstance->Users->QuitUser(t, reason); + n_done++; + } + } + if (n_done) + { + n_done_s = ConvToStr(n_done); + } } - } - if (redirect_new_users) - { - redirect_to = parameters[0]; - port = atoi(parameters[1]); + if (redirect_new_users) + redirect_to = parameters[0]; + + user->WriteNotice("*** Set jumpserver to server '" + parameters[0] + "' port '" + (port ? ConvToStr(port) : "Auto") + ", SSL " + (sslport ? ConvToStr(sslport) : "Auto") + "', flags '+" + + (redirect_all_immediately ? "a" : "") + (redirect_new_users ? "n'" : "'") + + (n_done ? " (" + n_done_s + "user(s) redirected): " : ": ") + reason); } - user->WriteServ("NOTICE %s :*** Set jumpserver to server '%s' port '%s', flags '+%s%s'%s%s%s: %s", user->nick, parameters[0], parameters[1], - redirect_all_immediately ? "a" : "", - redirect_new_users ? "n" : "", - n_done ? " (" : "", - n_done ? n_done_s.c_str() : "", - n_done ? " user(s) redirected)" : "", - reason.c_str()); + return CMD_SUCCESS; + } - return CMD_LOCALONLY; + int GetPort(LocalUser* user) + { + int p = (SSLClientCert::GetCertificate(&user->eh) ? sslport : port); + if (p == 0) + p = user->GetServerPort(); + return p; } }; - class ModuleJumpServer : public Module { - cmd_jumpserver* js; + CommandJumpserver js; public: - ModuleJumpServer(InspIRCd* Me) - : Module::Module(Me) - { - - js = new cmd_jumpserver(ServerInstance); - ServerInstance->AddCommand(js); - } - - virtual ~ModuleJumpServer() + ModuleJumpServer() : js(this) { } - virtual int OnUserRegister(userrec* user) + ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE { - if (js->port && js->redirect_new_users) + if (js.redirect_new_users) { - user->WriteServ("010 %s %s %d :%s", user->nick, js->redirect_to.c_str(), js->port, js->reason.c_str()); - userrec::QuitUser(ServerInstance, user, js->reason); - return 0; + int port = js.GetPort(user); + user->WriteNumeric(RPL_REDIR, "%s %d :Please use this Server/Port instead", + js.redirect_to.c_str(), port); + ServerInstance->Users->QuitUser(user, js.reason); + return MOD_RES_PASSTHRU; } - return 0; + return MOD_RES_PASSTHRU; } - virtual void Implements(char* List) + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - List[I_OnUserRegister] = 1; + // Emergency way to unlock + if (!status.srcuser) + js.redirect_new_users = false; } - virtual Version GetVersion() - { - return Version(1,1,0,1,VF_VENDOR,API_VERSION); - } - -}; - -class ModuleJumpServerFactory : public ModuleFactory -{ - public: - ModuleJumpServerFactory() + Version GetVersion() CXX11_OVERRIDE { + return Version("Provides support for the RPL_REDIR numeric and the /JUMPSERVER command.", VF_VENDOR); } - - ~ModuleJumpServerFactory() - { - } - - virtual Module * CreateModule(InspIRCd* Me) - { - return new ModuleJumpServer(Me); - } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleJumpServerFactory; -} - +MODULE_INIT(ModuleJumpServer)