]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_dccallow.cpp
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_dccallow.cpp
index 5fb64a27ef9747679e329c3520b07de31863382f..fd9e329cd17ad6f235d9a65ef7ab316a5e85dd25 100644 (file)
@@ -1,13 +1,16 @@
- /* m_dccallow - Jamie Penman-Smithson <jamie@silverdream.org> - September 2006 */
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  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 <vector>
-#include <string.h>
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 #include "inspircd.h"
 
 /* $ModDesc: Povides support for the /DCCALLOW command */
@@ -48,6 +51,7 @@ class cmd_dccallow : public command_t
        {
                this->source = "m_dccallow.so";
                syntax = "{[+|-]<nick> <time>|HELP|LIST}";
+               /* XXX we need to fix this so it can work with translation stuff (i.e. move +- into a seperate param */
        }
 
        CmdResult Handle(const char **parameters, int pcnt, userrec *user)
@@ -85,7 +89,6 @@ class cmd_dccallow : public command_t
        
                        if (target)
                        {
-                               ServerInstance->Log(DEBUG, "m_dccallow.so: got target %s and action %c", target->nick, action);
                                
                                if (action == '-')
                                {
@@ -109,7 +112,7 @@ class cmd_dccallow : public command_t
                                        }
                                        else
                                        {
-                                               DELETE(dl);
+                                               delete  dl;
                                                user->Shrink("dccallow_list");
                                
                                                // remove from userlist
@@ -156,7 +159,7 @@ class cmd_dccallow : public command_t
                                        long length;
                                        if (pcnt < 2)
                                        {
-                                               length = ServerInstance->Duration(default_length.c_str());
+                                               length = ServerInstance->Duration(default_length);
                                        } 
                                        else if (!atoi(parameters[1]))
                                        {
@@ -182,7 +185,8 @@ class cmd_dccallow : public command_t
                                        {
                                                user->WriteServ("994 %s %s :Added %s to DCCALLOW list for this session", user->nick, user->nick, target->nick);
                                        }
-                               
+
+                                       /* route it. */
                                        return CMD_SUCCESS;
                                }
                        }
@@ -245,7 +249,7 @@ class ModuleDCCAllow : public Module
  public:
 
        ModuleDCCAllow(InspIRCd* Me)
-               : Module::Module(Me)
+               : Module(Me)
        {
                Conf = new ConfigReader(ServerInstance);
                mycommand = new cmd_dccallow(ServerInstance);
@@ -258,13 +262,13 @@ class ModuleDCCAllow : public Module
                List[I_OnUserPreMessage] = List[I_OnUserPreNotice] = List[I_OnUserQuit] = List[I_OnUserPreNick] = List[I_OnRehash] = 1;
        }
 
-       virtual void OnRehash(const std::string &parameter)
+       virtual void OnRehash(userrec* user, const std::string &parameter)
        {
                delete Conf;
                Conf = new ConfigReader(ServerInstance);
        }
 
-       virtual void OnUserQuit(userrec* user, const std::string &reason)
+       virtual void OnUserQuit(userrec* user, const std::string &reason, const std::string &oper_message)
        {
                dccallowlist* dl;
        
@@ -272,7 +276,7 @@ class ModuleDCCAllow : public Module
                user->GetExt("dccallow_list", dl);
                if (dl)
                {
-                       DELETE(dl);
+                       delete dl;
                        user->Shrink("dccallow_list");
                        RemoveFromUserlist(user);
                }
@@ -289,15 +293,16 @@ class ModuleDCCAllow : public Module
                return 0;
        }
 
-       virtual int OnUserPreMessage(userrec* user, void* dest, int target_type, std::string &text, char status)
+       virtual int OnUserPreMessage(userrec* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               return OnUserPreNotice(user, dest, target_type, text, status);
+               return OnUserPreNotice(user, dest, target_type, text, status, exempt_list);
        }
 
-       virtual int OnUserPreNotice(userrec* user, void* dest, int target_type, std::string &text, char status)
+       virtual int OnUserPreNotice(userrec* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
        {
-               Expire();
-       
+               if (!IS_LOCAL(user))
+                       return 0;
+
                if (target_type == TYPE_USER)
                {
                        userrec* u = (userrec*)dest;
@@ -308,6 +313,8 @@ class ModuleDCCAllow : public Module
                
                        if ((text.length()) && (text[0] == '\1'))
                        {
+                               Expire();
+
                                // :jamie!jamie@test-D4457903BA652E0F.silverdream.org PRIVMSG eimaj :DCC SEND m_dnsbl.cpp 3232235786 52650 9676
                                // :jamie!jamie@test-D4457903BA652E0F.silverdream.org PRIVMSG eimaj :VERSION
                                        
@@ -315,30 +322,22 @@ class ModuleDCCAllow : public Module
                                {
                                        u->GetExt("dccallow_list", dl);
                
-                                       if (dl)
+                                       if (dl && dl->size())
                                        {
-                                               if (dl->size())
-                                               {
-                                                       for (dccallowlist::const_iterator iter = dl->begin(); iter != dl->end(); ++iter)
-                                                       {
-                                                               if (ServerInstance->MatchText(user->GetFullHost(), iter->hostmask))
-                                                               {
-                                                                       return 0;
-                                                               }
-                                                       }
-                                               }
+                                               for (dccallowlist::const_iterator iter = dl->begin(); iter != dl->end(); ++iter)
+                                                       if (ServerInstance->MatchText(user->GetFullHost(), iter->hostmask))
+                                                               return 0;
                                        }
                
                                        // tokenize
-                                       stringstream ss(text);
+                                       std::stringstream ss(text);
                                        std::string buf;
-                                       vector<string> tokens;
+                                       std::vector<std::string> tokens;
                
                                        while (ss >> buf)
                                                tokens.push_back(buf);
                
                                        irc::string type = tokens[1].c_str();
-                                       ServerInstance->Log(DEBUG, "m_dccallow.so: got DCC type %s", type.c_str());
                
                                        bool blockchat = Conf->ReadFlag("dccallow", "blockchat", 0);
                
@@ -348,29 +347,24 @@ class ModuleDCCAllow : public Module
                                                std::string filename = tokens[2];
                                        
                                                if (defaultaction == "allow") 
-                                               {
                                                        return 0;
-                                               }
                                
                                                for (unsigned int i = 0; i < bfl.size(); i++)
                                                {
                                                        if (ServerInstance->MatchText(filename, bfl[i].filemask))
                                                        {
-                                                               if (strcmp(bfl[i].action.c_str(), "allow") == 0)
-                                                               {
+                                                               if (bfl[i].action == "allow")
                                                                        return 0;
-                                                               }
                                                        }
                                                        else
                                                        {
                                                                if (defaultaction == "allow")
-                                                               {
                                                                        return 0;
-                                                               }
                                                        }
                                                        user->WriteServ("NOTICE %s :The user %s is not accepting DCC SENDs from you. Your file %s was not sent.", user->nick, u->nick, filename.c_str());
                                                        u->WriteServ("NOTICE %s :%s (%s@%s) attempted to send you a file named %s, which was blocked.", u->nick, user->nick, user->ident, user->dhost, filename.c_str());
                                                        u->WriteServ("NOTICE %s :If you trust %s and were expecting this, you can type /DCCALLOW HELP for information on the DCCALLOW system.", u->nick, user->nick);
+                                                       return 1;
                                                }
                                        }
                                        else if ((type == "CHAT") && (blockchat))
@@ -378,8 +372,8 @@ class ModuleDCCAllow : public Module
                                                user->WriteServ("NOTICE %s :The user %s is not accepting DCC CHAT requests from you.", user->nick, u->nick);
                                                u->WriteServ("NOTICE %s :%s (%s@%s) attempted to initiate a DCC CHAT session, which was blocked.", u->nick, user->nick, user->ident, user->dhost);
                                                u->WriteServ("NOTICE %s :If you trust %s and were expecting this, you can type /DCCALLOW HELP for information on the DCCALLOW system.", u->nick, user->nick);
+                                               return 1;
                                        }
-                                       return 1;
                                }
                        }
                }
@@ -415,7 +409,6 @@ class ModuleDCCAllow : public Module
                        else
                        {
                                RemoveFromUserlist(u);
-                               ServerInstance->Log(DEBUG, "m_dccallow.so: UH OH! Couldn't get DCCALLOW list for %s", u->nick);
                        }
                }
        }
@@ -487,29 +480,8 @@ class ModuleDCCAllow : public Module
 
        virtual Version GetVersion()
        {
-               return Version(1,1,0,0,VF_COMMON,API_VERSION);
+               return Version(1, 1, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
        }
 };
 
-class ModuleDCCAllowFactory : public ModuleFactory
-{
- public:
-       ModuleDCCAllowFactory()
-       {
-       }
-
-       ~ModuleDCCAllowFactory()
-       {
-       }
-
-       virtual Module * CreateModule(InspIRCd* Me)
-       {
-               return new ModuleDCCAllow(Me);
-       }
-
-};
-
-extern "C" void * init_module( void )
-{
-       return new ModuleDCCAllowFactory;
-}
+MODULE_INIT(ModuleDCCAllow)