MetaData rework

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

diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp
index 8bba9cedab4acd9d151b132def4d66dc91edc693..458d833dfab28258c9f992d802765860a6166089 100644 (file)
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -243,11 +243,6 @@ class CloakUser : public ModeHandler
 
                        throw ModuleException("You have not defined cloak keys for m_cloaking!!! THIS IS INSECURE AND SHOULD BE CHECKED! - " + detail);
                }
-               else if (key1 == 0x01234567 || key2 == 0x01234567 || key3 == 0x01234567 || key4 = 0x01234567)
-               {
-                       /* Simple test to see if the config was changed from the values in the example config, as these would be very insecure. */
-                       throw ModuleException("You did not change the cloak keys for m_cloaking! You must randomly create your own keys in the <cloak> tag.");
-               }
        }
 };
 
@@ -255,16 +250,14 @@ class CloakUser : public ModeHandler
 class ModuleCloaking : public Module
 {
  private:
-
        CloakUser* cu;
-       Module* HashModule;
 
  public:
        ModuleCloaking(InspIRCd* Me)
                : Module(Me)
        {
                /* Attempt to locate the md5 service provider, bail if we can't find it */
-               HashModule = ServerInstance->Modules->Find("m_md5.so");
+               Module* HashModule = ServerInstance->Modules->Find("m_md5.so");
                if (!HashModule)
                        throw ModuleException("Can't find m_md5.so. Please load m_md5.so before m_cloaking.so.");
 
@@ -272,7 +265,7 @@ class ModuleCloaking : public Module
 
                try
                {
-                       OnRehash(NULL,"");
+                       OnRehash(NULL);
                }
                catch (ModuleException &e)
                {
@@ -289,20 +282,17 @@ class ModuleCloaking : public Module
 
                ServerInstance->Modules->UseInterface("HashRequest");
 
-               Implementation eventlist[] = { I_OnRehash, I_OnUserDisconnect, I_OnCleanup, I_OnCheckBan, I_OnUserConnect, I_OnSyncUserMetaData, I_OnCleanup };
+               Implementation eventlist[] = { I_OnRehash, I_OnUserDisconnect, I_OnCleanup, I_OnCheckBan, I_OnUserConnect, I_OnSyncUser, I_OnCleanup };
                ServerInstance->Modules->Attach(eventlist, this, 6);
 
                CloakExistingUsers();
        }
 
-       void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
+       void OnSyncUser(User* user, Module* proto,void* opaque)
        {
-               if ((displayable) && (extname == "cloaked_host"))
-               {
-                       std::string* cloak;
-                       if (user->GetExt("cloaked_host", cloak))
-                               proto->ProtoSendMetaData(opaque, TYPE_USER, user, extname, *cloak);
-               }
+               std::string* cloak;
+               if (user->GetExt("cloaked_host", cloak) && proto->ProtoTranslate(NULL) == "?")
+                       proto->ProtoSendMetaData(opaque, user, "cloaked_host", *cloak);
        }
 
        void CloakExistingUsers()
@@ -374,7 +364,7 @@ class ModuleCloaking : public Module
                return Version("$Id$", VF_COMMON|VF_VENDOR,API_VERSION);
        }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
                cu->DoRehash();
        }
@@ -415,35 +405,21 @@ class ModuleCloaking : public Module
                                 * Their ISP shouldnt go to town on subdomains, or they shouldnt have a kiddie
                                 * vhost.
                                 */
-#ifdef IPV6
-                               in6_addr testaddr;
-                               in_addr testaddr2;
-                               if ((dest->GetProtocolFamily() == AF_INET6) && (inet_pton(AF_INET6,dest->host.c_str(),&testaddr) < 1) && (hostcloak.length() <= 64))
-                                       /* Invalid ipv6 address, and ipv6 user (resolved host) */
-                                       b = hostcloak;
-                               else if ((dest->GetProtocolFamily() == AF_INET) && (inet_aton(dest->host.c_str(),&testaddr2) < 1) && (hostcloak.length() <= 64))
-                                       /* Invalid ipv4 address, and ipv4 user (resolved host) */
-                                       b = hostcloak;
-                               else
-                                       /* Valid ipv6 or ipv4 address (not resolved) ipv4 or ipv6 user */
-                                       b = ((!strchr(dest->host.c_str(),':')) ? cu->Cloak4(dest->host.c_str()) : cu->Cloak6(dest->host.c_str()));
-#else
-                               in_addr testaddr;
-                               if ((inet_aton(dest->host.c_str(),&testaddr) < 1) && (hostcloak.length() <= 64))
-                                       /* Invalid ipv4 address, and ipv4 user (resolved host) */
+                               std::string testaddr;
+                               int testport;
+                               if (!irc::sockets::satoap(&dest->client_sa, testaddr, testport) && (hostcloak.length() <= 64))
+                                       /* not a valid address, must have been a host, so cloak as a host */
                                        b = hostcloak;
+                               else if (dest->client_sa.sa.sa_family == AF_INET6)
+                                       b = cu->Cloak6(dest->GetIPString());
                                else
-                                       /* Valid ipv4 address (not resolved) ipv4 user */
-                                       b = cu->Cloak4(dest->host.c_str());
-#endif
+                                       b = cu->Cloak4(dest->GetIPString());
                        }
                        else
                        {
-#ifdef IPV6
-                               if (dest->GetProtocolFamily() == AF_INET6)
+                               if (dest->client_sa.sa.sa_family == AF_INET6)
                                        b = cu->Cloak6(dest->GetIPString());
-#endif
-                               if (dest->GetProtocolFamily() == AF_INET)
+                               else
                                        b = cu->Cloak4(dest->GetIPString());
                        }