* ---------------------------------------------------
*/
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <stdint.h>
#include "inspircd.h"
+#include "xline.h"
#include "dns.h"
#include "users.h"
#include "channels.h"
#include "modules.h"
+#ifndef WINDOWS
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#endif
+
/* $ModDesc: Provides handling of DNS blacklists */
/* Class holding data for a single entry */
EnumBanaction banaction;
long duration;
int bitmask;
- DNSBLConfEntry(): duration(86400),bitmask(0) {}
+ unsigned long stats_hits, stats_misses;
+ DNSBLConfEntry(): duration(86400),bitmask(0),stats_hits(0), stats_misses(0) {}
+ ~DNSBLConfEntry() { }
};
userrec* them;
DNSBLConfEntry *ConfEntry;
- public:
+ public:
+
DNSBLResolver(Module *me, InspIRCd *ServerInstance, const std::string &hostname, userrec* u, int userfd, DNSBLConfEntry *conf, bool &cached)
: Resolver(ServerInstance, hostname, DNS_QUERY_A, cached, me)
{
// Now we calculate the bitmask: 256*(256*(256*a+b)+c)+d
if(result.length())
{
- unsigned int bitmask=0;
+ unsigned int bitmask = 0;
+ bool show = false;
in_addr resultip;
/* Convert the result to an in_addr (we can gaurantee we got ipv4)
* YOUR CRACKPIPE. you know who you are. -- Brain
*/
inet_aton(result.c_str(), &resultip);
- bitmask = resultip.s_addr & 0xFF; /* Last octet (network byte order */
+ bitmask = resultip.s_addr >> 24; /* Last octet (network byte order */
bitmask &= ConfEntry->bitmask;
x = reason.find("%ip%");
}
- ServerInstance->WriteOpers("*** Connecting user %s detected as being on a DNS blacklist (%s) with result %d", them->GetFullRealHost(), ConfEntry->name.c_str(), bitmask);
+ ConfEntry->stats_hits++;
switch (ConfEntry->banaction)
{
}
case DNSBLConfEntry::I_KLINE:
{
- ServerInstance->AddKLine(ConfEntry->duration, ServerInstance->Config->ServerName, reason, std::string("*@") + them->GetIPString());
- FOREACH_MOD(I_OnAddKLine,OnAddKLine(ConfEntry->duration, NULL, reason, std::string("*@") + them->GetIPString()));
+ std::string ban = std::string("*@") + them->GetIPString();
+ if (show)
+ ServerInstance->XLines->apply_lines(APPLY_KLINES);
+ show = ServerInstance->XLines->add_kline(ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), ban.c_str());
+ FOREACH_MOD(I_OnAddKLine,OnAddKLine(ConfEntry->duration, NULL, reason, ban));
break;
}
case DNSBLConfEntry::I_GLINE:
{
- ServerInstance->AddGLine(ConfEntry->duration, ServerInstance->Config->ServerName, reason, std::string("*@") + them->GetIPString());
- FOREACH_MOD(I_OnAddGLine,OnAddGLine(ConfEntry->duration, NULL, reason, std::string("*@") + them->GetIPString()));
+ std::string ban = std::string("*@") + them->GetIPString();
+ show = ServerInstance->XLines->add_gline(ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), ban.c_str());
+ if (show)
+ ServerInstance->XLines->apply_lines(APPLY_GLINES);
+ FOREACH_MOD(I_OnAddGLine,OnAddGLine(ConfEntry->duration, NULL, reason, ban));
break;
}
case DNSBLConfEntry::I_ZLINE:
{
- ServerInstance->AddZLine(ConfEntry->duration, ServerInstance->Config->ServerName, reason, them->GetIPString());
+ show = ServerInstance->XLines->add_zline(ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), them->GetIPString());
+ if (show)
+ ServerInstance->XLines->apply_lines(APPLY_ZLINES);
FOREACH_MOD(I_OnAddZLine,OnAddZLine(ConfEntry->duration, NULL, reason, them->GetIPString()));
break;
}
}
break;
}
+
+ if (show)
+ {
+ ServerInstance->WriteOpers("*** Connecting user %s detected as being on a DNS blacklist (%s) with result %d", them->GetFullRealHost(), ConfEntry->name.c_str(), bitmask);
+ }
}
+ else
+ ConfEntry->stats_misses++;
}
+ else
+ ConfEntry->stats_misses++;
}
}
return DNSBLConfEntry::I_UNKNOWN;
}
public:
- ModuleDNSBL(InspIRCd *Me) : Module::Module(Me)
+ ModuleDNSBL(InspIRCd *Me) : Module(Me)
{
ReadConf();
}
void Implements(char* List)
{
- List[I_OnRehash] = List[I_OnUserRegister] = 1;
+ List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnStats] = 1;
}
/** Clear entries and free the mem it was using
void ClearEntries()
{
std::vector<DNSBLConfEntry *>::iterator i;
- while ((i = DNSBLConfEntries.begin()) != DNSBLConfEntries.end())
- {
- DNSBLConfEntries.erase(i);
+ for (std::vector<DNSBLConfEntry *>::iterator i = DNSBLConfEntries.begin(); i != DNSBLConfEntries.end(); i++)
delete *i;
- }
+ DNSBLConfEntries.clear();
}
/** Fill our conf vector with data
e->reason = MyConf->ReadValue("dnsbl", "reason", i);
e->domain = MyConf->ReadValue("dnsbl", "domain", i);
e->banaction = str2banaction(MyConf->ReadValue("dnsbl", "action", i));
- e->duration = ServerInstance->Duration(MyConf->ReadValue("dnsbl", "duration", i).c_str());
+ e->duration = ServerInstance->Duration(MyConf->ReadValue("dnsbl", "duration", i));
e->bitmask = MyConf->ReadInteger("dnsbl", "bitmask", i, false);
/* yeah, logic here is a little messy */
{
ServerInstance->WriteOpers("*** DNSBL(#%d): invalid bitmask",i);
}
- else if (e->name == "")
+ else if (e->name.empty())
{
ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid name",i);
}
- else if (e->domain == "")
+ else if (e->domain.empty())
{
ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid domain",i);
}
}
else
{
- if (e->reason == "")
+ if (e->reason.empty())
{
ServerInstance->WriteOpers("*** DNSBL(#%d): empty reason, using defaults",i);
e->reason = "Your IP has been blacklisted.";
ReadConf();
}
- /*
- * We will check each user that connects *locally* (userrec::fd>0)
- */
virtual int OnUserRegister(userrec* user)
{
+ /* only do lookups on local users */
if (IS_LOCAL(user))
{
/* following code taken from bopm, reverses an IP address. */
/* don't do anything with this hot potato */
return 0;
}
+
+ virtual int OnStats(char symbol, userrec* user, string_list &results)
+ {
+ if (symbol != 'd')
+ return 0;
+
+ unsigned long total_hits = 0, total_misses = 0;
+
+ for (std::vector<DNSBLConfEntry*>::iterator i = DNSBLConfEntries.begin(); i != DNSBLConfEntries.end(); i++)
+ {
+ total_hits += (*i)->stats_hits;
+ total_misses += (*i)->stats_misses;
+
+ results.push_back(std::string(ServerInstance->Config->ServerName) + " 304 " + user->nick + " :DNSBLSTATS DNSbl \"" + (*i)->name + "\" had " +
+ ConvToStr((*i)->stats_hits) + " hits and " + ConvToStr((*i)->stats_misses) + " misses");
+ }
+
+ results.push_back(std::string(ServerInstance->Config->ServerName) + " 304 " + user->nick + " :DNSBLSTATS Total hits: " + ConvToStr(total_hits));
+ results.push_back(std::string(ServerInstance->Config->ServerName) + " 304 " + user->nick + " :DNSBLSTATS Total misses: " + ConvToStr(total_misses));
+
+ return 0;
+ }
};
// stuff down here is the module-factory stuff.
};
-extern "C" void * init_module( void )
+extern "C" DllExport void * init_module( void )
{
return new ModuleDNSBLFactory;
}
projects / user / henk / code / inspircd.git / blobdiff