#include "inspircd.h"
#include "modules/ssl.h"
+enum
+{
+ // From ircd-ratbox.
+ RPL_REDIR = 10
+};
+
/** Handle /JUMPSERVER
*/
class CommandJumpserver : public Command
std::string reason;
int port;
int sslport;
+ UserCertificateAPI sslapi;
- CommandJumpserver(Module* Creator) : Command(Creator, "JUMPSERVER", 0, 4)
+ CommandJumpserver(Module* Creator)
+ : Command(Creator, "JUMPSERVER", 0, 4)
+ , sslapi(Creator)
{
flags_needed = 'o';
syntax = "[<server> <port>[:<sslport>] <+/-an> <reason>]";
redirect_new_users = false;
}
- CmdResult Handle (const std::vector<std::string> ¶meters, User *user)
+ CmdResult Handle(User* user, const Params& parameters) CXX11_OVERRIDE
{
int n_done = 0;
reason = (parameters.size() < 4) ? "Please use this server/port instead" : parameters[3];
std::string n_done_s;
/* No parameters: jumpserver disabled */
- if (!parameters.size())
+ if (parameters.empty())
{
if (port)
user->WriteNotice("*** Disabled jumpserver (previously set to '" + redirect_to + ":" + ConvToStr(port) + "')");
}
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)));
+ port = ConvToNum<int>(parameters[1].substr(0, delimpos ? delimpos : std::string::npos));
+ sslport = (delimpos == std::string::npos ? 0 : ConvToNum<int>(parameters[1].substr(delimpos + 1)));
if (parameters[1].find_first_not_of("0123456789:") != std::string::npos
|| parameters[1].rfind(':') != delimpos
if (redirect_all_immediately)
{
/* Redirect everyone but the oper sending the command */
- for (LocalUserList::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); ++i)
+ const UserManager::LocalList& list = ServerInstance->Users.GetLocalUsers();
+ for (UserManager::LocalList::const_iterator i = list.begin(); i != list.end(); )
{
+ // Quitting the user removes it from the list
LocalUser* t = *i;
+ ++i;
if (!t->IsOper())
{
- t->WriteNumeric(10, "%s %s %d :Please use this Server/Port instead", t->nick.c_str(), parameters[0].c_str(), GetPort(t));
+ t->WriteNumeric(RPL_REDIR, parameters[0], GetPort(t), "Please use this Server/Port instead");
ServerInstance->Users->QuitUser(t, reason);
n_done++;
}
int GetPort(LocalUser* user)
{
- int p = (SSLClientCert::GetCertificate(&user->eh) ? sslport : port);
+ int p = (sslapi && sslapi->GetCertificate(user) ? sslport : port);
if (p == 0)
p = user->GetServerPort();
return p;
{
}
- void init() CXX11_OVERRIDE
+ void OnModuleRehash(User* user, const std::string& param) CXX11_OVERRIDE
{
- ServerInstance->Modules->AddService(js);
+ if (irc::equals(param, "jumpserver") && js.redirect_new_users)
+ js.redirect_new_users = false;
}
ModResult OnUserRegister(LocalUser* user) CXX11_OVERRIDE
if (js.redirect_new_users)
{
int port = js.GetPort(user);
- user->WriteNumeric(10, "%s %s %d :Please use this Server/Port instead",
- user->nick.c_str(), js.redirect_to.c_str(), port);
+ user->WriteNumeric(RPL_REDIR, js.redirect_to, port, "Please use this Server/Port instead");
ServerInstance->Users->QuitUser(user, js.reason);
- return MOD_RES_PASSTHRU;
+ return MOD_RES_DENY;
}
return MOD_RES_PASSTHRU;
}
- void OnRehash(User* user) CXX11_OVERRIDE
+ void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
{
// Emergency way to unlock
- if (!user) js.redirect_new_users = false;
+ if (!status.srcuser)
+ js.redirect_new_users = false;
}
Version GetVersion() CXX11_OVERRIDE