X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_dnsbl.cpp;h=bfa511da26a5c4fb3136f71acc43b506dfa46913;hb=4e7c9f5a9257723765f9994aff90440a0b6cf3c9;hp=c7631ae789631820ec261bc96b6c26e414788b71;hpb=9ffed8ccffe87625cd8fd65e4c07bbdc0873d351;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index c7631ae78..bfa511da2 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -11,16 +11,15 @@ * --------------------------------------------------- */ +#include "inspircd.h" +#include "xline.h" + +#ifndef WINDOWS #include #include #include #include -#include -#include "inspircd.h" -#include "dns.h" -#include "users.h" -#include "channels.h" -#include "modules.h" +#endif /* $ModDesc: Provides handling of DNS blacklists */ @@ -29,12 +28,15 @@ 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; + unsigned char records[256]; unsigned long stats_hits, stats_misses; - DNSBLConfEntry(): duration(86400),bitmask(0),stats_hits(0), stats_misses(0) {} + DNSBLConfEntry(): type(A_BITMASK),duration(86400),bitmask(0),stats_hits(0), stats_misses(0) {} ~DNSBLConfEntry() { } }; @@ -47,7 +49,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) { @@ -56,27 +59,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 bitmask = 0, record = 0; + bool show = false, match = false; in_addr resultip; - /* Convert the result to an in_addr (we can gaurantee we got ipv4) - * Whoever did the loop that was here before, I AM CONFISCATING - * YOUR CRACKPIPE. you know who you are. -- Brain - */ inet_aton(result.c_str(), &resultip); - bitmask = resultip.s_addr >> 24; /* Last octet (network byte order */ - bitmask &= ConfEntry->bitmask; + 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; + } - if (bitmask != 0) + if (match) { std::string reason = ConfEntry->reason; std::string::size_type x = reason.find("%ip%"); @@ -87,7 +102,6 @@ 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) @@ -99,19 +113,27 @@ class DNSBLResolver : public Resolver } 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; } @@ -121,6 +143,11 @@ 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++; @@ -161,7 +188,7 @@ class ModuleDNSBL : public Module return DNSBLConfEntry::I_UNKNOWN; } public: - ModuleDNSBL(InspIRCd *Me) : Module::Module(Me) + ModuleDNSBL(InspIRCd *Me) : Module(Me) { ReadConf(); } @@ -205,20 +232,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); } @@ -228,7 +272,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."; @@ -251,11 +295,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. */ @@ -335,28 +377,4 @@ class ModuleDNSBL : public Module } }; -// stuff down here is the module-factory stuff. - -class ModuleDNSBLFactory : public ModuleFactory -{ - public: - ModuleDNSBLFactory() - { - } - - ~ModuleDNSBLFactory() - { - } - - virtual Module *CreateModule(InspIRCd *Me) - { - return new ModuleDNSBL(Me); - } - -}; - - -extern "C" void * init_module( void ) -{ - return new ModuleDNSBLFactory; -} +MODULE_INIT(ModuleDNSBL)