]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_cloaking.cpp
Tidy up source files:
[user/henk/code/inspircd.git] / src / modules / m_cloaking.cpp
index 2a348ba8b57e4c028625a4b738b4b33c21a03353..9eb9a8da90421541e053db2b5977f29736af35cf 100644 (file)
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
- * See: http://wiki.inspircd.org/Credits
+ *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
+ *   Copyright (C) 2006-2008 Robin Burchell <robin+git@viroteck.net>
+ *   Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ *   Copyright (C) 2003-2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2007 John Brooks <john.brooks@dereferenced.net>
+ *   Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
+ *   Copyright (C) 2006 Oliver Lupton <oliverlupton@gmail.com>
  *
- * 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"
-#include "m_hash.h"
+#include "modules/hash.h"
 
 /* $ModDesc: Provides masking of user hostnames */
-/* $ModDep: m_hash.h */
+
+enum CloakMode
+{
+       /** 2.0 cloak of "half" of the hostname plus the full IP hash */
+       MODE_HALF_CLOAK,
+       /** 2.0 cloak of IP hash, split at 2 common CIDR range points */
+       MODE_OPAQUE
+};
+
+// lowercase-only encoding similar to base64, used for hash output
+static const char base32[] = "0123456789abcdefghijklmnopqrstuv";
 
 /** Handles user mode +x
  */
 class CloakUser : public ModeHandler
 {
  public:
-       std::string prefix;
-       unsigned int key1;
-       unsigned int key2;
-       unsigned int key3;
-       unsigned int key4;
-       bool ipalways;
-       Module* HashProvider;
-       const char *xtab[4];
        LocalStringExt ext;
+       std::string debounce_uid;
+       time_t debounce_ts;
+       int debounce_count;
 
-       /** This function takes a domain name string and returns just the last two domain parts,
-        * or the last domain part if only two are available. Failing that it just returns what it was given.
-        *
-        * For example, if it is passed "svn.inspircd.org" it will return ".inspircd.org".
-        * If it is passed "brainbox.winbot.co.uk" it will return ".co.uk",
-        * and if it is passed "localhost.localdomain" it will return ".localdomain".
-        *
-        * This is used to ensure a significant part of the host is always cloaked (see Bug #216)
-        */
-       std::string LastTwoDomainParts(const std::string &host)
-       {
-               int dots = 0;
-               std::string::size_type splitdot = host.length();
-
-               for (std::string::size_type x = host.length() - 1; x; --x)
-               {
-                       if (host[x] == '.')
-                       {
-                               splitdot = x;
-                               dots++;
-                       }
-                       if (dots >= 3)
-                               break;
-               }
-
-               if (splitdot == host.length())
-                       return host;
-               else
-                       return host.substr(splitdot);
-       }
-
-       CloakUser(InspIRCd* Instance, Module* source, Module* Hash) 
-               : ModeHandler(Instance, source, 'x', 0, 0, false, MODETYPE_USER, false), HashProvider(Hash),
-               ext("cloaked_host", source)
+       CloakUser(Module* source)
+               : ModeHandler(source, "cloak", 'x', PARAM_NONE, MODETYPE_USER),
+               ext("cloaked_host", source), debounce_ts(0), debounce_count(0)
        {
        }
 
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
-               /* For remote clients, we dont take any action, we just allow it.
+               LocalUser* user = IS_LOCAL(dest);
+
+               /* For remote clients, we don't take any action, we just allow it.
                 * The local server where they are will set their cloak instead.
-                * This is fine, as we will recieve it later.
+                * This is fine, as we will receive it later.
                 */
-               if (!IS_LOCAL(dest))
+               if (!user)
                {
                        dest->SetMode('x',adding);
                        return MODEACTION_ALLOW;
                }
 
+               if (user->uuid == debounce_uid && debounce_ts == ServerInstance->Time())
+               {
+                       // prevent spamming using /mode user +x-x+x-x+x-x
+                       if (++debounce_count > 2)
+                               return MODEACTION_DENY;
+               }
+               else
+               {
+                       debounce_uid = user->uuid;
+                       debounce_count = 1;
+                       debounce_ts = ServerInstance->Time();
+               }
+
+               if (adding == user->IsModeSet('x'))
+                       return MODEACTION_DENY;
+
                /* don't allow this user to spam modechanges */
-               dest->IncreasePenalty(5);
+               if (source == dest)
+                       user->CommandFloodPenalty += 5000;
 
                if (adding)
                {
-                       if(!dest->IsModeSet('x'))
+                       std::string* cloak = ext.get(user);
+
+                       if (!cloak)
                        {
-                               /* The mode is being turned on - so attempt to
-                                * allocate the user a cloaked host using a non-reversible
-                                * algorithm (its simple, but its non-reversible so the
-                                * simplicity doesnt really matter). This algorithm
-                                * will not work if the user has only one level of domain
-                                * naming in their hostname (e.g. if they are on a lan or
-                                * are connecting via localhost) -- this doesnt matter much.
-                                */
-
-                               std::string* cloak = ext.get(dest);
-
-                               if (!cloak)
-                               {
-                                       /* Force creation of missing cloak */
-                                       creator->OnUserConnect(dest);
-                                       cloak = ext.get(dest);
-                               }
-                               if (cloak)
-                               {
-                                       dest->ChangeDisplayedHost(cloak->c_str());
-                                       dest->SetMode('x',true);
-                                       return MODEACTION_ALLOW;
-                               }
+                               /* Force creation of missing cloak */
+                               creator->OnUserConnect(user);
+                               cloak = ext.get(user);
                        }
-               }
-               else
-               {
-                       if (dest->IsModeSet('x'))
+                       if (cloak)
                        {
-                               /* User is removing the mode, so just restore their real host
-                                * and make it match the displayed one.
-                                */
-                               dest->ChangeDisplayedHost(dest->host.c_str());
-                               dest->SetMode('x',false);
+                               user->ChangeDisplayedHost(cloak->c_str());
+                               user->SetMode('x',true);
                                return MODEACTION_ALLOW;
                        }
+                       else
+                               return MODEACTION_DENY;
+               }
+               else
+               {
+                       /* User is removing the mode, so restore their real host
+                        * and make it match the displayed one.
+                        */
+                       user->SetMode('x',false);
+                       user->ChangeDisplayedHost(user->host.c_str());
+                       return MODEACTION_ALLOW;
                }
-
-               return MODEACTION_DENY;
        }
