*/
#include "inspircd.h"
-#include "wildcard.h"
#include "m_hash.h"
/* $ModDesc: Provides masking of user hostnames */
* 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)
std::string* cloak;
+ if (!dest->GetExt("cloaked_host", cloak))
+ {
+ /* Force creation of missing cloak */
+ Sender->OnUserConnect(dest);
+ }
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;
}
}
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.c_str());
dest->SetMode('x',false);
/* Stick them all together */
return irc::stringjoiner(":", hashies, 0, hashies.size() - 1).GetJoined();
}
-
+
void DoRehash()
{
ConfigReader Conf(ServerInstance);
bool lowercase;
-
- /* These are *not* using the need_positive parameter of ReadInteger -
+
+ /* 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
prefix = Conf.ReadValue("cloak","prefix",0);
ipalways = Conf.ReadFlag("cloak", "ipalways", 0);
lowercase = Conf.ReadFlag("cloak", "lowercase", 0);
-
+
if (!lowercase)
{
xtab[0] = "F92E45D871BCA630";
class ModuleCloaking : public Module
{
private:
-
+
CloakUser* cu;
Module* HashModule;
ServerInstance->Modules->UseInterface("HashRequest");
- Implementation eventlist[] = { I_OnRehash, I_OnUserDisconnect, I_OnCleanup, I_OnCheckBan, I_OnUserConnect, I_OnSyncUserMetaData };
+ Implementation eventlist[] = { I_OnRehash, I_OnUserDisconnect, I_OnCleanup, I_OnCheckBan, I_OnUserConnect, I_OnSyncUserMetaData, I_OnCleanup };
ServerInstance->Modules->Attach(eventlist, this, 6);
+
+ CloakExistingUsers();
}
void OnSyncUserMetaData(User* user, Module* proto,void* opaque, const std::string &extname, bool displayable)
}
}
+ void CloakExistingUsers()
+ {
+ std::string* cloak;
+ for (std::vector<User*>::iterator u = ServerInstance->Users->local_users.begin(); u != ServerInstance->Users->local_users.end(); u++)
+ {
+ if (!(*u)->GetExt("cloaked_host", cloak))
+ {
+ OnUserConnect(*u);
+ }
+ }
+ }
virtual int OnCheckBan(User* user, Channel* chan)
{
snprintf(mask, MAXBUF, "%s!%s@%s", user->nick.c_str(), user->ident.c_str(), tofree->c_str());
for (BanList::iterator i = chan->bans.begin(); i != chan->bans.end(); i++)
{
- if (match(mask,i->data))
+ if (InspIRCd::Match(mask,i->data))
return -1;
}
}
{
/* Needs to be after m_banexception etc. */
ServerInstance->Modules->SetPriority(this, I_OnCheckBan, PRIO_LAST);
+
+ /* but before m_conn_umodes, so host is generated ready to apply */
+ Module *um = ServerInstance->Modules->Find("m_conn_umodes.so");
+ ServerInstance->Modules->SetPriority(this, I_OnUserConnect, PRIO_AFTER, &um);
}
virtual void OnUserDisconnect(User* user)
{
std::string* tofree;
if (user->GetExt("cloaked_host", tofree))
+ {
delete tofree;
+ user->Shrink("cloaked_host");
+ }
}
virtual void OnCleanup(int target_type, void* item)
if (target_type == TYPE_USER)
OnUserDisconnect((User*)item);
}
-
+
virtual ~ModuleCloaking()
{
ServerInstance->Modes->DelMode(cu);
delete cu;
ServerInstance->Modules->DoneWithInterface("HashRequest");
}
-
+
virtual Version GetVersion()
{
// returns the version number of the module to be
// listed in /MODULES
- return Version(1,2,0,2,VF_COMMON|VF_VENDOR,API_VERSION);
+ return Version("$Id$", VF_COMMON|VF_VENDOR,API_VERSION);
}
virtual void OnRehash(User* user, const std::string ¶meter)
virtual void OnUserConnect(User* dest)
{
+ std::string* tofree;
+ if (dest->GetExt("cloaked_host", tofree))
+ return;
+
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 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.
+ * 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.
*/
projects / user / henk / code / inspircd.git / blobdiff