-/* +------------------------------------+
- * | 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) 2007-2008 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ * Copyright (C) 2007 Robin Burchell <robin+git@viroteck.net>
*
- * 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 <http://www.gnu.org/licenses/>.
*/
-#include "inspircd.h"
-/* $ModDesc: Provides support for unreal-style SAPART command */
+#include "inspircd.h"
+#include "modules/ssl.h"
-/** Handle /SAPART
+/** Handle /JUMPSERVER
*/
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;
- CommandJumpserver (InspIRCd* Instance) : Command(Instance, "JUMPSERVER", 'o', 0)
+ CommandJumpserver(Module* Creator) : Command(Creator, "JUMPSERVER", 0, 4)
{
- this->source = "m_jumpserver.so";
- syntax = "[<server> <port> <+/-a> :<reason>]";
- redirect_to.clear();
- reason.clear();
+ flags_needed = 'o';
+ syntax = "[<server> <port>[:<sslport>] <+/-an> <reason>]";
port = 0;
- redirect_all_immediately = redirect_new_users = false;
+ sslport = 0;
+ redirect_new_users = false;
}
- CmdResult Handle (const char** parameters, int pcnt, User *user)
+ CmdResult Handle (const std::vector<std::string> ¶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;
+ sslport = 0;
redirect_to.clear();
- return CMD_LOCALONLY;
+ return CMD_SUCCESS;
}
port = 0;
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<User*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->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)
{
- User* t = *i;
- if (!IS_OPER(t))
- {
- t->WriteServ("010 %s %s %s :Please use this Server/Port instead", user->nick, parameters[0], parameters[1]);
- User::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
{
- CommandJumpserver* js;
+ CommandJumpserver js;
public:
- ModuleJumpServer(InspIRCd* Me)
- : Module(Me)
- {
-
- js = new CommandJumpserver(ServerInstance);
- ServerInstance->AddCommand(js);
- Implementation eventlist[] = { I_OnUserRegister };
- ServerInstance->Modules->Attach(eventlist, this, 1);
- }
-
- virtual ~ModuleJumpServer()
+ ModuleJumpServer() : js(this)
{
}
- virtual int OnUserRegister(User* 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 :Please use this Server/Port instead", user->nick, js->redirect_to.c_str(), js->port);
- User::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;
}
+ void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+ {
+ // Emergency way to unlock
+ if (!status.srcuser)
+ js.redirect_new_users = false;
+ }
- virtual Version GetVersion()
+ Version GetVersion() CXX11_OVERRIDE
{
- return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+ return Version("Provides support for the RPL_REDIR numeric and the /JUMPSERVER command.", VF_VENDOR);
}
-
};
MODULE_INIT(ModuleJumpServer)
projects / user / henk / code / inspircd.git / blobdiff