Prevent using invalid UIDs and enforce UID/SID matching

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

diff --git a/src/modules/m_hostchange.cpp b/src/modules/m_hostchange.cpp
index d99b95c046077a90eaf923706c4ad13a4ed8272f..20c7e5bc21b731d485448557c84bcaecfc471361 100644 (file)
--- a/src/modules/m_hostchange.cpp
+++ b/src/modules/m_hostchange.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,19 +12,17 @@
  */
 
 #include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
 
 /* $ModDesc: Provides masking of user hostnames in a different way to m_cloaking */
 
 /** Holds information on a host set by m_hostchange
  */
-class Host : public classbase
+class Host
 {
  public:
        std::string action;
        std::string newhost;
+       std::string ports;
 };
 
 typedef std::map<std::string,Host*> hostchanges_t;
@@ -36,70 +34,85 @@ class ModuleHostChange : public Module
        std::string MySuffix;
        std::string MyPrefix;
        std::string MySeparator;
-        
+
  public:
-       ModuleHostChange(InspIRCd* Me)
-               : Module(Me)
-       {
-               OnRehash(NULL,"");
+       ModuleHostChange()
+                       {
+               OnRehash(NULL);
+               Implementation eventlist[] = { I_OnRehash, I_OnUserConnect };
+               ServerInstance->Modules->Attach(eventlist, this, 2);
        }
-       
+
        virtual ~ModuleHostChange()
        {
                for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++)
                {
-                       DELETE(i->second);
+                       delete i->second;
                }
                hostchanges.clear();
        }
 
-       Priority Prioritize()
+       void Prioritize()
        {
-               return (Priority)ServerInstance->PriorityAfter("m_cloaking.so");
+               Module* cloak = ServerInstance->Modules->Find("m_cloaking.so");
+               ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_AFTER, &cloak);
        }
 
-       void Implements(char* List)
-       {
-               List[I_OnRehash] = List[I_OnUserConnect] = 1;
-       }
 
-       virtual void OnRehash(userrec* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
-               ConfigReader Conf(ServerInstance);
+               ConfigReader Conf;
                MySuffix = Conf.ReadValue("host","suffix",0);
                MyPrefix = Conf.ReadValue("host","prefix","",0);
                MySeparator = Conf.ReadValue("host","separator",".",0);
                for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++)
                {
-                       DELETE(i->second);
+                       delete i->second;
                }
                hostchanges.clear();
                for (int index = 0; index < Conf.Enumerate("hostchange"); index++)
                {
-                       std::string mask = Conf.ReadValue("hostchange","mask",index);
-                       std::string action = Conf.ReadValue("hostchange","action",index);
-                       std::string newhost = Conf.ReadValue("hostchange","value",index);
+                       std::string mask = Conf.ReadValue("hostchange", "mask", index);
+                       std::string ports = Conf.ReadValue("hosthange", "ports", index);
+                       std::string action = Conf.ReadValue("hostchange", "action", index);
+                       std::string newhost = Conf.ReadValue("hostchange", "value", index);
                        Host* x = new Host;
                        x->action = action;
+                       x->ports = ports;
                        x->newhost = newhost;
                        hostchanges[mask] = x;
                }
        }
-       
+
        virtual Version GetVersion()
        {
                // returns the version number of the module to be
                // listed in /MODULES
-               return Version(1,1,0,1,VF_VENDOR,API_VERSION);
+               return Version("Provides masking of user hostnames in a different way to m_cloaking", VF_VENDOR);
        }
-       
-       virtual void OnUserConnect(userrec* user)
+
+       virtual void OnUserConnect(LocalUser* user)
        {
                for (hostchanges_t::iterator i = hostchanges.begin(); i != hostchanges.end(); i++)
                {
-                       if (ServerInstance->MatchText(std::string(user->ident)+"@"+std::string(user->host),i->first))
+                       if (((InspIRCd::MatchCIDR(user->MakeHost(), i->first)) || (InspIRCd::MatchCIDR(user->MakeHostIP(), i->first))))
                        {
-                               Host* h = (Host*)i->second;
+                               Host* h = i->second;
+
+                               if (!h->ports.empty())
+                               {
+                                       irc::portparser portrange(h->ports, false);
+                                       long portno = -1;
+                                       bool foundany = false;
+
+                                       while ((portno = portrange.GetToken()))
+                                               if (portno == user->GetServerPort())
+                                                       foundany = true;
+
+                                       if (!foundany)
+                                               continue;
+                               }
+
                                // host of new user matches a hostchange tag's mask
                                std::string newhost;
                                if (h->action == "set")
@@ -127,7 +140,7 @@ class ModuleHostChange : public Module
                                        }
                                        if (complete.empty())
                                                complete = "i-have-a-lame-nick";
-                                               
+
                                        if (!MyPrefix.empty())
                                                newhost = MyPrefix + MySeparator + complete;
                                        else
@@ -145,4 +158,4 @@ class ModuleHostChange : public Module
        }
 };
 
-MODULE_INIT(ModuleHostChange);
+MODULE_INIT(ModuleHostChange)