Prevent using invalid UIDs and enforce UID/SID matching

[user/henk/code/inspircd.git] / src / modules / m_jumpserver.cpp

diff --git a/src/modules/m_jumpserver.cpp b/src/modules/m_jumpserver.cpp
index ad516328adff9fe5da97bb543af5bf4c79b01214..416b25dd3e4b54eee0c23fad14867835b3c9c982 100644 (file)
--- a/src/modules/m_jumpserver.cpp
+++ b/src/modules/m_jumpserver.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -27,10 +27,9 @@ class CommandJumpserver : public Command
        std::string reason;
        int port;
 
-       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>]";
+               flags_needed = 'o'; syntax = "[<server> <port> <+/-an> <reason>]";
                redirect_to.clear();
                reason.clear();
                port = 0;
@@ -56,7 +55,7 @@ class CommandJumpserver : public Command
 
                        port = 0;
                        redirect_to.clear();
-                       return CMD_LOCALONLY;
+                       return CMD_SUCCESS;
                }
 
                port = 0;
@@ -80,13 +79,23 @@ class CommandJumpserver : public Command
                                        case 'n':
                                                redirect_new_users = direction;
                                        break;
+                                       default:
+                                               user->WriteServ("NOTICE %s :*** Invalid JUMPSERVER flag: %c", user->nick.c_str(), *n);
+                                               return CMD_FAILURE;
+                                       break;
                                }
                        }
 
+                       if (!atoi(parameters[1].c_str()))
+                       {
+                               user->WriteServ("NOTICE %s :*** Invalid port number", user->nick.c_str());
+                               return CMD_FAILURE;
+                       }
+
                        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++)
+                               for (std::vector<LocalUser*>::const_iterator i = ServerInstance->Users->local_users.begin(); i != ServerInstance->Users->local_users.end(); i++)
                                {
                                        User* t = *i;
                                        if (!IS_OPER(t))
@@ -117,44 +126,47 @@ class CommandJumpserver : public Command
                                        reason.c_str());
                }
 
-               return CMD_LOCALONLY;
+               return CMD_SUCCESS;
        }
 };
 
 
 class ModuleJumpServer : public Module
 {
-       CommandJumpserver*      js;
+       CommandJumpserver js;
  public:
-       ModuleJumpServer(InspIRCd* Me)
-               : Module(Me)
+       ModuleJumpServer() : js(this)
        {
-
-               js = new CommandJumpserver(ServerInstance);
-               ServerInstance->AddCommand(js);
-               Implementation eventlist[] = { I_OnUserRegister };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
+               ServerInstance->AddCommand(&js);
+               Implementation eventlist[] = { I_OnUserRegister, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
        virtual ~ModuleJumpServer()
        {
        }
 
-       virtual int OnUserRegister(User* user)
+       virtual ModResult OnUserRegister(LocalUser* user)
        {
-               if (js->port && js->redirect_new_users)
+               if (js.port && js.redirect_new_users)
                {
-                       user->WriteNumeric(10, "%s %s %d :Please use this Server/Port instead", user->nick.c_str(), js->redirect_to.c_str(), js->port);
-                       ServerInstance->Users->QuitUser(user, js->reason);
-                       return 0;
+                       user->WriteNumeric(10, "%s %s %d :Please use this Server/Port instead",
+                               user->nick.c_str(), js.redirect_to.c_str(), js.port);
+                       ServerInstance->Users->QuitUser(user, js.reason);
+                       return MOD_RES_PASSTHRU;
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
+       virtual void OnRehash(User* user)
+       {
+               // Emergency way to unlock
+               if (!user) js.redirect_new_users = false;
+       }
 
        virtual Version GetVersion()
        {
-               return Version("$Id$", VF_VENDOR, API_VERSION);
+               return Version("Provides support for the RPL_REDIR numeric", VF_VENDOR);
        }
 
 };