-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2010 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 "hash.h"
/* $ModDesc: Provides masking of user hostnames */
public:
LocalStringExt ext;
+ std::string debounce_uid;
+ time_t debounce_ts;
+ int debounce_count;
+
CloakUser(Module* source)
: ModeHandler(source, "cloak", 'x', PARAM_NONE, MODETYPE_USER),
- ext("cloaked_host", source)
+ ext("cloaked_host", source), debounce_ts(0), debounce_count(0)
{
}
ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding)
{
+ 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 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 */
- IS_LOCAL(dest)->CommandFloodPenalty += 5000;
+ 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 && IS_LOCAL(dest))
- {
- /* Force creation of missing cloak */
- creator->OnUserConnect(IS_LOCAL(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;
}
};
+class CommandCloak : public Command
+{
+ public:
+ CommandCloak(Module* Creator) : Command(Creator, "CLOAK", 1)
+ {
+ flags_needed = 'o';
+ syntax = "<host>";
+ }
+
+ CmdResult Handle(const std::vector<std::string> ¶meters, User *user);
+};
class ModuleCloaking : public Module
{
- private:
+ public:
CloakUser cu;
CloakMode mode;
+ CommandCloak ck;
std::string prefix;
+ std::string suffix;
std::string key;
unsigned int compatkey[4];
const char* xtab[4];
dynamic_reference<HashProvider> Hash;
- public:
- ModuleCloaking() : cu(this), Hash(this, "hash/md5")
+ ModuleCloaking() : cu(this), mode(MODE_OPAQUE), ck(this), Hash(this, "hash/md5")
{
}
{
OnRehash(NULL);
- /* Register it with the core */
- if (!ServerInstance->Modes->AddMode(&cu))
- throw ModuleException("Could not add new modes!");
-
- ServerInstance->Extensions.Register(&cu.ext);
+ ServerInstance->Modules->AddService(cu);
+ ServerInstance->Modules->AddService(ck);
+ ServerInstance->Modules->AddService(cu.ext);
- Implementation eventlist[] = { I_OnRehash, I_OnCheckBan, I_OnUserConnect };
- ServerInstance->Modules->Attach(eventlist, this, 3);
+ Implementation eventlist[] = { I_OnRehash, I_OnCheckBan, I_OnUserConnect, I_OnChangeHost };
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
}
/** This function takes a domain name string and returns just the last two domain parts,
}
if (splitdot == host.length())
- return host;
+ return "";
else
return host.substr(splitdot);
}
+ /**
+ * 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++)
+ {
+ // 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;
+ }
+
std::string CompatCloak4(const char* ip)
{
irc::sepstream seps(ip, '.');
item += *input;
if (item.length() > 7)
{
- hashies.push_back(Hash->sumIV(compatkey, xtab[(compatkey[1]+rounds) % 4], item).substr(0,8));
+ hashies.push_back(Hash->sumIV(compatkey, xtab[(compatkey[0]+rounds) % 4], item).substr(0,8));
item.clear();
}
rounds++;
}
if (!item.empty())
{
- hashies.push_back(Hash->sumIV(compatkey, xtab[(compatkey[1]+rounds) % 4], item).substr(0,8));
+ hashies.push_back(Hash->sumIV(compatkey, xtab[(compatkey[0]+rounds) % 4], item).substr(0,8));
}
/* Stick them all together */
return irc::stringjoiner(":", hashies, 0, hashies.size() - 1).GetJoined();
{
std::string bindata;
int hop1, hop2, hop3;
+ int len1, len2;
std::string rv;
if (ip.sa.sa_family == AF_INET6)
{
hop1 = 8;
hop2 = 6;
hop3 = 4;
- rv.reserve(prefix.length() + 37);
+ 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());
}
else
{
hop1 = 3;
hop2 = 0;
hop3 = 2;
- rv.reserve(prefix.length() + 30);
+ len1 = len2 = 3;
+ // pfx s1.s2. (xxx.xxx or s3) sfx
+ rv.reserve(prefix.length() + 15 + suffix.length());
}
rv.append(prefix);
- rv.append(SegmentCloak(bindata, 10));
+ rv.append(SegmentCloak(bindata, 10, len1));
rv.append(1, '.');
bindata.erase(hop1);
- rv.append(SegmentCloak(bindata, 11));
+ rv.append(SegmentCloak(bindata, 11, len2));
if (hop2)
{
rv.append(1, '.');
bindata.erase(hop2);
- rv.append(SegmentCloak(bindata, 12));
+ rv.append(SegmentCloak(bindata, 12, len2));
}
if (full)
{
rv.append(1, '.');
bindata.erase(hop3);
- rv.append(SegmentCloak(bindata, 13));
- rv.append(".IP");
+ rv.append(SegmentCloak(bindata, 13, 6));
+ rv.append(suffix);
}
else
{
char buf[50];
if (ip.sa.sa_family == AF_INET6)
{
- snprintf(buf, 50, ".%02x%02x.%02x%02x.IP",
+ 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]);
+ 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.IP", ip4[1], ip4[0]);
+ snprintf(buf, 50, ".%d.%d%s", ip4[1], ip4[0], suffix.c_str());
}
rv.append(buf);
}
return rv;
}
- std::string SegmentCloak(const std::string& item, char id)
- {
- 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,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;
- }
-
ModResult OnCheckBan(User* user, Channel* chan, const std::string& mask)
{
LocalUser* lu = IS_LOCAL(user);
ServerInstance->Modules->SetPriority(this, I_OnCheckBan, PRIORITY_LAST);
}
+ // 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)
+ {
+ if(u->IsModeSet('x'))
+ {
+ u->SetMode('x', false);
+ u->WriteServ("MODE %s -x", u->nick.c_str());
+ }
+ }
+
~ModuleCloaking()
{
}
Version GetVersion()
{
- std::string testcloak;
- switch (mode)
+ std::string testcloak = "broken";
+ if (Hash)
{
- case MODE_COMPAT_HOST:
- testcloak = prefix + "-" + Hash->sumIV(compatkey, xtab[0], "*").substr(0,10);
- break;
- case MODE_COMPAT_IPONLY:
- testcloak = Hash->sumIV(compatkey, xtab[0], "*").substr(0,10);
- break;
- case MODE_HALF_CLOAK:
- testcloak = prefix + SegmentCloak("*", 3);
- break;
- case MODE_OPAQUE:
- default:
- testcloak = prefix + SegmentCloak("*", 4);
+ switch (mode)
+ {
+ case MODE_COMPAT_HOST:
+ testcloak = prefix + "-" + Hash->sumIV(compatkey, xtab[0], "*").substr(0,10);
+ break;
+ case MODE_COMPAT_IPONLY:
+ testcloak = Hash->sumIV(compatkey, xtab[0], "*").substr(0,10);
+ break;
+ 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)
{
- ConfigReader Conf;
- prefix = Conf.ReadValue("cloak","prefix",0);
+ ConfigTag* tag = ServerInstance->Config->ConfValue("cloak");
+ prefix = tag->getString("prefix");
+ suffix = tag->getString("suffix", ".IP");
- std::string modestr = Conf.ReadValue("cloak", "mode", 0);
+ std::string modestr = tag->getString("mode");
if (modestr == "compat-host")
mode = MODE_COMPAT_HOST;
else if (modestr == "compat-ip")
if (mode == MODE_COMPAT_HOST || mode == MODE_COMPAT_IPONLY)
{
- bool lowercase = Conf.ReadFlag("cloak", "lowercase", 0);
+ bool lowercase = tag->getBool("lowercase");
/* These are *not* using the need_positive parameter of ReadInteger -
* that will limit the valid values to only the positive values in a
* We must limit the keys or else we get different results on
* amd64/x86 boxes. - psychon */
const unsigned int limit = 0x80000000;
- compatkey[0] = (unsigned int) Conf.ReadInteger("cloak","key1",0,false);
- compatkey[1] = (unsigned int) Conf.ReadInteger("cloak","key2",0,false);
- compatkey[2] = (unsigned int) Conf.ReadInteger("cloak","key3",0,false);
- compatkey[3] = (unsigned int) Conf.ReadInteger("cloak","key4",0,false);
+ compatkey[0] = (unsigned int) tag->getInt("key1");
+ compatkey[1] = (unsigned int) tag->getInt("key2");
+ compatkey[2] = (unsigned int) tag->getInt("key3");
+ compatkey[3] = (unsigned int) tag->getInt("key4");
if (!lowercase)
{
}
else
{
- key = Conf.ReadFlag("cloak", "key", 0);
+ 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(LocalUser* 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 ipstr = dest->GetIPString();
std::string chost;
switch (mode)
{
case MODE_COMPAT_HOST:
{
- if (ipstr != dest->host)
+ if (ipstr != host)
{
- std::string tail = LastTwoDomainParts(dest->host);
+ std::string tail = LastTwoDomainParts(host);
- /* Generate a cloak using specialized Hash */
- chost = prefix + "-" + Hash->sumIV(compatkey, xtab[(dest->host[0]) % 4], dest->host).substr(0,8) + tail;
+ // xtab is not used here due to a bug in 1.2 cloaking
+ chost = prefix + "-" + Hash->sumIV(compatkey, "0123456789abcdef", host).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.
// fall through to IP cloak
}
case MODE_COMPAT_IPONLY:
- if (dest->client_sa.sa.sa_family == AF_INET6)
+ if (ip.sa.sa_family == AF_INET6)
chost = CompatCloak6(ipstr.c_str());
else
chost = CompatCloak4(ipstr.c_str());
break;
case MODE_HALF_CLOAK:
{
- if (ipstr != dest->host)
- chost = prefix + SegmentCloak(dest->host, 1) + LastTwoDomainParts(dest->host);
+ if (ipstr != host)
+ chost = prefix + SegmentCloak(host, 1, 6) + LastTwoDomainParts(host);
if (chost.empty() || chost.length() > 50)
- chost = SegmentIP(dest->client_sa, false);
+ chost = SegmentIP(ip, false);
break;
}
case MODE_OPAQUE:
default:
- chost = SegmentIP(dest->client_sa, true);
+ chost = SegmentIP(ip, true);
}
- cu.ext.set(dest,chost);
+ 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> ¶meters, 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)
projects / user / henk / code / inspircd.git / blobdiff