X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_dnsbl.cpp;h=7fb652cf715ffa8ee7cd012398fa975dcc45b4b3;hb=b5e220008782b2d538cb8e6e3b1923af0c13fb99;hp=713924110de52aad7bd84e2641eaaab087543187;hpb=fe46f3c228ae993b59fbf5eca423c3171d90e1b3;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index 713924110..7fb652cf7 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -11,29 +11,33 @@ * --------------------------------------------------- */ +#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; - 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() { } }; @@ -42,88 +46,107 @@ 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; } + /* Note: This may be called multiple times for multiple A record results */ virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached) { /* Check the user still exists */ if ((them) && (them == ServerInstance->SE->GetRef(theirfd))) { - ServerInstance->Log(DEBUG, "m_dnsbl: %s got a result from dnsbl %s", them->nick, ConfEntry->name.c_str()); - // 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 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("."); + inet_aton(result.c_str(), &resultip); - if (lastdot == std::string::npos) - { - octet=tmp; - tmp.clear(); - } - else - { - octet=tmp.substr(lastdot+1,tmp.length()-lastdot+1); - tmp.resize(lastdot); - } - - 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%"); while (x != std::string::npos) { reason.erase(x, 4); - reason.insert(x, "%ip%"); + reason.insert(x, them->GetIPString()); 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()); + KLine* kl = new KLine(ServerInstance, ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), + "*", them->GetIPString()); + if (ServerInstance->XLines->AddLine(kl,NULL)) + { + ServerInstance->SNO->WriteToSnoMask('x',"m_dnsbl added K:line on *@%s to expire on %s (%s).", + them->GetIPString(), ServerInstance->TimeString(kl->expiry).c_str(), reason.c_str()); + ServerInstance->XLines->ApplyLines(); + } + else + delete kl; break; } case DNSBLConfEntry::I_GLINE: { - ServerInstance->AddGLine(ConfEntry->duration, ServerInstance->Config->ServerName, 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->SNO->WriteToSnoMask('x',"m_dnsbl added G:line on *@%s to expire on %s (%s).", + them->GetIPString(), ServerInstance->TimeString(gl->expiry).c_str(), reason.c_str()); + ServerInstance->XLines->ApplyLines(); + } + else + delete gl; break; } case DNSBLConfEntry::I_ZLINE: { - ServerInstance->AddZLine(ConfEntry->duration, ServerInstance->Config->ServerName, 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->SNO->WriteToSnoMask('x',"m_dnsbl added Z:line on *@%s to expire on %s (%s).", + them->GetIPString(), ServerInstance->TimeString(zl->expiry).c_str(), reason.c_str()); + ServerInstance->XLines->ApplyLines(); + } + else + delete zl; break; } case DNSBLConfEntry::I_UNKNOWN: @@ -132,26 +155,21 @@ class DNSBLResolver : public Resolver } break; } + + ServerInstance->SNO->WriteGlobalSno('a', "Connecting user %s detected as being on a DNS blacklist (%s) with result %d", them->GetFullRealHost().c_str(), ConfEntry->name.c_str(), (ConfEntry->type==DNSBLConfEntry::A_BITMASK) ? bitmask : record); } + else + ConfEntry->stats_misses++; } + else + ConfEntry->stats_misses++; } } virtual void OnError(ResolverError e, const std::string &errormessage) { - /* - this just means they don't appear in the respective dnsbl - if ((them) && (them == ServerInstance->SE->GetRef(theirfd))) - { - } - */ - /* Check the user still exists */ - if ((them) && (them == ServerInstance->SE->GetRef(theirfd))) - { - ServerInstance->Log(DEBUG, "m_dnsbl: %s got an error while resolving for dnsbl %s", them->nick, ConfEntry->name.c_str()); - } } - + virtual ~DNSBLResolver() { } @@ -161,7 +179,7 @@ class ModuleDNSBL : public Module { private: std::vector DNSBLConfEntries; - + /* * Convert a string to EnumBanaction */ @@ -175,44 +193,39 @@ class ModuleDNSBL : public Module return DNSBLConfEntry::I_ZLINE; if(action.compare("GLINE")==0) return DNSBLConfEntry::I_GLINE; - + 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() { ClearEntries(); } - + virtual Version GetVersion() { - return Version(2, 0, 0, 1, VF_VENDOR, API_VERSION); + return Version("$Id$", VF_VENDOR, API_VERSION); } - void Implements(char* List) - { - List[I_OnRehash] = List[I_OnUserRegister] = 1; - } /** Clear entries and free the mem it was using */ 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 - */ + */ virtual void ReadConf() { ConfigReader *MyConf = new ConfigReader(ServerInstance); @@ -225,32 +238,53 @@ 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, sizeof(e->records)); + 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", "60", i)); + + /* Use portparser for record replies */ /* yeah, logic here is a little messy */ - if (e->bitmask <= 0) + if ((e->bitmask <= 0) && (DNSBLConfEntry::A_BITMASK == e->type)) { - ServerInstance->WriteOpers("*** DNSBL(#%d): invalid bitmask",i); + ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(#%d): invalid bitmask",i); } - else if (e->name == "") + else if (e->name.empty()) { - ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid name",i); + ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(#%d): Invalid name",i); } - else if (e->domain == "") + else if (e->domain.empty()) { - ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid domain",i); + ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(#%d): Invalid domain",i); } else if (e->banaction == DNSBLConfEntry::I_UNKNOWN) { - ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid banaction", i); + ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(#%d): Invalid banaction", i); + } + else if (e->duration <= 0) + { + ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(#%d): Invalid duration", i); } else { - if (e->reason == "") + if (e->reason.empty()) { - ServerInstance->WriteOpers("*** DNSBL(#%d): empty reason, using defaults",i); + ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(#%d): empty reason, using defaults",i); e->reason = "Your IP has been blacklisted."; } @@ -266,16 +300,14 @@ class ModuleDNSBL : public Module delete MyConf; } - virtual void OnRehash(userrec* user, const std::string ¶meter) + virtual void OnRehash(User* user) { 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. */ @@ -283,12 +315,12 @@ class ModuleDNSBL : public Module unsigned char a, b, c, d; char reversedipbuf[128]; std::string reversedip; + bool success; - if (!inet_aton(user->GetIPString(), &in)) - { - ServerInstance->WriteOpers("Invalid IP address in m_dnsbl! Bailing check"); + success = inet_aton(user->GetIPString(), &in); + + if (!success) return 0; - } d = (unsigned char) (in.s_addr >> 24) & 0xFF; c = (unsigned char) (in.s_addr >> 16) & 0xFF; @@ -302,9 +334,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; - - ServerInstance->Log(DEBUG, "m_dnsbl: sending %s for resolution", hostname.c_str()); + std::string hostname = reversedip + "." + (*i)->domain; /* now we'd need to fire off lookups for `hostname'. */ bool cached; @@ -316,30 +346,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() - { - } - - ~ModuleDNSBLFactory() + 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; } - - virtual Module *CreateModule(InspIRCd *Me) - { - return new ModuleDNSBL(Me); - } - }; - -extern "C" void * init_module( void ) -{ - return new ModuleDNSBLFactory; -} +MODULE_INIT(ModuleDNSBL)