Add the override keyword in places that it is missing.

[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 1534043ce9cff081b20c6047615a49528e0e91ff..a1e4d1af70ef06adf485f86be36f9c5218a199bf 100644 (file)
--- a/src/modules/m_cloaking.cpp
+++ b/src/modules/m_cloaking.cpp
@@ -53,7 +53,7 @@ class CloakUser : public ModeHandler
        {
        }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string& parameter, bool adding) CXX11_OVERRIDE
        {
                LocalUser* user = IS_LOCAL(dest);
 
@@ -89,6 +89,10 @@ class CloakUser : public ModeHandler
 
                if (adding)
                {
+                       // assume this is more correct
+                       if (user->registered != REG_ALL && user->GetRealHost() != user->GetDisplayedHost())
+                               return MODEACTION_DENY;
+
                        std::string* cloak = ext.get(user);
 
                        if (!cloak)
@@ -112,7 +116,7 @@ class CloakUser : public ModeHandler
                         * and make it match the displayed one.
                         */
                        user->SetMode(this, false);
-                       user->ChangeDisplayedHost(user->host.c_str());
+                       user->ChangeDisplayedHost(user->GetRealHost().c_str());
                        return MODEACTION_ALLOW;
                }
        }
@@ -127,7 +131,7 @@ class CommandCloak : public Command
                syntax = "<host>";
        }
 
-       CmdResult Handle(const std::vector<std::string> &parameters, User *user);
+       CmdResult Handle(const std::vector<std::string>& parameters, User* user) CXX11_OVERRIDE;
 };
 
 class ModuleCloaking : public Module
@@ -139,7 +143,7 @@ class ModuleCloaking : public Module
        std::string prefix;
        std::string suffix;
        std::string key;
-       const char* xtab[4];
+       unsigned int domainparts;
        dynamic_reference<HashProvider> Hash;
 
        ModuleCloaking() : cu(this), mode(MODE_OPAQUE), ck(this), Hash(this, "hash/md5")
@@ -157,7 +161,7 @@ class ModuleCloaking : public Module
         */
        std::string LastTwoDomainParts(const std::string &host)
        {
-               int dots = 0;
+               unsigned int dots = 0;
                std::string::size_type splitdot = host.length();
 
                for (std::string::size_type x = host.length() - 1; x; --x)
@@ -167,7 +171,7 @@ class ModuleCloaking : public Module
                                splitdot = x;
                                dots++;
                        }
-                       if (dots >= 3)
+                       if (dots >= domainparts)
                                break;
                }
 
@@ -183,7 +187,7 @@ class ModuleCloaking : public Module
         * @param id A unique ID for this type of item (to make it unique if the item matches)
         * @param len The length of the output. Maximum for MD5 is 16 characters.
         */
