X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_dnsbl.cpp;h=7fb652cf715ffa8ee7cd012398fa975dcc45b4b3;hb=b5e220008782b2d538cb8e6e3b1923af0c13fb99;hp=9fd8ba5e58683c83d87bb4fbac66dc0432e41040;hpb=a8d0bb046a67ba41947738b02cb7705f5db9fe67;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index 9fd8ba5e5..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-2008 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. @@ -60,12 +60,8 @@ class DNSBLResolver : public Resolver } /* 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) + virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached) { - /* 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))) { @@ -73,7 +69,7 @@ class DNSBLResolver : public Resolver if(result.length()) { unsigned int bitmask = 0, record = 0; - bool show = false, match = false; + bool match = false; in_addr resultip; inet_aton(result.c_str(), &resultip); @@ -117,6 +113,8 @@ class DNSBLResolver : public Resolver "*", 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 @@ -129,6 +127,8 @@ class DNSBLResolver : public Resolver "*", 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 @@ -141,9 +141,11 @@ class DNSBLResolver : public Resolver 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 + else delete zl; break; } @@ -154,10 +156,7 @@ 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); - } + 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++; @@ -212,7 +211,7 @@ class ModuleDNSBL : public Module virtual Version GetVersion() { - return Version(2, 0, 0, 1, VF_VENDOR, API_VERSION); + return Version("$Id$", VF_VENDOR, API_VERSION); } @@ -247,7 +246,7 @@ class ModuleDNSBL : public Module } else { - memset(e->records, 0, 256); + memset(e->records, 0, sizeof(e->records)); e->type = DNSBLConfEntry::A_RECORD; irc::portparser portrange(MyConf->ReadValue("dnsbl", "records", i), false); long item = -1; @@ -256,32 +255,36 @@ class ModuleDNSBL : public Module } e->banaction = str2banaction(MyConf->ReadValue("dnsbl", "action", i)); - e->duration = ServerInstance->Duration(MyConf->ReadValue("dnsbl", "duration", i)); - + 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->SNO->WriteToSnoMask('A', "DNSBL(#%d): invalid bitmask",i); + ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(#%d): invalid bitmask",i); } else if (e->name.empty()) { - ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): Invalid name",i); + ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(#%d): Invalid name",i); } else if (e->domain.empty()) { - ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): Invalid domain",i); + ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(#%d): Invalid domain",i); } else if (e->banaction == DNSBLConfEntry::I_UNKNOWN) { - ServerInstance->SNO->WriteToSnoMask('A', "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.empty()) { - ServerInstance->SNO->WriteToSnoMask('A', "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."; } @@ -297,7 +300,7 @@ class ModuleDNSBL : public Module delete MyConf; } - virtual void OnRehash(User* user, const std::string ¶meter) + virtual void OnRehash(User* user) { ReadConf(); } @@ -312,26 +315,9 @@ class ModuleDNSBL : public Module unsigned char a, b, c, d; char reversedipbuf[128]; std::string reversedip; - bool success = false; + bool success; - if (!inet_aton(user->GetIPString(), &in)) - { -#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; - } + success = inet_aton(user->GetIPString(), &in); if (!success) return 0; @@ -360,26 +346,26 @@ class ModuleDNSBL : public Module /* don't do anything with this hot potato */ return 0; } - + 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; } };