+};
 
-       std::string Cloak4(const char* ip)
+class CommandCloak : public Command
+{
+ public:
+       CommandCloak(Module* Creator) : Command(Creator, "CLOAK", 1)
        {
-               unsigned int iv[] = { key1, key2, key3, key4 };
-               irc::sepstream seps(ip, '.');
-               std::string ra[4];;
-               std::string octet[4];
-               int i[4];
-
-               for (int j = 0; j < 4; j++)
-               {
-                       seps.GetToken(octet[j]);
-                       i[j] = atoi(octet[j].c_str());
-               }
+               flags_needed = 'o';
+               syntax = "<host>";
+       }
 
-               octet[3] = octet[0] + "." + octet[1] + "." + octet[2] + "." + octet[3];
-               octet[2] = octet[0] + "." + octet[1] + "." + octet[2];
-               octet[1] = octet[0] + "." + octet[1];
+       CmdResult Handle(const std::vector<std::string> &parameters, User *user);
+};
 
-               /* Reset the Hash module and send it our IV */
-               HashResetRequest(creator, HashProvider).Send();
-               HashKeyRequest(creator, HashProvider, iv).Send();
+class ModuleCloaking : public Module
+{
+ public:
+       CloakUser cu;
+       CloakMode mode;
+       CommandCloak ck;
+       std::string prefix;
+       std::string suffix;
+       std::string key;
+       const char* xtab[4];
+       dynamic_reference<HashProvider> Hash;
 
-               /* Send the Hash module a different hex table for each octet group's Hash sum */
-               for (int k = 0; k < 4; k++)
-               {
-                       HashHexRequest(creator, HashProvider, xtab[(iv[k]+i[k]) % 4]).Send();
-                       ra[k] = std::string(HashSumRequest(creator, HashProvider, octet[k]).Send()).substr(0,6);
-               }
-               /* Stick them all together */
-               return std::string().append(ra[0]).append(".").append(ra[1]).append(".").append(ra[2]).append(".").append(ra[3]);
+       ModuleCloaking() : cu(this), mode(MODE_OPAQUE), ck(this), Hash(this, "hash/md5")
+       {
        }
 
-       std::string Cloak6(const char* ip)
+       void init()
        {
-               unsigned int iv[] = { key1, key2, key3, key4 };
-               std::vector<std::string> hashies;
-               std::string item;
-               int rounds = 0;
+               OnRehash(NULL);
 
-               /* Reset the Hash module and send it our IV */
-               HashResetRequest(creator, HashProvider).Send();
-               HashKeyRequest(creator, HashProvider, iv).Send();
+               ServerInstance->Modules->AddService(cu);
+               ServerInstance->Modules->AddService(ck);
+               ServerInstance->Modules->AddService(cu.ext);
 
-               for (const char* input = ip; *input; input++)
-               {
-                       item += *input;
-                       if (item.length() > 7)
-                       {
-                               /* Send the Hash module a different hex table for each octet group's Hash sum */
-                               HashHexRequest(creator, HashProvider, xtab[(key1+rounds) % 4]).Send();
-                               hashies.push_back(std::string(HashSumRequest(creator, HashProvider, item).Send()).substr(0,8));
-                               item.clear();
-                       }
-                       rounds++;
-               }
-               if (!item.empty())
-               {
-                       /* Send the Hash module a different hex table for each octet group's Hash sum */
-                       HashHexRequest(creator, HashProvider, xtab[(key1+rounds) % 4]).Send();
-                       hashies.push_back(std::string(HashSumRequest(creator, HashProvider, item).Send()).substr(0,8));
-                       item.clear();
-               }
-               /* Stick them all together */
-               return irc::stringjoiner(":", hashies, 0, hashies.size() - 1).GetJoined();
+               Implementation eventlist[] = { I_OnRehash, I_OnCheckBan, I_OnUserConnect, I_OnChangeHost };
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
-       void DoRehash()
+       /** This function takes a domain name string and returns just the last two domain parts,
+        * or the last domain part if only two are available. Failing that it just returns what it was given.
+        *
+        * For example, if it is passed "svn.inspircd.org" it will return ".inspircd.org".
+        * If it is passed "brainbox.winbot.co.uk" it will return ".co.uk",
+        * and if it is passed "localhost.localdomain" it will return ".localdomain".
+        *
+        * This is used to ensure a significant part of the host is always cloaked (see Bug #216)
+        */
+       std::string LastTwoDomainParts(const std::string &host)
        {
-               ConfigReader Conf(ServerInstance);
-               bool lowercase;
-
-               /* These are *not* using the need_positive parameter of ReadInteger -
-                * that will limit the valid values to only the positive values in a
-                * signed int. Instead, accept any value that fits into an int and
-                * cast it to an unsigned int. That will, a bit oddly, give us the full
-                * spectrum of an unsigned integer. - Special */
-               key1 = key2 = key3 = key4 = 0;
-               key1 = (unsigned int) Conf.ReadInteger("cloak","key1",0,false);
-               key2 = (unsigned int) Conf.ReadInteger("cloak","key2",0,false);
-               key3 = (unsigned int) Conf.ReadInteger("cloak","key3",0,false);
-               key4 = (unsigned int) Conf.ReadInteger("cloak","key4",0,false);
-               prefix = Conf.ReadValue("cloak","prefix",0);
-               ipalways = Conf.ReadFlag("cloak", "ipalways", 0);
-               lowercase = Conf.ReadFlag("cloak", "lowercase", 0);
-
-               if (!lowercase)
-               {
-                       xtab[0] = "F92E45D871BCA630";
-                       xtab[1] = "A1B9D80C72E653F4";
-                       xtab[2] = "1ABC078934DEF562";
-                       xtab[3] = "ABCDEF5678901234";
-               }
-               else
+               int dots = 0;
+               std::string::size_type splitdot = host.length();
+
+               for (std::string::size_type x = host.length() - 1; x; --x)
                {
-                       xtab[0] = "f92e45d871bca630";
-                       xtab[1] = "a1b9d80c72e653f4";
-                       xtab[2] = "1abc078934def562";
-                       xtab[3] = "abcdef5678901234";
+                       if (host[x] == '.')
+                       {
+                               splitdot = x;
+                               dots++;
+                       }
+                       if (dots >= 3)
+                               break;
                }
 
-               if (prefix.empty())
-                       prefix = ServerInstance->Config->Network;
+               if (splitdot == host.length())
+                       return "";
+               else
+                       return host.substr(splitdot);
+       }
 
-               if (!key1 || !key2 || !key3 || !key4)
+       /**
+        * 2.0-style cloaking function
+        * @param item The item to cloak (part of an IP or hostname)
+        * @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 input;
+               input.reserve(key.length() + 3 + item.length());
+               input.append(1, id);
+               input.append(key);
+               input.append(1, '\0'); // null does not terminate a C++ string
+               input.append(item);
+
+               std::string rv = Hash->sum(input).substr(0,len);
+               for(int i=0; i < len; i++)
                {
-                       std::string detail;
-                       if (!key1)
-                               detail = "<cloak:key1> is not valid, it may be set to a too high/low value, or it may not exist.";
-                       else if (!key2)
-                               detail = "<cloak:key2> is not valid, it may be set to a too high/low value, or it may not exist.";
-                       else if (!key3)
-                               detail = "<cloak:key3> is not valid, it may be set to a too high/low value, or it may not exist.";
-                       else if (!key4)
-                               detail = "<cloak:key4> is not valid, it may be set to a too high/low value, or it may not exist.";
-
-                       throw ModuleException("You have not defined cloak keys for m_cloaking!!! THIS IS INSECURE AND SHOULD BE CHECKED! - " + detail);
+                       // this discards 3 bits per byte. We have an
+                       // overabundance of bits in the hash output, doesn't
+                       // matter which ones we are discarding.
+                       rv[i] = base32[rv[i] & 0x1F];
                }
+               return rv;
        }
-};
-
-
-class ModuleCloaking : public Module
-{
- private:
-       CloakUser* cu;
 
- public:
-       ModuleCloaking(InspIRCd* Me)
-               : Module(Me)
+       std::string SegmentIP(const irc::sockets::sockaddrs& ip, bool full)
        {
-               /* Attempt to locate the md5 service provider, bail if we can't find it */
-               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.");
-
-               cu = new CloakUser(ServerInstance, this, HashModule);
-
-               try
+               std::string bindata;
+               int hop1, hop2, hop3;
+               int len1, len2;
+               std::string rv;
+               if (ip.sa.sa_family == AF_INET6)
                {
-                       OnRehash(NULL);
+                       bindata = std::string((const char*)ip.in6.sin6_addr.s6_addr, 16);
+                       hop1 = 8;
+                       hop2 = 6;
+                       hop3 = 4;
+                       len1 = 6;
+                       len2 = 4;
+                       // pfx s1.s2.s3. (xxxx.xxxx or s4) sfx
+                       //     6  4  4    9/6
+                       rv.reserve(prefix.length() + 26 + suffix.length());
                }
-               catch (ModuleException &e)
+               else
                {
-                       delete cu;
-                       throw e;
+                       bindata = std::string((const char*)&ip.in4.sin_addr, 4);
+                       hop1 = 3;
+                       hop2 = 0;
+                       hop3 = 2;
+                       len1 = len2 = 3;
+                       // pfx s1.s2. (xxx.xxx or s3) sfx
+                       rv.reserve(prefix.length() + 15 + suffix.length());
                }
 
-               /* Register it with the core */
-               if (!ServerInstance->Modes->AddMode(cu))
+               rv.append(prefix);
+               rv.append(SegmentCloak(bindata, 10, len1));
+               rv.append(1, '.');
+               bindata.erase(hop1);
+               rv.append(SegmentCloak(bindata, 11, len2));
+               if (hop2)
                {
-                       delete cu;
-                       throw ModuleException("Could not add new modes!");
+                       rv.append(1, '.');
+                       bindata.erase(hop2);
+                       rv.append(SegmentCloak(bindata, 12, len2));
                }
 
-               ServerInstance->Modules->UseInterface("HashRequest");
-               Extensible::Register(&cu->ext);
-
-               Implementation eventlist[] = { I_OnRehash, I_OnCheckBan, I_OnUserConnect };
-               ServerInstance->Modules->Attach(eventlist, this, 3);
-
-               CloakExistingUsers();
-       }
-
-       void CloakExistingUsers()
-       {
-               std::string* cloak;
-               for (std::vector<User*>::iterator u = ServerInstance->Users->local_users.begin(); u != ServerInstance->Users->local_users.end(); u++)
+               if (full)
                {
-                       cloak = cu->ext.get(*u);
-                       if (!cloak)
+                       rv.append(1, '.');
+                       bindata.erase(hop3);
+                       rv.append(SegmentCloak(bindata, 13, 6));
+                       rv.append(suffix);
+               }
+               else
+               {
+                       char buf[50];
+                       if (ip.sa.sa_family == AF_INET6)
                        {
-                               OnUserConnect(*u);
+                               snprintf(buf, 50, ".%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());
                        }
+                       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(buf);
                }
+               return rv;
        }
 
-       ModResult OnCheckBan(User* user, Channel* chan)
+       ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask)
        {
-               char mask[MAXBUF];
-               std::string* cloak = cu->ext.get(user);
+               LocalUser* lu = IS_LOCAL(user);
+               if (!lu)
+                       return MOD_RES_PASSTHRU;
+
+               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)
                {
-                       snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), cloak->c_str());
-                       for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
-                       {
-                               if (InspIRCd::Match(mask,i->data))
-                                       return MOD_RES_DENY;
-                       }
+                       char cmask[MAXBUF];
+                       snprintf(cmask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), cloak->c_str());
+                       if (InspIRCd::Match(cmask,mask))
+                               return MOD_RES_DENY;
                }
                return MOD_RES_PASSTHRU;
        }
 