-       std::string SegmentCloak(const std::string& item, char id, int len)
+       std::string SegmentCloak(const std::string& item, char id, size_t len)
        {
                std::string input;
                input.reserve(key.length() + 3 + item.length());
@@ -193,7 +197,7 @@ class ModuleCloaking : public Module
                input.append(item);
 
                std::string rv = Hash->GenerateRaw(input).substr(0,len);
-               for(int i=0; i < len; i++)
+               for(size_t i = 0; i < len; i++)
                {
                        // this discards 3 bits per byte. We have an
                        // overabundance of bits in the hash output, doesn't
@@ -206,8 +210,8 @@ class ModuleCloaking : public Module
        std::string SegmentIP(const irc::sockets::sockaddrs& ip, bool full)
        {
                std::string bindata;
-               int hop1, hop2, hop3;
-               int len1, len2;
+               size_t hop1, hop2, hop3;
+               size_t len1, len2;
                std::string rv;
                if (ip.sa.sa_family == AF_INET6)
                {
@@ -253,19 +257,17 @@ class ModuleCloaking : public Module
                }
                else
                {
-                       char buf[50];
                        if (ip.sa.sa_family == AF_INET6)
                        {
-                               snprintf(buf, 50, ".%02x%02x.%02x%02x%s",
+                               rv.append(InspIRCd::Format(".%02x%02x.%02x%02x%s",
                                        ip.in6.sin6_addr.s6_addr[2], ip.in6.sin6_addr.s6_addr[3],
-                                       ip.in6.sin6_addr.s6_addr[0], ip.in6.sin6_addr.s6_addr[1], suffix.c_str());
+                                       ip.in6.sin6_addr.s6_addr[0], ip.in6.sin6_addr.s6_addr[1], suffix.c_str()));
                        }
                        else
                        {
                                const unsigned char* ip4 = (const unsigned char*)&ip.in4.sin_addr;
-                               snprintf(buf, 50, ".%d.%d%s", ip4[1], ip4[0], suffix.c_str());
+                               rv.append(InspIRCd::Format(".%d.%d%s", ip4[1], ip4[0], suffix.c_str()));
                        }
-                       rv.append(buf);
                }
                return rv;
        }
@@ -279,7 +281,7 @@ class ModuleCloaking : public Module
                OnUserConnect(lu);
                std::string* cloak = cu.ext.get(user);
                /* Check if they have a cloaked host, but are not using it */
-               if (cloak && *cloak != user->dhost)
+               if (cloak && *cloak != user->GetDisplayedHost())
                {
                        const std::string cloakMask = user->nick + "!" + user->ident + "@" + *cloak;
                        if (InspIRCd::Match(cloakMask, mask))
@@ -288,7 +290,7 @@ class ModuleCloaking : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       void Prioritize()
+       void Prioritize() CXX11_OVERRIDE
        {
                /* Needs to be after m_banexception etc. */
                ServerInstance->Modules->SetPriority(this, I_OnCheckBan, PRIORITY_LAST);
@@ -313,7 +315,15 @@ class ModuleCloaking : public Module
                        switch (mode)
                        {
                                case MODE_HALF_CLOAK:
-                                       testcloak = prefix + SegmentCloak("*", 3, 8) + suffix;
+                                       // Use old cloaking verification to stay compatible with 2.0
+                                       // But verify domainparts when use 3.0-only features
+                                       if (domainparts == 3)
+                                               testcloak = prefix + SegmentCloak("*", 3, 8) + suffix;
+                                       else
+                                       {
+                                               irc::sockets::sockaddrs sa;
+                                               testcloak = GenCloak(sa, "", testcloak + ConvToStr(domainparts));
+                                       }
                                        break;
                                case MODE_OPAQUE:
                                        testcloak = prefix + SegmentCloak("*", 4, 8) + suffix;
@@ -330,7 +340,10 @@ class ModuleCloaking : public Module
 
                std::string modestr = tag->getString("mode");
                if (modestr == "half")
+               {
                        mode = MODE_HALF_CLOAK;
+                       domainparts = tag->getInt("domainparts", 3, 1, 10);
+               }
                else if (modestr == "full")
                        mode = MODE_OPAQUE;
                else
@@ -345,11 +358,14 @@ class ModuleCloaking : public Module
        {
                std::string chost;
 
+               irc::sockets::sockaddrs hostip;
+               bool host_is_ip = irc::sockets::aptosa(host, ip.port(), hostip) && hostip == ip;
+
                switch (mode)
                {
                        case MODE_HALF_CLOAK:
                        {
-                               if (ipstr != host)
+                               if (!host_is_ip)
                                        chost = prefix + SegmentCloak(host, 1, 6) + LastTwoDomainParts(host);
                                if (chost.empty() || chost.length() > 50)
                                        chost = SegmentIP(ip, false);
@@ -368,7 +384,7 @@ class ModuleCloaking : public Module
                if (cloak)
                        return;
 
-               cu.ext.set(dest, GenCloak(dest->client_sa, dest->GetIPString(), dest->host));
+               cu.ext.set(dest, GenCloak(dest->client_sa, dest->GetIPString(), dest->GetRealHost()));
        }
 };