]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_dccallow.cpp
m_dccallow Validate tokens before use
[user/henk/code/inspircd.git] / src / modules / m_dccallow.cpp
index 96e0798f55423e8853ba1c7e5be793cea39680a4..829c1d3378ce91a3229f4de51ef15a6fc7a47611 100644 (file)
@@ -1,21 +1,31 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *   Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2008 John Brooks <john.brooks@dereferenced.net>
+ *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Jamie ??? <???@???>
  *
- * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ * This file is part of InspIRCd.  InspIRCd is free software: you can
+ * redistribute it and/or modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation, version 2.
  *
- * ---------------------------------------------------
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inspircd.h"
 
-/* $ModDesc: Povides support for the /DCCALLOW command */
+#include "inspircd.h"
 
-static ConfigReader *Conf;
+/* $ModDesc: Provides support for the /DCCALLOW command */
 
 class BannedFileList
 {
@@ -43,57 +53,63 @@ typedef std::vector<DCCAllow> dccallowlist;
 dccallowlist* dl;
 typedef std::vector<BannedFileList> bannedfilelist;
 bannedfilelist bfl;
+SimpleExtItem<dccallowlist>* ext;
 
 class CommandDccallow : public Command
 {
  public:
-       CommandDccallow(InspIRCd* Me) : Command(Me, "DCCALLOW", 0, 0)
+       CommandDccallow(Module* parent) : Command(parent, "DCCALLOW", 0)
        {
-               this->source = "m_dccallow.so";
-               syntax = "{[+|-]<nick> <time>|HELP|LIST}";
+               syntax = "[(+|-)<nick> [<time>]]|[LIST|HELP]";
                /* XXX we need to fix this so it can work with translation stuff (i.e. move +- into a seperate param */
        }
 
-       CmdResult Handle(const char* const* parameters, int pcnt, User *user)
+       CmdResult Handle(const std::vector<std::string> &parameters, User *user)
        {
                /* syntax: DCCALLOW [+|-]<nick> (<time>) */
-               if (!pcnt)
+               if (!parameters.size())
                {
                        // display current DCCALLOW list
                        DisplayDCCAllowList(user);
                        return CMD_FAILURE;
                }
-               else if (pcnt > 0)
+               else if (parameters.size() > 0)
                {
-                       char action = *parameters[0];
-               
+                       char action = *parameters[0].c_str();
+
                        // if they didn't specify an action, this is probably a command
                        if (action != '+' && action != '-')
                        {
-                               if (!strcasecmp(parameters[0], "LIST"))
+                               if (!strcasecmp(parameters[0].c_str(), "LIST"))
                                {
                                        // list current DCCALLOW list
                                        DisplayDCCAllowList(user);
                                        return CMD_FAILURE;
-                               } 
-                               else if (!strcasecmp(parameters[0], "HELP"))
+                               }
+                               else if (!strcasecmp(parameters[0].c_str(), "HELP"))
                                {
                                        // display help
                                        DisplayHelp(user);
                                        return CMD_FAILURE;
                                }
+                               else
+                               {
+                                       user->WriteNumeric(998, "%s :DCCALLOW command not understood. For help on DCCALLOW, type /DCCALLOW HELP", user->nick.c_str());
+                                       return CMD_FAILURE;
+                               }
                        }
-                       
-                       std::string nick = parameters[0] + 1;
-                       User *target = ServerInstance->FindNick(nick);
-       
-                       if (target)
+
+                       std::string nick = parameters[0].substr(1);
+                       User *target = ServerInstance->FindNickOnly(nick);
+
+                       if ((target) && (!IS_SERVER(target)) && (!target->quitting) && (target->registered == REG_ALL))
                        {
-                               
+
                                if (action == '-')
                                {
                                        // check if it contains any entries
-                                       if (user->GetExt("dccallow_list", dl))
+                                       dl = ext->get(user);
+                                       if (dl)
                                        {
                                                for (dccallowlist::iterator i = dl->begin(); i != dl->end(); ++i)
                                                {
@@ -101,23 +117,7 @@ class CommandDccallow : public Command
                                                        if (i->nickname == target->nick)
                                                        {
                                                                dl->erase(i);
-                                                               user->WriteNumeric(995, "%s %s :Removed %s from your DCCALLOW list", user->nick, user->nick, target->nick);
-                                                               break;
-                                                       }
-                                               }
-                                       }
-                                       else
-                                       {
-                                               delete  dl;
-                                               user->Shrink("dccallow_list");
-                               
-                                               // remove from userlist
-                                               for (userlist::iterator j = ul.begin(); j != ul.end(); ++j)
-                                               {
-                                                       User* u = (User*)(*j);
-                                                       if (u == user)
-                                                       {
-                                                               ul.erase(j);
+                                                               user->WriteNumeric(995, "%s %s :Removed %s from your DCCALLOW list", user->nick.c_str(), user->nick.c_str(), target->nick.c_str());
                                                                break;
                                                        }
                                                }
@@ -125,36 +125,39 @@ class CommandDccallow : public Command
                                }
                                else if (action == '+')
                                {
-                                       if (!user->GetExt("dccallow_list", dl))
+                                       if (target == user)
+                                       {
+                                               user->WriteNumeric(996, "%s %s :You cannot add yourself to your own DCCALLOW list!", user->nick.c_str(), user->nick.c_str());
+                                               return CMD_FAILURE;
+                                       }
+
+                                       dl = ext->get(user);
+                                       if (!dl)
                                        {
                                                dl = new dccallowlist;
-                                               user->Extend("dccallow_list", dl);
+                                               ext->set(user, dl);
                                                // add this user to the userlist
                                                ul.push_back(user);
                                        }
+
                                        for (dccallowlist::const_iterator k = dl->begin(); k != dl->end(); ++k)
                                        {
                                                if (k->nickname == target->nick)
                                                {
-                                                       user->WriteNumeric(996, "%s %s :%s is already on your DCCALLOW list", user->nick, user->nick, target->nick);
-                                                       return CMD_FAILURE;
-                                               }
-                                               else if (ServerInstance->MatchText(user->GetFullHost(), k->hostmask))
-                                               {
-                                                       user->WriteNumeric(996, "%s %s :You cannot add yourself to your own DCCALLOW list!", user->nick, user->nick);
+                                                       user->WriteNumeric(996, "%s %s :%s is already on your DCCALLOW list", user->nick.c_str(), user->nick.c_str(), target->nick.c_str());
                                                        return CMD_FAILURE;
                                                }
                                        }
-                               
-                                       std::string mask = std::string(target->nick)+"!"+std::string(target->ident)+"@"+std::string(target->dhost);
-                                       std::string default_length = Conf->ReadValue("dccallow", "length", 0);
-               
+
+                                       std::string mask = target->nick+"!"+target->ident+"@"+target->dhost;
+                                       std::string default_length = ServerInstance->Config->ConfValue("dccallow")->getString("length");
+
                                        long length;
-                                       if (pcnt < 2)
+                                       if (parameters.size() < 2)
                                        {
                                                length = ServerInstance->Duration(default_length);
-                                       } 
-                                       else if (!atoi(parameters[1]))
+                                       }
+                                       else if (!atoi(parameters[1].c_str()))
                                        {
                                                length = 0;
                                        }
@@ -162,21 +165,21 @@ class CommandDccallow : public Command
                                        {
                                                length = ServerInstance->Duration(parameters[1]);
                                        }
-       
-                                       if (!ServerInstance->IsValidMask(mask.c_str()))
+
+                                       if (!ServerInstance->IsValidMask(mask))
                                        {
                                                return CMD_FAILURE;
                                        }
-                       
+
                                        dl->push_back(DCCAllow(target->nick, mask, ServerInstance->Time(), length));
-                       
+
                                        if (length > 0)
                                        {
-                                               user->WriteNumeric(993, "%s %s :Added %s to DCCALLOW list for %d seconds", user->nick, user->nick, target->nick, length);
+                                               user->WriteNumeric(993, "%s %s :Added %s to DCCALLOW list for %ld seconds", user->nick.c_str(), user->nick.c_str(), target->nick.c_str(), length);
                                        }
                                        else
                                        {
-                                               user->WriteNumeric(994, "%s %s :Added %s to DCCALLOW list for this session", user->nick, user->nick, target->nick);
+                                               user->WriteNumeric(994, "%s %s :Added %s to DCCALLOW list for this session", user->nick.c_str(), user->nick.c_str(), target->nick.c_str());
                                        }
 
                                        /* route it. */
@@ -186,111 +189,122 @@ class CommandDccallow : public Command
                        else
                        {
                                // nick doesn't exist
-                               user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick, nick.c_str());
+                               user->WriteNumeric(401, "%s %s :No such nick/channel", user->nick.c_str(), nick.c_str());
                                return CMD_FAILURE;
                        }
                }
                return CMD_FAILURE;
        }
 
+       RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters)
+       {
+               return ROUTE_BROADCAST;
+       }
+
        void DisplayHelp(User* user)
        {
-               user->WriteNumeric(998, "%s :DCCALLOW [<+|->nick [time]] [list] [help]", user->nick);
-               user->WriteNumeric(998, "%s :You may allow DCCs from specific users by specifying a", user->nick);
-               user->WriteNumeric(998, "%s :DCC allow for the user you want to receive DCCs from.", user->nick);
-               user->WriteNumeric(998, "%s :For example, to allow the user Brain to send you inspircd.exe", user->nick);
-               user->WriteNumeric(998, "%s :you would type:", user->nick);
-               user->WriteNumeric(998, "%s :/DCCALLOW +Brain", user->nick);
-               user->WriteNumeric(998, "%s :Brain would then be able to send you files. They would have to", user->nick);
-               user->WriteNumeric(998, "%s :resend the file again if the server gave them an error message", user->nick);
-               user->WriteNumeric(998, "%s :before you added them to your DCCALLOW list.", user->nick);
-               user->WriteNumeric(998, "%s :DCCALLOW entries will be temporary by default, if you want to add", user->nick);
-               user->WriteNumeric(998, "%s :them to your DCCALLOW list until you leave IRC, type:", user->nick);
-               user->WriteNumeric(998, "%s :/DCCALLOW +Brain 0", user->nick);
-               user->WriteNumeric(998, "%s :To remove the user from your DCCALLOW list, type:", user->nick);
-               user->WriteNumeric(998, "%s :/DCCALLOW -Brain", user->nick);
-               user->WriteNumeric(998, "%s :To see the users in your DCCALLOW list, type:", user->nick);
-               user->WriteNumeric(998, "%s :/DCCALLOW LIST", user->nick);
-               user->WriteNumeric(998, "%s :NOTE: If the user leaves IRC or changes their nickname", user->nick);
-               user->WriteNumeric(998, "%s :  they will be removed from your DCCALLOW list.", user->nick);
-               user->WriteNumeric(998, "%s :  your DCCALLOW list will be deleted when you leave IRC.", user->nick);
-               user->WriteNumeric(999, "%s :End of DCCALLOW HELP", user->nick);
+               user->WriteNumeric(998, "%s :DCCALLOW [(+|-)<nick> [<time>]]|[LIST|HELP]", user->nick.c_str());
+               user->WriteNumeric(998, "%s :You may allow DCCs from specific users by specifying a", user->nick.c_str());
+               user->WriteNumeric(998, "%s :DCC allow for the user you want to receive DCCs from.", user->nick.c_str());
+               user->WriteNumeric(998, "%s :For example, to allow the user Brain to send you inspircd.exe", user->nick.c_str());
+               user->WriteNumeric(998, "%s :you would type:", user->nick.c_str());
+               user->WriteNumeric(998, "%s :/DCCALLOW +Brain", user->nick.c_str());
+               user->WriteNumeric(998, "%s :Brain would then be able to send you files. They would have to", user->nick.c_str());
+               user->WriteNumeric(998, "%s :resend the file again if the server gave them an error message", user->nick.c_str());
+               user->WriteNumeric(998, "%s :before you added them to your DCCALLOW list.", user->nick.c_str());
+               user->WriteNumeric(998, "%s :DCCALLOW entries will be temporary by default, if you want to add", user->nick.c_str());
+               user->WriteNumeric(998, "%s :them to your DCCALLOW list until you leave IRC, type:", user->nick.c_str());
+               user->WriteNumeric(998, "%s :/DCCALLOW +Brain 0", user->nick.c_str());
+               user->WriteNumeric(998, "%s :To remove the user from your DCCALLOW list, type:", user->nick.c_str());
+               user->WriteNumeric(998, "%s :/DCCALLOW -Brain", user->nick.c_str());
+               user->WriteNumeric(998, "%s :To see the users in your DCCALLOW list, type:", user->nick.c_str());
+               user->WriteNumeric(998, "%s :/DCCALLOW LIST", user->nick.c_str());
+               user->WriteNumeric(998, "%s :NOTE: If the user leaves IRC or changes their nickname", user->nick.c_str());
+               user->WriteNumeric(998, "%s :  they will be removed from your DCCALLOW list.", user->nick.c_str());
+               user->WriteNumeric(998, "%s :  your DCCALLOW list will be deleted when you leave IRC.", user->nick.c_str());
+               user->WriteNumeric(999, "%s :End of DCCALLOW HELP", user->nick.c_str());
+
+               LocalUser* localuser = IS_LOCAL(user);
+               if (localuser)
+                       localuser->CommandFloodPenalty += 4000;
        }
-       
+
        void DisplayDCCAllowList(User* user)
        {
                 // display current DCCALLOW list
-               user->WriteNumeric(990, "%s :Users on your DCCALLOW list:", user->nick);
-       
-               if (user->GetExt("dccallow_list", dl))
+               user->WriteNumeric(990, "%s :Users on your DCCALLOW list:", user->nick.c_str());
+
+               dl = ext->get(user);
+               if (dl)
                {
                        for (dccallowlist::const_iterator c = dl->begin(); c != dl->end(); ++c)
                        {
-                               user->WriteNumeric(991, "%s %s :%s (%s)", user->nick, user->nick, c->nickname.c_str(), c->hostmask.c_str());
+                               user->WriteNumeric(991, "%s %s :%s (%s)", user->nick.c_str(), user->nick.c_str(), c->nickname.c_str(), c->hostmask.c_str());
                        }
                }
-               
-               user->WriteNumeric(992, "%s :End of DCCALLOW list", user->nick);
-       }                       
+
+               user->WriteNumeric(992, "%s :End of DCCALLOW list", user->nick.c_str());
+       }
 
 };