-       void Prioritize()
+       void Prioritize()
        {
                /* Needs to be after m_banexception etc. */
                ServerInstance->Modules->SetPriority(this, I_OnCheckBan, PRIORITY_LAST);
-
-               /* but before m_conn_umodes, so host is generated ready to apply */
-               Module *um = ServerInstance->Modules->Find("m_conn_umodes.so");
-               ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIORITY_AFTER, &um);
        }
 
-       ~ModuleCloaking()
+       // this unsets umode +x on every host change. If we are actually doing a +x
+       // mode change, we will call SetMode back to true AFTER the host change is done.
+       void OnChangeHost(User* u, const std::string& host)
        {
-               ServerInstance->Modes->DelMode(cu);
-               delete cu;
-               ServerInstance->Modules->DoneWithInterface("HashRequest");
+               if(u->IsModeSet('x'))
+               {
+                       u->SetMode('x', false);
+                       u->WriteServ("MODE %s -x", u->nick.c_str());
+               }
        }
 
        Version GetVersion()
        {
-               // returns the version number of the module to be
-               // listed in /MODULES
-               return Version("$Id$", VF_COMMON|VF_VENDOR,API_VERSION);
+               std::string testcloak = "broken";
+               if (Hash)
+               {
+                       switch (mode)
+                       {
+                               case MODE_HALF_CLOAK:
+                                       testcloak = prefix + SegmentCloak("*", 3, 8) + suffix;
+                                       break;
+                               case MODE_OPAQUE:
+                                       testcloak = prefix + SegmentCloak("*", 4, 8) + suffix;
+                       }
+               }
+               return Version("Provides masking of user hostnames", VF_COMMON|VF_VENDOR, testcloak);
        }
 
        void OnRehash(User* user)
        {
-               cu->DoRehash();
+               ConfigTag* tag = ServerInstance->Config->ConfValue("cloak");
+               prefix = tag->getString("prefix");
+               suffix = tag->getString("suffix", ".IP");
+
+               std::string modestr = tag->getString("mode");
+               if (modestr == "half")
+                       mode = MODE_HALF_CLOAK;
+               else if (modestr == "full")
+                       mode = MODE_OPAQUE;
+               else
+                       throw ModuleException("Bad value for <cloak:mode>; must be half or full");
+
+               key = tag->getString("key");
+               if (key.empty() || key == "secret")
+                       throw ModuleException("You have not defined cloak keys for m_cloaking. Define <cloak:key> as a network-wide secret.");
        }
 
