* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
* This program is free but copyrighted software; see
- * the file COPYING for details.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
-#include "inspircd_config.h"
-#ifdef HAS_STDINT
-#include <stdint.h>
-#endif
-#include "configreader.h"
#include "inspircd.h"
-#include "users.h"
-#include "channels.h"
-#include "modules.h"
+#include "m_hash.h"
/* $ModDesc: Provides masking of user hostnames */
-/* The four core functions - F1 is optimized somewhat */
-
-#define F1(x, y, z) (z ^ (x & (y ^ z)))
-#define F2(x, y, z) F1(z, x, y)
-#define F3(x, y, z) (x ^ y ^ z)
-#define F4(x, y, z) (y ^ (x | ~z))
-#define MD5STEP(f,w,x,y,z,in,s) (w += f(x,y,z) + in, w = (w<<s | w>>(32-s)) + x)
-
-#ifndef HAS_STDINT
-typedef unsigned int uint32_t;
-#endif
-
-typedef uint32_t word32; /* NOT unsigned long. We don't support 16 bit platforms, anyway. */
-typedef unsigned char byte;
-
-/** An MD5 context, used by m_cloaking
- */
-class xMD5Context : public classbase
+enum CloakMode
{
- public:
- word32 buf[4];
- word32 bytes[2];
- word32 in[16];
+ /** 1.2-compatible host-based cloak */
+ MODE_COMPAT_HOST,
+ /** 1.2-compatible IP-only cloak */
+ MODE_COMPAT_IPONLY,
+ /** 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
{
-
- std::string prefix;
- word32 key1;
- word32 key2;
- word32 key3;
- word32 key4;
-
- void byteSwap(word32 *buf, unsigned words)
- {
- byte *p = (byte *)buf;
-
- do
- {
- *buf++ = (word32)((unsigned)p[3] << 8 | p[2]) << 16 |
- ((unsigned)p[1] << 8 | p[0]);
- p += 4;
- } while (--words);
- }
-
- void xMD5Init(struct xMD5Context *ctx)
- {
- ctx->buf[0] = key1;
- ctx->buf[1] = key2;
- ctx->buf[2] = key3;
- ctx->buf[3] = key4;
-
- ctx->bytes[0] = 0;
- ctx->bytes[1] = 0;
- }
-
- void xMD5Update(struct xMD5Context *ctx, byte const *buf, int len)
- {
- word32 t;
-
- /* Update byte count */
-
- t = ctx->bytes[0];
- if ((ctx->bytes[0] = t + len) < t)
- ctx->bytes[1]++; /* Carry from low to high */
-
- t = 64 - (t & 0x3f); /* Space available in ctx->in (at least 1) */
- if ((unsigned)t > (unsigned)len)
- {
- memcpy((byte *)ctx->in + 64 - (unsigned)t, buf, len);
- return;
- }
- /* First chunk is an odd size */
- memcpy((byte *)ctx->in + 64 - (unsigned)t, buf, (unsigned)t);
- byteSwap(ctx->in, 16);
- xMD5Transform(ctx->buf, ctx->in);
- buf += (unsigned)t;
- len -= (unsigned)t;
-
- /* Process data in 64-byte chunks */
- while (len >= 64)
- {
- memcpy(ctx->in, buf, 64);
- byteSwap(ctx->in, 16);
- xMD5Transform(ctx->buf, ctx->in);
- buf += 64;
- len -= 64;
- }
-
- /* Handle any remaining bytes of data. */
- memcpy(ctx->in, buf, len);
- }
-
- void xMD5Final(byte digest[16], struct xMD5Context *ctx)
- {
- int count = (int)(ctx->bytes[0] & 0x3f); /* Bytes in ctx->in */
- byte *p = (byte *)ctx->in + count; /* First unused byte */
-
- /* Set the first char of padding to 0x80. There is always room. */
- *p++ = 0x80;
-
- /* Bytes of padding needed to make 56 bytes (-8..55) */
- count = 56 - 1 - count;
-
- if (count < 0)
- { /* Padding forces an extra block */
- memset(p, 0, count+8);
- byteSwap(ctx->in, 16);
- xMD5Transform(ctx->buf, ctx->in);
- p = (byte *)ctx->in;
- count = 56;
- }
- memset(p, 0, count+8);
- byteSwap(ctx->in, 14);
-
- /* Append length in bits and transform */
- ctx->in[14] = ctx->bytes[0] << 3;
- ctx->in[15] = ctx->bytes[1] << 3 | ctx->bytes[0] >> 29;
- xMD5Transform(ctx->buf, ctx->in);
-
- byteSwap(ctx->buf, 4);
- memcpy(digest, ctx->buf, 16);
- memset(ctx, 0, sizeof(ctx));
- }
+ public:
+ LocalStringExt ext;
- void xMD5Transform(word32 buf[4], word32 const in[16])
+ CloakUser(Module* source)
+ : ModeHandler(source, "cloak", 'x', PARAM_NONE, MODETYPE_USER),
+ ext("cloaked_host", source)
{
- register word32 a, b, c, d;
-
- a = buf[0];
- b = buf[1];
- c = buf[2];
- d = buf[3];
-
- MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7);
- MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
- MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17);
- MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
- MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
- MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12);
- MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17);
- MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22);
- MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7);
- MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
- MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
- MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
- MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
- MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
- MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
- MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
-
- MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5);
- MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9);
- MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
- MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
- MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5);
- MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
- MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
- MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
- MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
- MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
- MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
- MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20);
- MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
- MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
- MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14);
- MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
-
- MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4);
- MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11);
- MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
- MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
- MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4);
- MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
- MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
- MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
- MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
- MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
- MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
- MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23);
- MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
- MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
- MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
- MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
-
- MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6);
- MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10);
- MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
- MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21);
- MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
- MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
- MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
- MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21);
- MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
- MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
- MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15);
- MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
- MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6);
- MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
- MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
- MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21);
-
- buf[0] += a;
- buf[1] += b;
- buf[2] += c;
- buf[3] += d;
}
-
- void MyMD5(void *dest, const void *orig, int len)
+ ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
{
- struct xMD5Context context;
-
- xMD5Init(&context);
- xMD5Update(&context, (const unsigned char*)orig, len);
- xMD5Final((unsigned char*)dest, &context);
- }
-
-
- void GenHash(const char* src, char* dest, int xtable = 0)
- {
- // purposefully lossy md5 - only gives them the most significant 4 bits
- // of every md5 output byte.
- int i = 0;
- unsigned char bytes[16];
- char hash[MAXBUF];
- *hash = 0;
- MyMD5(bytes, src, strlen(src));
- for (i = 0; i < 16; i++)
- {
- const char* xtab[] = {"F92E45D871BCA630", "A1B9D80C72E653F4", "1ABC078934DEF562", "ABCDEF5678901234"};
- char hx[2] = { xtab[xtable][bytes[i] / 16], 0};
- strlcat(hash,hx,MAXBUF);
- }
- strlcpy(dest,hash,MAXBUF);
- }
-
- public:
- CloakUser(InspIRCd* Instance) : ModeHandler(Instance, 'x', 0, 0, false, MODETYPE_USER, false) { }
-
- ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string ¶meter, bool adding)
- {
- /* Only opers can change other users modes */
- if ((source != dest) && (!*source->oper))
- return MODEACTION_DENY;
-
- /* For remote clients, we dont take any action, we just allow it.
+ /* 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 receive it later.
*/
if (!IS_LOCAL(dest))
+ {
+ dest->SetMode('x',adding);
return MODEACTION_ALLOW;
+ }
+
+ /* don't allow this user to spam modechanges */
+ dest->IncreasePenalty(5);
if (adding)
{
* naming in their hostname (e.g. if they are on a lan or
* are connecting via localhost) -- this doesnt matter much.
*/
-
- if (strchr(dest->host,'.') || strchr(dest->host,':'))
- {
- /* 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.
- */
- char* n = strstr(dest->host,".");
- if (!n)
- n = strstr(dest->host,":");
-
- std::string a = n;
-
- char ra[64];
- this->GenHash(dest->host,ra);
- std::string b;
- insp_inaddr testaddr;
- std::string hostcloak = prefix + "-" + ra + 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* cloak = ext.get(dest);
- if ((insp_aton(dest->host,&testaddr) < 1) && (hostcloak.length() <= 64))
- {
- // if they have a hostname, make something appropriate
- b = hostcloak;
- }
- else
- {
- b = ((b.find(':') == std::string::npos) ? Cloak4(dest->host) : Cloak6(dest->host));
- }
- ServerInstance->Log(DEBUG,"cloak: allocated "+b);
- dest->ChangeDisplayedHost(b.c_str());
+ 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;
}
-
- dest->SetMode('x',true);
- return MODEACTION_ALLOW;
}
}
else
- {
+ {
if (dest->IsModeSet('x'))
{
- /* User is removing the mode, so just restore their real host
- * and make it match the displayed one.
+ /* User is removing the mode, so just restore their real host
+ * and make it match the displayed one.
*/
- dest->ChangeDisplayedHost(dest->host);
+ dest->ChangeDisplayedHost(dest->host.c_str());
dest->SetMode('x',false);
return MODEACTION_ALLOW;
}
return MODEACTION_DENY;
}
- std::string Cloak4(const char* ip)
+};
+
+
+class ModuleCloaking : public Module
+{
+ private:
+ CloakUser cu;
+ CloakMode mode;
+ std::string prefix;
+ std::string key;
+ unsigned int compatkey[4];
+ const char* xtab[4];
+ Module* HashProvider;
+
+ public:
+ ModuleCloaking() : cu(this)
+ {
+ /* Attempt to locate the md5 service provider, bail if we can't find it */
+ HashProvider = ServerInstance->Modules->Find("m_md5.so");
+ if (!HashProvider)
+ throw ModuleException("Can't find m_md5.so. Please load m_md5.so before m_cloaking.so.");
+
+ OnRehash(NULL);
+
+ /* Register it with the core */
+ if (!ServerInstance->Modes->AddMode(&cu))
+ throw ModuleException("Could not add new modes!");
+
+ ServerInstance->Modules->UseInterface("HashRequest");
+ Extensible::Register(&cu.ext);
+
+ Implementation eventlist[] = { I_OnRehash, I_OnCheckBan, I_OnUserConnect };
+ ServerInstance->Modules->Attach(eventlist, this, 3);
+
+ CloakExistingUsers();
+ }
+
+ /** 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);
+ }
+
+ std::string CompatCloak4(const char* ip)
{
irc::sepstream seps(ip, '.');
- char ra1[64], ra2[64], ra3[64], ra4[64];
- int i1, i2, i3, i4;
- std::string octet1 = seps.GetToken();
- std::string octet2 = seps.GetToken();
- std::string octet3 = seps.GetToken();
- std::string octet4 = seps.GetToken();
- i1 = atoi(octet1.c_str());
- i2 = atoi(octet2.c_str());
- i3 = atoi(octet3.c_str());
- i4 = atoi(octet4.c_str());
- octet4 = octet1 + "." + octet2 + "." + octet3 + "." + octet4;
- octet3 = octet1 + "." + octet2 + "." + octet3;
- octet2 = octet1 + "." + octet2;
- this->GenHash(octet1.c_str(),ra1, (key1+i1) % 4);
- this->GenHash(octet2.c_str(),ra2, (key2+i2) % 4);
- this->GenHash(octet3.c_str(),ra3, (key3+i3) % 4);
- this->GenHash(octet4.c_str(),ra4, (key4+i4) % 4);
- /* This is safe as we know the length generated by our genhash is always 16 */
- ra1[8] = ra2[8] = ra3[8] = ra4[8] = 0;
- return std::string().append(ra1).append(".").append(ra2).append(".").append(ra3).append(".").append(ra4);
+ 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());
+ }
+
+ octet[3] = octet[0] + "." + octet[1] + "." + octet[2] + "." + octet[3];
+ octet[2] = octet[0] + "." + octet[1] + "." + octet[2];
+ octet[1] = octet[0] + "." + octet[1];
+
+ /* Reset the Hash module and send it our IV */
+
+ std::string rv;
+
+ /* Send the Hash module a different hex table for each octet group's Hash sum */
+ for (int k = 0; k < 4; k++)
+ {
+ HashRequestIV hash(this, HashProvider, compatkey, xtab[(compatkey[k]+i[k]) % 4], octet[k]);
+ rv.append(hash.result.substr(0,6));
+ if (k < 3)
+ rv.append(".");
+ }
+ /* Stick them all together */
+ return rv;
}
- std::string Cloak6(const char* ip)
+ std::string CompatCloak6(const char* ip)
{
std::vector<std::string> hashies;
- std::string item = "";
+ std::string item;
int rounds = 0;
+
+ /* Reset the Hash module and send it our IV */
+
for (const char* input = ip; *input; input++)
{
item += *input;
- if (item.length() > 5)
+ if (item.length() > 7)
{
- char ra[64];
- this->GenHash(item.c_str(), ra, (key1+rounds) % 4);
- ra[9] = 0;
- hashies.push_back(ra);
- item = "";
+ HashRequestIV hash(this, HashProvider, compatkey, xtab[(compatkey[1]+rounds) % 4], item);
+ hashies.push_back(hash.result.substr(0,8));
+ item.clear();
}
rounds++;
}
if (!item.empty())
{
- char ra[64];
- this->GenHash(item.c_str(), ra, (key1+rounds) % 4);
- ra[9] = 0;
- hashies.push_back(ra);
+ HashRequestIV hash(this, HashProvider, compatkey, xtab[(compatkey[1]+rounds) % 4], item);
+ hashies.push_back(hash.result.substr(0,8));
}
+ /* Stick them all together */
return irc::stringjoiner(":", hashies, 0, hashies.size() - 1).GetJoined();
}
- /* XXX: Uncomment and call to use the test suite
- void TestSuite()
- {
- printf("%s %s\n", "192.168.1.1", Cloak4("192.168.1.1").c_str());
- printf("%s %s\n", "192.168.1.2", Cloak4("192.168.1.2").c_str());
- printf("%s %s\n", "192.168.10.1", Cloak4("192.168.10.1").c_str());
- printf("%s %s\n", "192.168.10.1", Cloak4("192.168.10.2").c_str());
- printf("%s %s\n", "192.169.1.1", Cloak4("192.169.1.1").c_str());
- printf("%s %s\n", "192.169.2.1", Cloak4("192.169.2.1").c_str());
- printf("%s %s\n", "200.168.1.1", Cloak4("200.168.1.1").c_str());
- printf("%s %s\n", "200.168.1.3", Cloak4("200.168.1.3").c_str());
- printf("%s %s\n", "200.168.3.3", Cloak4("200.168.3.3").c_str());
- printf("%s %s\n", "200.169.4.3", Cloak4("200.169.4.3").c_str());
- printf("---\n");
- printf("%s %s\n", "9a05:2f00:3f11::5f12::1", Cloak6("9a05:2f00:3f11::5f12::1").c_str());
- printf("%s %s\n", "9a05:2f00:3f11::5f12::2", Cloak6("9a05:2f00:3f11::5f12::2").c_str());
- printf("%s %s\n", "9a05:2f00:3f11::5a12::1", Cloak6("9a05:2f00:3f11::5a12::1").c_str());
- printf("%s %s\n", "9a05:2f00:3f11::5a12::2", Cloak6("9a05:2f00:3f11::5a12::2").c_str());
- printf("%s %s\n", "9a05:3f01:3f11::5f12::1", Cloak6("9a05:3f01:3f11::5f12::1").c_str());
- printf("%s %s\n", "9a05:4f00:3f11::5f13::2", Cloak6("9a05:4f00:3f11::5f13::2").c_str());
- printf("%s %s\n", "ffff:2f00:3f11::5f12::1", Cloak6("ffff:2f00:3f11::5f12::1").c_str());
- printf("%s %s\n", "ffff:2f00:3f11::5f13::2", Cloak6("ffff:2f00:3f11::5f13::2").c_str());
- exit(0);
- }
- */
-
- void DoRehash()
+ std::string ReversePartialIP(const irc::sockets::sockaddrs& ip)
{
- ConfigReader Conf(ServerInstance);
- key1 = key2 = key3 = key4 = 0;
- key1 = Conf.ReadInteger("cloak","key1",0,false);
- key2 = Conf.ReadInteger("cloak","key2",0,false);
- key3 = Conf.ReadInteger("cloak","key3",0,false);
- key4 = Conf.ReadInteger("cloak","key4",0,false);
-
- prefix = Conf.ReadValue("cloak","prefix",0);
- if (prefix == "")
+ char rv[50];
+ if (ip.sa.sa_family == AF_INET6)
{
- prefix = ServerInstance->Config->Network;
+ snprintf(rv, 50, "%02x%02x.%02x%02x.%02x%02x.IP",
+ ip.in6.sin6_addr.s6_addr[4], ip.in6.sin6_addr.s6_addr[5],
+ 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]);
}
- if (!key1 && !key2 && !key3 && !key4)
+ else
{
- ModuleException ex("You have not defined cloak keys for m_cloaking!!! THIS IS INSECURE AND SHOULD BE CHECKED!");
- throw (ex);
+ const char* ip4 = (const char*)&ip.in4.sin_addr;
+ snprintf(rv, 50, "%d.%d.IP", ip4[1], ip4[0]);
}
+ return rv;
}
-};
-
-class ModuleCloaking : public Module
-{
- private:
-
- CloakUser* cu;
-
- public:
- ModuleCloaking(InspIRCd* Me)
- : Module::Module(Me)
+ std::string SegmentIP(const irc::sockets::sockaddrs& ip)
{
- /* Create new mode handler object */
- cu = new CloakUser(ServerInstance);
-
- /* Register it with the core */
- ServerInstance->AddMode(cu, 'x');
+ std::string bindata;
+ int hop1, hop2;
+ if (ip.sa.sa_family == AF_INET6)
+ {
+ bindata = std::string((const char*)ip.in6.sin6_addr.s6_addr, 16);
+ hop1 = 8;
+ hop2 = 6;
+ }
+ else
+ {
+ bindata = std::string((const char*)&ip.in4.sin_addr, 4);
+ hop1 = 3;
+ hop2 = 2;
+ }
- OnRehash("");
+ std::string rv;
+ rv.reserve(prefix.length() + 30);
+ rv.append(prefix);
+ rv.append(SegmentCloak(bindata, 2));
+ rv.append(1, '.');
+ bindata.erase(hop1);
+ rv.append(SegmentCloak(bindata, 3));
+ rv.append(1, '.');
+ bindata.erase(hop2);
+ rv.append(SegmentCloak(bindata, 4));
+ rv.append(".IP");
+ return rv;
}
-
- virtual ~ModuleCloaking()
+
+ std::string SegmentCloak(const std::string& item, char id)
{
- ServerInstance->Modes->DelMode(cu);
- DELETE(cu);
+ 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);
+
+ HashRequest hash(this, HashProvider, input);
+ std::string rv = hash.binresult.substr(0,6);
+ for(int i=0; i < 6; i++)
+ {
+ // 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;
}
-
- virtual Version GetVersion()
+
+ void CloakExistingUsers()
{
- // returns the version number of the module to be
- // listed in /MODULES
- return Version(1,1,0,2,VF_COMMON|VF_VENDOR,API_VERSION);
+ std::string* cloak;
+ for (std::vector<User*>::iterator u = ServerInstance->Users->local_users.begin(); u != ServerInstance->Users->local_users.end(); u++)
+ {
+ cloak = cu.ext.get(*u);
+ if (!cloak)
+ {
+ OnUserConnect(*u);
+ }
+ }
}
- virtual void OnRehash(const std::string ¶meter)
+ ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask)
{
- cu->DoRehash();
+ char cmask[MAXBUF];
+ 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(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 Implements(char* List)
+ void Prioritize()
{
- List[I_OnRehash] = 1;
+ /* Needs to be after m_banexception etc. */
+ ServerInstance->Modules->SetPriority(this, I_OnCheckBan, PRIORITY_LAST);
}
-};
-// stuff down here is the module-factory stuff. For basic modules you can ignore this.
+ ~ModuleCloaking()
+ {
+ ServerInstance->Modules->DoneWithInterface("HashRequest");
+ }
-class ModuleCloakingFactory : public ModuleFactory
-{
- public:
- ModuleCloakingFactory()
+ Version GetVersion()
{
+ // returns the version number of the module to be
+ // listed in /MODULES
+ return Version("Provides masking of user hostnames", VF_COMMON|VF_VENDOR,API_VERSION);
}
-
- ~ModuleCloakingFactory()
+
+ void OnRehash(User* user)
{
+ ConfigReader Conf;
+ prefix = Conf.ReadValue("cloak","prefix",0);
+
+ std::string modestr = Conf.ReadValue("cloak", "mode", 0);
+ if (modestr == "compat-host")
+ mode = MODE_COMPAT_HOST;
+ else if (modestr == "compat-ip")
+ mode = MODE_COMPAT_IPONLY;
+ else if (modestr == "half")
+ mode = MODE_HALF_CLOAK;
+ else if (modestr == "full")
+ mode = MODE_OPAQUE;
+ else
+ throw ModuleException("Bad value for <cloak:mode>; must be one of compat-host, compat-ip, half, full");
+
+ if (mode == MODE_COMPAT_HOST || mode == MODE_COMPAT_IPONLY)
+ {
+ bool lowercase = Conf.ReadFlag("cloak", "lowercase", 0);
+
+ /* 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
+ *
+ * We must limit the keys or else we get different results on
+ * amd64/x86 boxes. - psychon */
+ const unsigned int limit = 0x80000000;
+ compatkey[1] = (unsigned int) Conf.ReadInteger("cloak","key1",0,false);
+ compatkey[2] = (unsigned int) Conf.ReadInteger("cloak","key2",0,false);
+ compatkey[3] = (unsigned int) Conf.ReadInteger("cloak","key3",0,false);
+ compatkey[4] = (unsigned int) Conf.ReadInteger("cloak","key4",0,false);
+
+ if (!lowercase)
+ {
+ xtab[0] = "F92E45D871BCA630";
+ xtab[1] = "A1B9D80C72E653F4";
+ xtab[2] = "1ABC078934DEF562";
+ xtab[3] = "ABCDEF5678901234";
+ }
+ else
+ {
+ xtab[0] = "f92e45d871bca630";
+ xtab[1] = "a1b9d80c72e653f4";
+ xtab[2] = "1abc078934def562";
+ xtab[3] = "abcdef5678901234";
+ }
+
+ if (prefix.empty())
+ prefix = ServerInstance->Config->Network;
+
+ if (!compatkey[1] || !compatkey[2] || !compatkey[3] || !compatkey[4] ||
+ compatkey[1] >= limit || compatkey[2] >= limit || compatkey[3] >= limit || compatkey[4] >= limit)
+ {
+ std::string detail;
+ if (!compatkey[1] || compatkey[1] >= limit)
+ detail = "<cloak:key1> is not valid, it may be set to a too high/low value, or it may not exist.";
+ else if (!compatkey[2] || compatkey[2] >= limit)
+ detail = "<cloak:key2> is not valid, it may be set to a too high/low value, or it may not exist.";
+ else if (!compatkey[3] || compatkey[3] >= limit)
+ detail = "<cloak:key3> is not valid, it may be set to a too high/low value, or it may not exist.";
+ else if (!compatkey[4] || compatkey[4] >= limit)
+ 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);
+ }
+ }
+ else
+ {
+ key = Conf.ReadFlag("cloak", "key", 0);
+ if (key.empty() || key == "secret")
+ throw ModuleException("You have not defined cloak keys for m_cloaking. Define <cloak:key> as a network-wide secret.");
+ }
}
-
- virtual Module * CreateModule(InspIRCd* Me)
+
+ void OnUserConnect(User* dest)
{
- return new ModuleCloaking(Me);
+ std::string* cloak = cu.ext.get(dest);
+ if (cloak)
+ return;
+
+ if (dest->host.find('.') == std::string::npos && dest->host.find(':') == std::string::npos)
+ return;
+
+ std::string ipstr = dest->GetIPString();
+ std::string chost;
+
+ switch (mode)
+ {
+ case MODE_COMPAT_HOST:
+ {
+ if (ipstr != dest->host)
+ {
+ std::string tail = LastTwoDomainParts(dest->host);
+
+ /** Reset the Hash module, and send it our IV and hex table */
+ HashRequestIV hash(this, HashProvider, compatkey, xtab[(dest->host[0]) % 4], dest->host);
+
+ /* Generate a cloak using specialized Hash */
+ chost = prefix + "-" + hash.result.substr(0,8) + tail;
+
+ /* Fix by brain - if the cloaked host is > the max length of a host (64 bytes
+ * according to the DNS RFC) then they get cloaked as an IP.
+ */
+ if (chost.length() <= 64)
+ break;
+ }
+ // fall through to IP cloak
+ }
+ case MODE_COMPAT_IPONLY:
+ if (dest->client_sa.sa.sa_family == AF_INET6)
+ chost = CompatCloak6(ipstr.c_str());
+ else
+ chost = CompatCloak4(ipstr.c_str());
+ break;
+ case MODE_HALF_CLOAK:
+ {
+ std::string tail;
+ if (ipstr != dest->host)
+ tail = LastTwoDomainParts(dest->host);
+ if (tail.empty() || tail.length() > 50)
+ tail = ReversePartialIP(dest->client_sa);
+ chost = prefix + SegmentCloak(dest->host, 1) + "." + tail;
+ break;
+ }
+ case MODE_OPAQUE:
+ default:
+ chost = SegmentIP(dest->client_sa);
+ }
+ cu.ext.set(dest,chost);
}
-
-};
+};
-extern "C" void * init_module( void )
-{
- return new ModuleCloakingFactory;
-}
+MODULE_INIT(ModuleCloaking)
projects / user / henk / code / inspircd.git / blobdiff