Add sanity checks to the ssl modules so that theres no possibility of an out of range...

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

diff --git a/src/modules/m_opermodes.cpp b/src/modules/m_opermodes.cpp
index 628f0a40d14193961b65affc1cf980543bc9b9d4..fea793c0416b66f24bb6c44e4529b1366adb63a4 100644 (file)
--- a/src/modules/m_opermodes.cpp
+++ b/src/modules/m_opermodes.cpp
@@ -2,24 +2,16 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *               <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "inspircd.h"
 
 /* $ModDesc: Sets (and unsets) modes on opers when they oper up */
 
@@ -27,79 +19,88 @@ class ModuleModesOnOper : public Module
 {
  private:
 
-       Server *Srv;
+       
        ConfigReader *Conf;
 
  public:
-       ModuleModesOnOper(Server* Me)
-               : Module::Module(Me)
+       ModuleModesOnOper(InspIRCd* Me)
+               : Module(Me)
        {
-               Srv = Me;
-               Conf = new ConfigReader;
+               
+               Conf = new ConfigReader(ServerInstance);
        }
 
        void Implements(char* List)
        {
-               List[I_OnOper] = 1;
+               List[I_OnPostOper] = List[I_OnRehash] = 1;
+       }
+
+       virtual void OnRehash(userrec* user, const std::string &parameter)
+       {
+               DELETE(Conf);
+               Conf = new ConfigReader(ServerInstance);
        }
        
        virtual ~ModuleModesOnOper()
        {
-               delete Conf;
+               DELETE(Conf);
        }
        
        virtual Version GetVersion()
        {
-               return Version(1,0,0,1,VF_VENDOR);
+               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
        }
        
-       virtual void OnOper(userrec* user, std::string opertype)
+       virtual void OnPostOper(userrec* user, const std::string &opertype)
        {
                // whenever a user opers, go through the oper types, find their <type:modes>,
                // and if they have one apply their modes. The mode string can contain +modes
                // to add modes to the user or -modes to take modes from the user.
-                for (int j =0; j < Conf->Enumerate("type"); j++)
-                {
-                        std::string typen = Conf->ReadValue("type","name",j);
-                        if (!strcmp(typen.c_str(),user->oper))
-                        {
-                                std::string ThisOpersModes = Conf->ReadValue("type","modes",j);
-                               if (ThisOpersModes != "")
+               for (int j =0; j < Conf->Enumerate("type"); j++)
+               {
+                       std::string typen = Conf->ReadValue("type","name",j);
+                       if (!strcmp(typen.c_str(),user->oper))
+                       {
+                               std::string ThisOpersModes = Conf->ReadValue("type","modes",j);
+                               if (!ThisOpersModes.empty())
                                {
-                                       char* modes[2];
+                                       char first = *(ThisOpersModes.c_str());
+                                       if ((first != '+') && (first != '-'))
+                                               ThisOpersModes = "+" + ThisOpersModes;
+
+                                       std::string buf;
+                                       stringstream ss(ThisOpersModes);
+                                       vector<string> tokens;
+
+                                       // split ThisOperModes into modes and mode params
+                                       while (ss >> buf)
+                                               tokens.push_back(buf);
+
+                                       int size = tokens.size() + 1;
+                                       const char** modes = new const char*[size];
                                        modes[0] = user->nick;
-                                       modes[1] = (char*)ThisOpersModes.c_str();
-                                       Srv->SendMode(modes,2,user);
-                               }
-                                break;
-                        }
-                }
-       }
-};
 
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
+                                       // process mode params
+                                       int i = 1;
+                                       for (unsigned int k = 0; k < tokens.size(); k++)
+                                       {
+                                               modes[i] = tokens[k].c_str();
+                                               i++;
+                                       }
 
-class ModuleModesOnOperFactory : public ModuleFactory
-{
- public:
-       ModuleModesOnOperFactory()
-       {
-       }
-       
-       ~ModuleModesOnOperFactory()
-       {
-       }
-       
-       virtual Module * CreateModule(Server* Me)
-       {
-               return new ModuleModesOnOper(Me);
+                                       std::deque<std::string> n;
+                                       Event rmode((char *)&n, NULL, "send_mode_explicit");
+                                       for (unsigned int j = 0; j < tokens.size(); j++)
+                                               n.push_back(modes[j]);
+
+                                       rmode.Send(ServerInstance);
+                                       ServerInstance->SendMode(modes, size, user);
+                                       delete [] modes;
+                               }
+                               break;
+                       }
+               }
        }
-       
 };
 
-
-extern "C" void * init_module( void )
-{
-       return new ModuleModesOnOperFactory;
-}
-
+MODULE_INIT(ModuleModesOnOper)