X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_dnsbl.cpp;h=5de6f2063218edd7e2e5429d9301ebe4d11d5281;hb=78fa4165c90088523e623ab2b64ca0db0d19def0;hp=213c2f67e4e812794b66c13905a055d442243bd3;hpb=369ee31c56efa23e8a9f82378d1b136fbe59aea2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index 213c2f67e..5de6f2063 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -11,17 +11,20 @@ * --------------------------------------------------- */ -#include -#include -#include -#include -#include #include "inspircd.h" +#include "xline.h" #include "dns.h" #include "users.h" #include "channels.h" #include "modules.h" +#ifndef WINDOWS +#include +#include +#include +#include +#endif + /* $ModDesc: Provides handling of DNS blacklists */ /* Class holding data for a single entry */ @@ -29,11 +32,16 @@ class DNSBLConfEntry { public: enum EnumBanaction { I_UNKNOWN, I_KILL, I_ZLINE, I_KLINE, I_GLINE }; + enum EnumType { A_RECORD, A_BITMASK }; std::string name, domain, reason; EnumBanaction banaction; + EnumType type; long duration; int bitmask; - DNSBLConfEntry(): duration(86400),bitmask(0) {} + unsigned char records[256]; + unsigned long stats_hits, stats_misses; + DNSBLConfEntry(): type(A_BITMASK),duration(86400),bitmask(0),stats_hits(0), stats_misses(0) {} + ~DNSBLConfEntry() { } }; @@ -45,7 +53,8 @@ class DNSBLResolver : public Resolver 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) { @@ -54,42 +63,39 @@ class DNSBLResolver : public Resolver ConfEntry = conf; } - virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached) + /* Note: This may be called multiple times for multiple A record results */ + virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0) { + /* for bitmask reply types, we arent interested in any but the first result (number 0) */ + if ((ConfEntry->type == DNSBLConfEntry::A_BITMASK) && (resultnum)) + return; + /* Check the user still exists */ if ((them) && (them == ServerInstance->SE->GetRef(theirfd))) { // Now we calculate the bitmask: 256*(256*(256*a+b)+c)+d if(result.length()) { - unsigned int bitmask=0; - unsigned int octetpos=0; - std::string tmp = result; + unsigned int bitmask = 0, record = 0; + bool show = false, match = false; + in_addr resultip; - while(tmp.length()>0) - { - std::string octet; - /* Fix by brain, npos is -1, so unsigned int will never match */ - std::string::size_type lastdot = tmp.rfind("."); - - if (lastdot == std::string::npos) - { - octet=tmp; - tmp.clear(); - } - else - { - octet=tmp.substr(lastdot+1,tmp.length()-lastdot+1); - tmp.resize(lastdot); - } + inet_aton(result.c_str(), &resultip); - bitmask += (256 ^ octetpos) * atoi(octet.c_str()); - octetpos += 1; + switch (ConfEntry->type) + { + case DNSBLConfEntry::A_BITMASK: + bitmask = resultip.s_addr >> 24; /* Last octet (network byte order) */ + bitmask &= ConfEntry->bitmask; + match = (bitmask != 0); + break; + case DNSBLConfEntry::A_RECORD: + record = resultip.s_addr >> 24; /* Last octet */ + match = (ConfEntry->records[record] == 1); + break; } - bitmask &= ConfEntry->bitmask; - - if (bitmask != 0) + if (match) { std::string reason = ConfEntry->reason; std::string::size_type x = reason.find("%ip%"); @@ -100,7 +106,7 @@ class DNSBLResolver : public Resolver 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) { @@ -111,17 +117,28 @@ class DNSBLResolver : public Resolver } case DNSBLConfEntry::I_KLINE: { - ServerInstance->AddKLine(ConfEntry->duration, ServerInstance->Config->ServerName, 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()); + 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; } case DNSBLConfEntry::I_UNKNOWN: @@ -130,8 +147,17 @@ class DNSBLResolver : public Resolver } 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++; } } @@ -166,7 +192,7 @@ class ModuleDNSBL : public Module return DNSBLConfEntry::I_UNKNOWN; } public: - ModuleDNSBL(InspIRCd *Me) : Module::Module(Me) + ModuleDNSBL(InspIRCd *Me) : Module(Me) { ReadConf(); } @@ -183,7 +209,7 @@ class ModuleDNSBL : public Module 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 @@ -191,11 +217,9 @@ class ModuleDNSBL : public Module void ClearEntries() { std::vector::iterator i; - while ((i = DNSBLConfEntries.begin()) != DNSBLConfEntries.end()) - { - DNSBLConfEntries.erase(i); + for (std::vector::iterator i = DNSBLConfEntries.begin(); i != DNSBLConfEntries.end(); i++) delete *i; - } + DNSBLConfEntries.clear(); } /** Fill our conf vector with data @@ -212,20 +236,37 @@ class ModuleDNSBL : public Module e->name = MyConf->ReadValue("dnsbl", "name", i); e->reason = MyConf->ReadValue("dnsbl", "reason", i); e->domain = MyConf->ReadValue("dnsbl", "domain", i); + + if (MyConf->ReadValue("dnsbl", "type", i) == "bitmask") + { + e->type = DNSBLConfEntry::A_BITMASK; + e->bitmask = MyConf->ReadInteger("dnsbl", "bitmask", i, false); + } + else + { + memset(e->records, 0, 256); + e->type = DNSBLConfEntry::A_RECORD; + irc::portparser portrange(MyConf->ReadValue("dnsbl", "records", i), false); + long item = -1; + while ((item = portrange.GetToken())) + e->records[item] = 1; + } + e->banaction = str2banaction(MyConf->ReadValue("dnsbl", "action", i)); - e->duration = ServerInstance->Duration(MyConf->ReadValue("dnsbl", "duration", i).c_str()); - e->bitmask = MyConf->ReadInteger("dnsbl", "bitmask", i, false); + e->duration = ServerInstance->Duration(MyConf->ReadValue("dnsbl", "duration", i)); + + /* Use portparser for record replies */ /* yeah, logic here is a little messy */ if (e->bitmask <= 0) { 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); } @@ -235,7 +276,7 @@ class ModuleDNSBL : public Module } else { - if (e->reason == "") + if (e->reason.empty()) { ServerInstance->WriteOpers("*** DNSBL(#%d): empty reason, using defaults",i); e->reason = "Your IP has been blacklisted."; @@ -258,11 +299,9 @@ class ModuleDNSBL : public Module 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. */ @@ -270,13 +309,30 @@ class ModuleDNSBL : public Module unsigned char a, b, c, d; char reversedipbuf[128]; std::string reversedip; + bool success = false; if (!inet_aton(user->GetIPString(), &in)) { - ServerInstance->WriteOpers("Invalid IP address in m_dnsbl! Bailing check"); - return 0; +#ifdef IPV6 + /* We could have an ipv6 address here */ + std::string x = user->GetIPString(); + /* Is it a 4in6 address? (Compensate for this kernel kludge that people love) */ + if (x.find("0::ffff:") == 0) + { + x.erase(x.begin(), x.begin() + 8); + if (inet_aton(x.c_str(), &in)) + success = true; + } +#endif + } + else + { + success = true; } + if (!success) + return 0; + d = (unsigned char) (in.s_addr >> 24) & 0xFF; c = (unsigned char) (in.s_addr >> 16) & 0xFF; b = (unsigned char) (in.s_addr >> 8) & 0xFF; @@ -289,7 +345,7 @@ class ModuleDNSBL : public Module for (std::vector::iterator i = DNSBLConfEntries.begin(); i != DNSBLConfEntries.end(); i++) { // Fill hostname with a dnsbl style host (d.c.b.a.domain.tld) - std::string hostname=reversedip+"."+ (*i)->domain; + std::string hostname = reversedip + "." + (*i)->domain; /* now we'd need to fire off lookups for `hostname'. */ bool cached; @@ -301,30 +357,28 @@ class ModuleDNSBL : public Module /* don't do anything with this hot potato */ return 0; } -}; - -// stuff down here is the module-factory stuff. - -class ModuleDNSBLFactory : public ModuleFactory -{ - public: - ModuleDNSBLFactory() + + virtual int OnStats(char symbol, userrec* user, string_list &results) { - } - - ~ModuleDNSBLFactory() - { - } + if (symbol != 'd') + return 0; + + unsigned long total_hits = 0, total_misses = 0; - virtual Module *CreateModule(InspIRCd *Me) - { - return new ModuleDNSBL(Me); + for (std::vector::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; } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleDNSBLFactory; -} +MODULE_INIT(ModuleDNSBL)