mirror of
https://github.com/inspircd/inspircd.git
synced 2025-03-10 19:19:02 -04:00
Bit of a tidyup, generate cloak whenever first set, not necessarily on connect
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@10500 e03df62e-2008-0410-955e-edbf42e46eb7
This commit is contained in:
w00t
parent
423add1bda
commit
71f99fd5b1
@ -32,6 +32,74 @@ class CloakUser : public ModeHandler
|
||||
Module* HashProvider;
|
||||
const char *xtab[4];
|
||||
|
||||
void ApplyCloak(User *dest)
|
||||
{
|
||||
if (dest->host.find('.') != std::string::npos || dest->host.find(':') != std::string::npos)
|
||||
{
|
||||
unsigned int iv[] = { key1, key2, key3, key4 };
|
||||
std::string a = 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 (!ipalways)
|
||||
{
|
||||
/** Reset the Hash module, and send it our IV and hex table */
|
||||
HashResetRequest(Sender, HashProvider).Send();
|
||||
HashKeyRequest(Sender, HashProvider, iv).Send();
|
||||
HashHexRequest(Sender, HashProvider, xtab[(dest->host[0]) % 4]);
|
||||
|
||||
/* Generate a cloak using specialized Hash */
|
||||
std::string hostcloak = prefix + "-" + std::string(HashSumRequest(Sender, 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.
|
||||
*/
|
||||
#ifdef IPV6
|
||||
in6_addr testaddr;
|
||||
in_addr testaddr2;
|
||||
if ((dest->GetProtocolFamily() == AF_INET6) && (inet_pton(AF_INET6,dest->host.c_str(),&testaddr) < 1) && (hostcloak.length() <= 64))
|
||||
/* Invalid ipv6 address, and ipv6 user (resolved host) */
|
||||
b = hostcloak;
|
||||
else if ((dest->GetProtocolFamily() == AF_INET) && (inet_aton(dest->host.c_str(),&testaddr2) < 1) && (hostcloak.length() <= 64))
|
||||
/* Invalid ipv4 address, and ipv4 user (resolved host) */
|
||||
b = hostcloak;
|
||||
else
|
||||
/* Valid ipv6 or ipv4 address (not resolved) ipv4 or ipv6 user */
|
||||
b = ((!strchr(dest->host.c_str(),':')) ? Cloak4(dest->host.c_str()) : Cloak6(dest->host.c_str()));
|
||||
#else
|
||||
in_addr testaddr;
|
||||
if ((inet_aton(dest->host.c_str(),&testaddr) < 1) && (hostcloak.length() <= 64))
|
||||
/* Invalid ipv4 address, and ipv4 user (resolved host) */
|
||||
b = hostcloak;
|
||||
else
|
||||
/* Valid ipv4 address (not resolved) ipv4 user */
|
||||
b = Cloak4(dest->host.c_str());
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef IPV6
|
||||
if (dest->GetProtocolFamily() == AF_INET6)
|
||||
b = Cloak6(dest->GetIPString());
|
||||
#endif
|
||||
if (dest->GetProtocolFamily() == AF_INET)
|
||||
b = Cloak4(dest->GetIPString());
|
||||
}
|
||||
|
||||
dest->Extend("cloaked_host", new std::string(b));
|
||||
}
|
||||
}
|
||||
|
||||
/** 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.
|
||||
*
|
||||
@ -100,13 +168,17 @@ class CloakUser : public ModeHandler
|
||||
|
||||
std::string* cloak;
|
||||
|
||||
if (dest->GetExt("cloaked_host", cloak))
|
||||
if (!dest->GetExt("cloaked_host", cloak))
|
||||
{
|
||||
/* Cloaked host has been set before on this user, don't bother to recalculate and waste cpu */
|
||||
dest->ChangeDisplayedHost(cloak->c_str());
|
||||
dest->SetMode('x',true);
|
||||
return MODEACTION_ALLOW;
|
||||
/* Cloaked host has not been calculated previously */
|
||||
this->ApplyCloak(dest);
|
||||
if (!dest->GetExt("cloaked_host", cloak))
|
||||
throw "ack, can't cloak!";
|
||||
}
|
||||
|
||||
dest->ChangeDisplayedHost(cloak->c_str());
|
||||
dest->SetMode('x',true);
|
||||
return MODEACTION_ALLOW;
|
||||
}
|
||||
}
|
||||
else
|
||||
@ -358,74 +430,6 @@ class ModuleCloaking : public Module
|
||||
cu->DoRehash();
|
||||
}
|
||||
|
||||
virtual void OnUserConnect(User* dest)
|
||||
{
|
||||
if (dest->host.find('.') != std::string::npos || dest->host.find(':') != std::string::npos)
|
||||
{
|
||||
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)
|
||||
{
|
||||
/** 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.
|
||||
*/
|
||||
#ifdef IPV6
|
||||
in6_addr testaddr;
|
||||
in_addr testaddr2;
|
||||
if ((dest->GetProtocolFamily() == AF_INET6) && (inet_pton(AF_INET6,dest->host.c_str(),&testaddr) < 1) && (hostcloak.length() <= 64))
|
||||
/* Invalid ipv6 address, and ipv6 user (resolved host) */
|
||||
b = hostcloak;
|
||||
else if ((dest->GetProtocolFamily() == AF_INET) && (inet_aton(dest->host.c_str(),&testaddr2) < 1) && (hostcloak.length() <= 64))
|
||||
/* Invalid ipv4 address, and ipv4 user (resolved host) */
|
||||
b = hostcloak;
|
||||
else
|
||||
/* Valid ipv6 or ipv4 address (not resolved) ipv4 or ipv6 user */
|
||||
b = ((!strchr(dest->host.c_str(),':')) ? cu->Cloak4(dest->host.c_str()) : cu->Cloak6(dest->host.c_str()));
|
||||
#else
|
||||
in_addr testaddr;
|
||||
if ((inet_aton(dest->host.c_str(),&testaddr) < 1) && (hostcloak.length() <= 64))
|
||||
/* Invalid ipv4 address, and ipv4 user (resolved host) */
|
||||
b = hostcloak;
|
||||
else
|
||||
/* Valid ipv4 address (not resolved) ipv4 user */
|
||||
b = cu->Cloak4(dest->host.c_str());
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef IPV6
|
||||
if (dest->GetProtocolFamily() == AF_INET6)
|
||||
b = cu->Cloak6(dest->GetIPString());
|
||||
#endif
|
||||
if (dest->GetProtocolFamily() == AF_INET)
|
||||
b = cu->Cloak4(dest->GetIPString());
|
||||
}
|
||||
|
||||
dest->Extend("cloaked_host", new std::string(b));
|
||||
}
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
MODULE_INIT(ModuleCloaking)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user