X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_jumpserver.cpp;h=02950e0e97c3c12e85dbfc4016708442e441830e;hb=26a80ed2c783bda2bc7abca9dd435b86f3ce2eeb;hp=e9c07f45fda18816a003a1017d8f3d150a7ff184;hpb=0b63ccd0b5cb26883d6becb196fb98e4f95d0397;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index e9c07f45f..02950e0e9 100644
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -22,6 +22,12 @@
 #include "inspircd.h"
 #include "modules/ssl.h"
 
+enum
+{
+	// From ircd-ratbox.
+	RPL_REDIR = 10
+};
+
 /** Handle /JUMPSERVER
  */
 class CommandJumpserver : public Command
@@ -32,8 +38,11 @@ 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>]";
@@ -42,7 +51,7 @@ class CommandJumpserver : public Command
 		redirect_new_users = false;
 	}
 
-	CmdResult Handle (const std::vector<std::string> &parameters, 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];
@@ -52,7 +61,7 @@ class CommandJumpserver : public Command
 		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) + "')");
@@ -94,8 +103,8 @@ class CommandJumpserver : public Command
 			}
 
 			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
@@ -116,7 +125,7 @@ class CommandJumpserver : public Command
 					++i;
 					if (!t->IsOper())
 					{
-						t->WriteNumeric(RPL_REDIR, "%s %d :Please use this Server/Port instead", 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++;
 					}
@@ -140,7 +149,7 @@ class CommandJumpserver : public Command
 
 	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;
@@ -155,15 +164,20 @@ class ModuleJumpServer : public Module
 	{
 	}
 
+	void OnModuleRehash(User* user, const std::string& param) CXX11_OVERRIDE
+	{
+		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(RPL_REDIR, "%s %d :Please use this Server/Port instead",
-				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;
 	}