-       void OnUserConnect(User* dest)
+       std::string GenCloak(const irc::sockets::sockaddrs& ip, const std::string& ipstr, const std::string& host)
        {
-               std::string* cloak = cu->ext.get(dest);
-               if (cloak)
-                       return;
+               std::string chost;
 
-               if (dest->host.find('.') != std::string::npos || dest->host.find(':') != std::string::npos)
+               switch (mode)
                {
-                       unsigned int iv[] = { cu->key1, cu->key2, cu->key3, cu->key4 };
-                       std::string a = cu->LastTwoDomainParts(dest->host);
-                       std::string b;
-
-                       /* InspIRCd users have two hostnames; A displayed
-                        * hostname which can be modified by modules (e.g.
-                        * to create vhosts, implement chghost, etc) and a
-                        * 'real' hostname which you shouldnt write to.
-                        */
-
-                       /* 2008/08/18: add <cloak:ipalways> which always cloaks
-                        * the IP, for anonymity. --nenolod
-                        */
-                       if (!cu->ipalways)
+                       case MODE_HALF_CLOAK:
                        {
-                               /** Reset the Hash module, and send it our IV and hex table */
-                               HashResetRequest(this, cu->HashProvider).Send();
-                               HashKeyRequest(this, cu->HashProvider, iv).Send();
-                               HashHexRequest(this, cu->HashProvider, cu->xtab[(dest->host[0]) % 4]);
-
-                               /* Generate a cloak using specialized Hash */
-                               std::string hostcloak = cu->prefix + "-" + std::string(HashSumRequest(this, cu->HashProvider, dest->host.c_str()).Send()).substr(0,8) + a;
-
-                               /* Fix by brain - if the cloaked host is > the max length of a host (64 bytes
-                                * according to the DNS RFC) then tough titty, they get cloaked as an IP.
-                                * Their ISP shouldnt go to town on subdomains, or they shouldnt have a kiddie
-                                * vhost.
-                                */
-                               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
-                                       b = cu->Cloak4(dest->GetIPString());
-                       }
-                       else
-                       {
-                               if (dest->client_sa.sa.sa_family == AF_INET6)
-                                       b = cu->Cloak6(dest->GetIPString());
-                               else
-                                       b = cu->Cloak4(dest->GetIPString());
+                               if (ipstr != host)
+                                       chost = prefix + SegmentCloak(host, 1, 6) + LastTwoDomainParts(host);
+                               if (chost.empty() || chost.length() > 50)
+                                       chost = SegmentIP(ip, false);
+                               break;
                        }
-
-                       cu->ext.set(dest,b);
+                       case MODE_OPAQUE:
+                       default:
+                               chost = SegmentIP(ip, true);
                }
+               return chost;
        }
 
+       void OnUserConnect(LocalUser* dest)
+       {
+               std::string* cloak = cu.ext.get(dest);
+               if (cloak)
+                       return;
+
+               cu.ext.set(dest, GenCloak(dest->client_sa, dest->GetIPString(), dest->host));
+       }
 };
 
+CmdResult CommandCloak::Handle(const std::vector<std::string> &parameters, User *user)
+{
+       ModuleCloaking* mod = (ModuleCloaking*)(Module*)creator;
+       irc::sockets::sockaddrs sa;
+       std::string cloak;
+
+       if (irc::sockets::aptosa(parameters[0], 0, sa))
+               cloak = mod->GenCloak(sa, parameters[0], parameters[0]);
+       else
+               cloak = mod->GenCloak(sa, "", parameters[0]);
+
+       user->WriteServ("NOTICE %s :*** Cloak for %s is %s", user->nick.c_str(), parameters[0].c_str(), cloak.c_str());
+
+       return CMD_SUCCESS;
+}
+
 MODULE_INIT(ModuleCloaking)