X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_dnsbl.cpp;h=3b68e1c94356fae6602be1d385bdc2a250219b7f;hb=d185decae97752368d5cf62311cbc0d1a52aa22c;hp=7f4f6ac88d7039af2d3ed686742fad5b77787bdb;hpb=14e03c69169fb16889e528d26ea7b15960fc2744;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index 7f4f6ac88..3b68e1c94 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -11,30 +11,32 @@ * --------------------------------------------------- */ +#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 */ /* Class holding data for a single entry */ -class DNSBLConfEntry +class DNSBLConfEntry : public classbase { 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() { } }; @@ -44,39 +46,52 @@ class DNSBLConfEntry class DNSBLResolver : public Resolver { int theirfd; - userrec* them; + User* them; DNSBLConfEntry *ConfEntry; - 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) + public: + + DNSBLResolver(Module *me, InspIRCd *Instance, const std::string &hostname, User* u, int userfd, DNSBLConfEntry *conf, bool &cached) + : Resolver(Instance, hostname, DNS_QUERY_A, cached, me) { theirfd = userfd; them = u; 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,32 +102,49 @@ 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) { case DNSBLConfEntry::I_KILL: { - userrec::QuitUser(ServerInstance, them, std::string("Killed (") + reason + ")"); + ServerInstance->Users->QuitUser(them, std::string("Killed (") + reason + ")"); break; } 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())); + KLine* kl = new KLine(ServerInstance, ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), + "*", them->GetIPString()); + if (ServerInstance->XLines->AddLine(kl,NULL)) + { + ServerInstance->XLines->ApplyLines(); + } + else + delete kl; 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())); + GLine* gl = new GLine(ServerInstance, ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), + "*", them->GetIPString()); + if (ServerInstance->XLines->AddLine(gl,NULL)) + { + ServerInstance->XLines->ApplyLines(); + } + else + delete gl; break; } case DNSBLConfEntry::I_ZLINE: { - ServerInstance->AddZLine(ConfEntry->duration, ServerInstance->Config->ServerName, reason, them->GetIPString()); - FOREACH_MOD(I_OnAddZLine,OnAddZLine(ConfEntry->duration, NULL, reason, them->GetIPString())); + ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), + them->GetIPString()); + if (ServerInstance->XLines->AddLine(zl,NULL)) + { + ServerInstance->XLines->ApplyLines(); + } + else + delete zl; break; } case DNSBLConfEntry::I_UNKNOWN: @@ -121,10 +153,17 @@ class DNSBLResolver : public Resolver } break; } + + if (show) + { + ServerInstance->SNO->WriteToSnoMask('A', "Connecting user %s detected as being on a DNS blacklist (%s) with result %d", them->GetFullRealHost().c_str(), ConfEntry->name.c_str(), bitmask); + } } else ConfEntry->stats_misses++; } + else + ConfEntry->stats_misses++; } } @@ -159,9 +198,11 @@ class ModuleDNSBL : public Module return DNSBLConfEntry::I_UNKNOWN; } public: - ModuleDNSBL(InspIRCd *Me) : Module::Module(Me) + ModuleDNSBL(InspIRCd *Me) : Module(Me) { ReadConf(); + Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnStats }; + ServerInstance->Modules->Attach(eventlist, this, 3); } virtual ~ModuleDNSBL() @@ -174,16 +215,11 @@ class ModuleDNSBL : public Module return Version(2, 0, 0, 1, VF_VENDOR, API_VERSION); } - void Implements(char* List) - { - List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnStats] = 1; - } /** Clear entries and free the mem it was using */ void ClearEntries() { - std::vector::iterator i; for (std::vector::iterator i = DNSBLConfEntries.begin(); i != DNSBLConfEntries.end(); i++) delete *i; DNSBLConfEntries.clear(); @@ -203,32 +239,49 @@ 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); + ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): invalid bitmask",i); } - else if (e->name == "") + else if (e->name.empty()) { - ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid name",i); + ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): Invalid name",i); } - else if (e->domain == "") + else if (e->domain.empty()) { - ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid domain",i); + ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): Invalid domain",i); } else if (e->banaction == DNSBLConfEntry::I_UNKNOWN) { - ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid banaction", i); + ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): Invalid banaction", i); } else { - if (e->reason == "") + if (e->reason.empty()) { - ServerInstance->WriteOpers("*** DNSBL(#%d): empty reason, using defaults",i); + ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): empty reason, using defaults",i); e->reason = "Your IP has been blacklisted."; } @@ -244,16 +297,14 @@ class ModuleDNSBL : public Module delete MyConf; } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user, const std::string ¶meter) { ReadConf(); } - /* - * We will check each user that connects *locally* (userrec::fd>0) - */ - virtual int OnUserRegister(userrec* user) + virtual int OnUserRegister(User* user) { + /* only do lookups on local users */ if (IS_LOCAL(user)) { /* following code taken from bopm, reverses an IP address. */ @@ -309,52 +360,28 @@ class ModuleDNSBL : public Module /* don't do anything with this hot potato */ return 0; } - - virtual int OnStats(char symbol, userrec* user, string_list &results) + + virtual int OnStats(char symbol, User* user, string_list &results) { if (symbol != 'd') return 0; - + unsigned long total_hits = 0, total_misses = 0; 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; - } -}; -// stuff down here is the module-factory stuff. - -class ModuleDNSBLFactory : public ModuleFactory -{ - public: - ModuleDNSBLFactory() - { - } - - ~ModuleDNSBLFactory() - { - } - - virtual Module *CreateModule(InspIRCd *Me) - { - return new ModuleDNSBL(Me); + return 0; } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleDNSBLFactory; -} +MODULE_INIT(ModuleDNSBL)