-       
+
 class ModuleDCCAllow : public Module
 {
-       CommandDccallow* mycommand;
+       CommandDccallow cmd;
  public:
 
-       ModuleDCCAllow(InspIRCd* Me)
-               : Module(Me)
+       ModuleDCCAllow()
+               : cmd(this)
        {
-               Conf = new ConfigReader(ServerInstance);
-               mycommand = new CommandDccallow(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
-               ReadFileConf();
-               Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserQuit, I_OnUserPreNick, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, 5);
+               ext = NULL;
        }
 
+       void init()
+       {
+               ext = new SimpleExtItem<dccallowlist>("dccallow", this);
+               ServerInstance->Modules->AddService(*ext);
+               ServerInstance->Modules->AddService(cmd);
+               ReadFileConf();
+               Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserQuit, I_OnUserPostNick, I_OnRehash };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+       }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
-               delete Conf;
-               Conf = new ConfigReader(ServerInstance);
+               ReadFileConf();
        }
 
        virtual void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message)
        {
-               dccallowlist* udl;
-       
+               dccallowlist* udl = ext->get(user);
+
                // remove their DCCALLOW list if they have one
-               if (user->GetExt("dccallow_list", udl))
+               if (udl)
                {
-                       delete udl;
-                       user->Shrink("dccallow_list");
-                       RemoveFromUserlist(user);
+                       userlist::iterator it = std::find(ul.begin(), ul.end(), user);
+                       if (it != ul.end())
+                               ul.erase(it);
                }
-               
+
                // remove them from any DCCALLOW lists
                // they are currently on
                RemoveNick(user);
        }
 
