X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_cloaking.cpp;h=f4cfdb54f8b07c7186e11f1e5b27b1196a6c5ee5;hb=a5d110282a864fd2e91b51ce360a977cd0643657;hp=c17dedcbfdfad7865c495acc44fac760f12bf265;hpb=44ad8a5e3359950f0fb98c6c8d6f407baffaf694;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_cloaking.cpp b/src/modules/m_cloaking.cpp index c17dedcbf..f4cfdb54f 100644 --- a/src/modules/m_cloaking.cpp +++ b/src/modules/m_cloaking.cpp @@ -1,16 +1,28 @@ -/* +------------------------------------+ - * | 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 + * 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 "hash.h" @@ -81,9 +93,13 @@ class CloakUser : public ModeHandler /* don't allow this user to spam modechanges */ if (source == dest) user->CommandFloodPenalty += 5000; - + if (adding) { + // assume this is more correct + if (user->registered != REG_ALL && user->host != user->dhost) + return MODEACTION_DENY; + std::string* cloak = ext.get(user); if (!cloak) @@ -106,28 +122,40 @@ class CloakUser : public ModeHandler /* User is removing the mode, so restore their real host * and make it match the displayed one. */ - user->ChangeDisplayedHost(user->host.c_str()); user->SetMode('x',false); + user->ChangeDisplayedHost(user->host.c_str()); return MODEACTION_ALLOW; } } }; +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]; dynamic_reference Hash; - public: - ModuleCloaking() : cu(this), mode(MODE_OPAQUE), Hash(this, "hash/md5") + ModuleCloaking() : cu(this), mode(MODE_OPAQUE), ck(this), Hash(this, "hash/md5") { } @@ -135,14 +163,12 @@ class ModuleCloaking : public Module { 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, I_OnChangeHost }; - ServerInstance->Modules->Attach(eventlist, this, 4); + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } /** This function takes a domain name string and returns just the last two domain parts, @@ -188,7 +214,7 @@ class ModuleCloaking : public Module 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(1, '\0'); // null does not terminate a C++ string input.append(item); std::string rv = Hash->sum(input).substr(0,len); @@ -246,14 +272,14 @@ class ModuleCloaking : public Module 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(); @@ -273,7 +299,9 @@ class ModuleCloaking : public Module hop3 = 4; len1 = 6; len2 = 4; - rv.reserve(prefix.length() + 29); + // pfx s1.s2.s3. (xxxx.xxxx or s4) sfx + // 6 4 4 9/6 + rv.reserve(prefix.length() + 26 + suffix.length()); } else { @@ -282,7 +310,8 @@ class ModuleCloaking : public Module hop2 = 0; hop3 = 2; len1 = len2 = 3; - rv.reserve(prefix.length() + 18); + // pfx s1.s2. (xxx.xxx or s3) sfx + rv.reserve(prefix.length() + 15 + suffix.length()); } rv.append(prefix); @@ -302,21 +331,21 @@ class ModuleCloaking : public Module rv.append(1, '.'); bindata.erase(hop3); rv.append(SegmentCloak(bindata, 13, 6)); - rv.append(".IP"); + 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); } @@ -352,7 +381,11 @@ class ModuleCloaking : public Module // mode change, we will call SetMode back to true AFTER the host change is done. void OnChangeHost(User* u, const std::string& host) { - u->SetMode('x', false); + if(u->IsModeSet('x')) + { + u->SetMode('x', false); + u->WriteServ("MODE %s -x", u->nick.c_str()); + } } ~ModuleCloaking() @@ -373,10 +406,10 @@ class ModuleCloaking : public Module testcloak = Hash->sumIV(compatkey, xtab[0], "*").substr(0,10); break; case MODE_HALF_CLOAK: - testcloak = prefix + SegmentCloak("*", 3, 8); + testcloak = prefix + SegmentCloak("*", 3, 8) + suffix; break; case MODE_OPAQUE: - testcloak = prefix + SegmentCloak("*", 4, 8); + testcloak = prefix + SegmentCloak("*", 4, 8) + suffix; } } return Version("Provides masking of user hostnames", VF_COMMON|VF_VENDOR, testcloak); @@ -384,10 +417,11 @@ class ModuleCloaking : public Module 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") @@ -401,7 +435,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 @@ -412,10 +446,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[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) { @@ -453,31 +487,29 @@ 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(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; + irc::sockets::sockaddrs hostip; + bool host_is_ip = irc::sockets::aptosa(host, ip.port(), hostip) && hostip == ip; + switch (mode) { case MODE_COMPAT_HOST: { - if (ipstr != dest->host) + if (!host_is_ip) { - 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. @@ -488,26 +520,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: { - if (ipstr != dest->host) - chost = prefix + SegmentCloak(dest->host, 1, 6) + LastTwoDomainParts(dest->host); + if (!host_is_ip) + 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 ¶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)