X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cloaking.cpp;h=61bf3f4e9f52c9efaed79248c8b81e1cb889a668;hb=553a8da754c8cd308bad2008018849714e70f9b7;hp=2dfc449ae4557b4590f83bdae73139fa461dfe52;hpb=fd4dbfca434adf436c8337b7ae2ad9607b065eae;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp index 2dfc449ae..61bf3f4e9 100644 --- a/src/modules/m_cloaking.cpp +++ b/src/modules/m_cloaking.cpp @@ -1,18 +1,30 @@ -/* +------------------------------------+ - * | 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 + * Copyright (C) 2006-2008 Robin Burchell + * Copyright (C) 2008 Pippijn van Steenhoven + * Copyright (C) 2003-2008 Craig Edwards + * Copyright (C) 2007 John Brooks + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006 Oliver Lupton * - * 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 . */ + #include "inspircd.h" -#include "m_hash.h" +#include "hash.h" /* $ModDesc: Provides masking of user hostnames */ @@ -38,107 +50,121 @@ class CloakUser : public ModeHandler 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 */ - 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; } }; +class CommandCloak : public Command +{ + public: + CommandCloak(Module* Creator) : Command(Creator, "CLOAK", 1) + { + flags_needed = 'o'; + syntax = ""; + } + + CmdResult Handle(const std::vector ¶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]; - Module* HashProvider; + dynamic_reference Hash; - public: - ModuleCloaking() : cu(this) + ModuleCloaking() : cu(this), mode(MODE_OPAQUE), ck(this), Hash(this, "hash/md5") { - /* 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."); + } + void init() + { OnRehash(NULL); - /* Register it with the core */ - if (!ServerInstance->Modes->AddMode(&cu)) - throw ModuleException("Could not add new modes!"); + ServerInstance->Modules->AddService(cu); + ServerInstance->Modules->AddService(ck); + ServerInstance->Modules->AddService(cu.ext); - ServerInstance->Modules->UseInterface("HashRequest"); - Extensible::Register(&cu.ext); - - Implementation eventlist[] = { I_OnRehash, I_OnCheckBan, I_OnUserConnect }; - ServerInstance->Modules->Attach(eventlist, this, 3); - - CloakExistingUsers(); + Implementation eventlist[] = { I_OnRehash, I_OnCheckBan, I_OnUserConnect, I_OnChangeHost }; + ServerInstance->Modules->Attach(eventlist, this, 4); } /** This function takes a domain name string and returns just the last two domain parts, @@ -167,11 +193,37 @@ class ModuleCloaking : public Module } 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, '.'); @@ -195,8 +247,7 @@ class ModuleCloaking : public Module /* 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)); + rv.append(Hash->sumIV(compatkey, xtab[(compatkey[k]+i[k]) % 4], octet[k]).substr(0,6)); if (k < 3) rv.append("."); } @@ -217,111 +268,98 @@ class ModuleCloaking : public Module item += *input; if (item.length() > 7) { - HashRequestIV hash(this, HashProvider, compatkey, xtab[(compatkey[1]+rounds) % 4], item); - hashies.push_back(hash.result.substr(0,8)); + hashies.push_back(Hash->sumIV(compatkey, xtab[(compatkey[0]+rounds) % 4], item).substr(0,8)); item.clear(); } rounds++; } if (!item.empty()) { - HashRequestIV hash(this, HashProvider, compatkey, xtab[(compatkey[1]+rounds) % 4], item); - hashies.push_back(hash.result.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 ReversePartialIP(const irc::sockets::sockaddrs& ip) - { - char rv[50]; - if (ip.sa.sa_family == AF_INET6) - { - 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]); - } - else - { - const unsigned char* ip4 = (const unsigned char*)&ip.in4.sin_addr; - snprintf(rv, 50, ".%d.%d.IP", ip4[1], ip4[0]); - } - return rv; - } - - std::string SegmentIP(const irc::sockets::sockaddrs& ip) + std::string SegmentIP(const irc::sockets::sockaddrs& ip, bool full) { std::string bindata; - int hop1, hop2; + int hop1, hop2, hop3; + int len1, len2; + std::string rv; if (ip.sa.sa_family == AF_INET6) { 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()); } else { bindata = std::string((const char*)&ip.in4.sin_addr, 4); hop1 = 3; - hop2 = 2; + hop2 = 0; + hop3 = 2; + len1 = len2 = 3; + // pfx s1.s2. (xxx.xxx or s3) sfx + rv.reserve(prefix.length() + 15 + suffix.length()); } - std::string rv; - rv.reserve(prefix.length() + 30); rv.append(prefix); - rv.append(SegmentCloak(bindata, 2)); + rv.append(SegmentCloak(bindata, 10, len1)); 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; - } - - 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); - - HashRequest hash(this, HashProvider, input); - std::string rv = hash.binresult.substr(0,6); - for(int i=0; i < 6; i++) + rv.append(SegmentCloak(bindata, 11, len2)); + if (hop2) { - // 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]; + rv.append(1, '.'); + bindata.erase(hop2); + rv.append(SegmentCloak(bindata, 12, len2)); } - return rv; - } - void CloakExistingUsers() - { - std::string* cloak; - for (std::vector::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, const std::string& mask) { - char cmask[MAXBUF]; + 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) { + 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; @@ -335,24 +373,51 @@ class ModuleCloaking : public Module 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() { - ServerInstance->Modules->DoneWithInterface("HashRequest"); } 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); + std::string testcloak = "broken"; + if (Hash) + { + 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") @@ -366,7 +431,7 @@ class ModuleCloaking : public Module 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 @@ -377,10 +442,10 @@ class ModuleCloaking : public Module * 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); + 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) { @@ -400,17 +465,17 @@ class ModuleCloaking : public Module 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) + if (!compatkey[0] || !compatkey[1] || !compatkey[2] || !compatkey[3] || + compatkey[0] >= limit || compatkey[1] >= limit || compatkey[2] >= limit || compatkey[3] >= limit) { std::string detail; - if (!compatkey[1] || compatkey[1] >= limit) + if (!compatkey[0] || compatkey[0] >= limit) detail = " 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) + else if (!compatkey[1] || compatkey[1] >= limit) detail = " 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) + else if (!compatkey[2] || compatkey[2] >= limit) detail = " 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) + else if (!compatkey[3] || compatkey[3] >= limit) detail = " 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); @@ -418,37 +483,26 @@ class ModuleCloaking : public Module } 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 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; - - 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) + if (ipstr != 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); + std::string tail = LastTwoDomainParts(host); - /* Generate a cloak using specialized Hash */ - chost = prefix + "-" + hash.result.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. @@ -459,28 +513,50 @@ class ModuleCloaking : public Module // 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: { - 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; + if (ipstr != host) + chost = prefix + SegmentCloak(host, 1, 6) + LastTwoDomainParts(host); + if (chost.empty() || chost.length() > 50) + chost = SegmentIP(ip, false); break; } case MODE_OPAQUE: default: - chost = prefix + SegmentIP(dest->client_sa); + 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 ¶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)