-
-       virtual int OnUserPreNick(User* user, const std::string &newnick)
+       virtual void OnUserPostNick(User* user, const std::string &oldnick)
        {
                RemoveNick(user);
-               return 0;
        }
 
-       virtual int OnUserPreMessage(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual ModResult OnUserPreMessage(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
        {
                return OnUserPreNotice(user, dest, target_type, text, status, exempt_list);
        }
 
-       virtual int OnUserPreNotice(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual ModResult OnUserPreNotice(User* user, void* dest, int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (!IS_LOCAL(user))
-                       return 0;
+                       return MOD_RES_PASSTHRU;
 
                if (target_type == TYPE_USER)
                {
@@ -298,90 +312,103 @@ class ModuleDCCAllow : public Module
 
                        /* Always allow a user to dcc themselves (although... why?) */
                        if (user == u)
-                               return 0;
-               
+                               return MOD_RES_PASSTHRU;
+
                        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
-                                       
+
                                if (strncmp(text.c_str(), "\1DCC ", 5) == 0)
-                               {       
-                                       if (u->GetExt("dccallow_list", dl) && dl->size())
+                               {
+                                       dl = ext->get(u);
+                                       if (dl && dl->size())
                                        {
                                                for (dccallowlist::const_iterator iter = dl->begin(); iter != dl->end(); ++iter)
-                                                       if (ServerInstance->MatchText(user->GetFullHost(), iter->hostmask))
-                                                               return 0;
+                                                       if (InspIRCd::Match(user->GetFullHost(), iter->hostmask))
+                                                               return MOD_RES_PASSTHRU;
                                        }
-               
+
                                        // tokenize
                                        std::stringstream ss(text);
                                        std::string buf;
                                        std::vector<std::string> tokens;
-               
+
                                        while (ss >> buf)
                                                tokens.push_back(buf);
-               
+
+                                       if (tokens.size() < 2)
+                                               return MOD_RES_PASSTHRU;
+
                                        irc::string type = tokens[1].c_str();
-               
-                                       bool blockchat = Conf->ReadFlag("dccallow", "blockchat", 0);
-               
+
+                                       ConfigTag* conftag = ServerInstance->Config->ConfValue("dccallow");
+                                       bool blockchat = conftag->getBool("blockchat");
+
                                        if (type == "SEND")
                                        {
-                                               std::string defaultaction = Conf->ReadValue("dccallow", "action", 0);
+                                               if (tokens.size() < 3)
+                                                       return MOD_RES_PASSTHRU;
+
+                                               std::string defaultaction = conftag->getString("action");
                                                std::string filename = tokens[2];
-                                       
-                                               if (defaultaction == "allow") 
-                                                       return 0;
-                               
+
+                                               bool found = false;
                                                for (unsigned int i = 0; i < bfl.size(); i++)
                                                {
-                                                       if (ServerInstance->MatchText(filename, bfl[i].filemask))
+                                                       if (InspIRCd::Match(filename, bfl[i].filemask, ascii_case_insensitive_map))
                                                        {
+                                                               /* We have a matching badfile entry, override whatever the default action is */
                                                                if (bfl[i].action == "allow")
-                                                                       return 0;
+                                                                       return MOD_RES_PASSTHRU;
+                                                               else
+                                                               {
+                                                                       found = true;
+                                                                       break;
+                                                               }
                                                        }
-                                                       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;
                                                }
+
+                                               /* only follow the default action if no badfile matches were found above */
+                                               if ((!found) && (defaultaction == "allow"))
+                                                       return MOD_RES_PASSTHRU;
+
+                                               user->WriteServ("NOTICE %s :The user %s is not accepting DCC SENDs from you. Your file %s was not sent.", user->nick.c_str(), u->nick.c_str(), filename.c_str());
+                                               u->WriteServ("NOTICE %s :%s (%s@%s) attempted to send you a file named %s, which was blocked.", u->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.c_str(), 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.c_str(), user->nick.c_str());
+                                               return MOD_RES_DENY;
                                        }
                                        else if ((type == "CHAT") && (blockchat))
                                        {
-                                               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;
+                                               user->WriteServ("NOTICE %s :The user %s is not accepting DCC CHAT requests from you.", user->nick.c_str(), u->nick.c_str());
+                                               u->WriteServ("NOTICE %s :%s (%s@%s) attempted to initiate a DCC CHAT session, which was blocked.", u->nick.c_str(), user->nick.c_str(), user->ident.c_str(), user->dhost.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.c_str(), user->nick.c_str());
+                                               return MOD_RES_DENY;
                                        }
                                }
                        }
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
-       
+
        void Expire()
        {
-               for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter)
+               for (userlist::iterator iter = ul.begin(); iter != ul.end();)
                {
                        User* u = (User*)(*iter);
-                       if (u->GetExt("dccallow_list", dl))
+                       dl = ext->get(u);
+                       if (dl)
                        {
                                if (dl->size())
                                {
                                        dccallowlist::iterator iter2 = dl->begin();
                                        while (iter2 != dl->end())
                                        {
-                                               if ((iter2->set_on + iter2->length) <= ServerInstance->Time())
+                                               if (iter2->length != 0 && (iter2->set_on + iter2->length) <= ServerInstance->Time())
                                                {
-                                                       u->WriteNumeric(997, "%s %s :DCCALLOW entry for %s has expired", u->nick, u->nick, iter2->nickname.c_str());
+                                                       u->WriteNumeric(997, "%s %s :DCCALLOW entry for %s has expired", u->nick.c_str(), u->nick.c_str(), iter2->nickname.c_str());
                                                        iter2 = dl->erase(iter2);
                                                }
                                                else
@@ -390,21 +417,23 @@ class ModuleDCCAllow : public Module
                                                }
                                        }
                                }
+                               ++iter;
                        }
                        else
                        {
-                               RemoveFromUserlist(u);
+                               iter = ul.erase(iter);
                        }
                }
        }
-       
+
        void RemoveNick(User* user)
        {
                /* Iterate through all DCCALLOW lists and remove user */
-               for (userlist::iterator iter = ul.begin(); iter != ul.end(); ++iter)
+               for (userlist::iterator iter = ul.begin(); iter != ul.end();)
                {
                        User *u = (User*)(*iter);
-                       if (u->GetExt("dccallow_list", dl))
+                       dl = ext->get(u);
+                       if (dl)
                        {
                                if (dl->size())
                                {
@@ -412,18 +441,19 @@ class ModuleDCCAllow : public Module
                                        {
                                                if (i->nickname == user->nick)
                                                {
-                                       
-                                                       u->WriteServ("NOTICE %s :%s left the network or changed their nickname and has been removed from your DCCALLOW list", u->nick, i->nickname.c_str());
-                                                       u->WriteNumeric(995, "%s %s :Removed %s from your DCCALLOW list", u->nick, u->nick, i->nickname.c_str());
+
+                                                       u->WriteServ("NOTICE %s :%s left the network or changed their nickname and has been removed from your DCCALLOW list", u->nick.c_str(), i->nickname.c_str());
+                                                       u->WriteNumeric(995, "%s %s :Removed %s from your DCCALLOW list", u->nick.c_str(), u->nick.c_str(), i->nickname.c_str());
                                                        dl->erase(i);
                                                        break;
                                                }
                                        }
                                }
+                               ++iter;
                        }
                        else
                        {
-                               RemoveFromUserlist(u);
+                               iter = ul.erase(iter);
                        }
                }
        }
@@ -445,27 +475,25 @@ class ModuleDCCAllow : public Module
        void ReadFileConf()
        {
                bfl.clear();
-               for (int i = 0; i < Conf->Enumerate("banfile"); i++)
+               ConfigTagList tags = ServerInstance->Config->ConfTags("banfile");
+               for (ConfigIter i = tags.first; i != tags.second; ++i)
                {
                        BannedFileList bf;
-                       std::string fileglob = Conf->ReadValue("banfile", "pattern", i);
-                       std::string action = Conf->ReadValue("banfile", "action", i);
-                       bf.filemask = fileglob;
-                       bf.action = action;
+                       bf.filemask = i->second->getString("pattern");
+                       bf.action = i->second->getString("action");
                        bfl.push_back(bf);
                }
-       
        }
 
        virtual ~ModuleDCCAllow()
        {
+               delete ext;
        }
 
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 0, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides support for the /DCCALLOW command", VF_COMMON | VF_VENDOR);
        }
 };
 
 MODULE_INIT(ModuleDCCAllow)
-