X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_dnsbl.cpp;h=171b82514d50f2a72a2b2f6ec9718b448779454d;hb=4a126ad130b0a51449343de2f2db6becca0d2819;hp=aaf4de05c201ea8b2ce3ea5c176fe017bf073d3f;hpb=df4f0dc888a2a24e7f8b42a1c21670679e633506;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index aaf4de05c..9ad3b05e7 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -1,352 +1,509 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2018-2020 Matt Schatz + * Copyright (C) 2018-2019 linuxdaemon + * Copyright (C) 2013, 2016-2020 Sadie Powell + * Copyright (C) 2013, 2015-2016 Adam + * Copyright (C) 2012-2016 Attila Molnar + * Copyright (C) 2012, 2018 Robby + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2007, 2010 Craig Edwards + * Copyright (C) 2007 Dennis Friis + * Copyright (C) 2006-2009 Robin Burchell * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + #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 */ +#include "modules/dns.h" +#include "modules/stats.h" /* Class holding data for a single entry */ -class DNSBLConfEntry +class DNSBLConfEntry : public refcountbase { public: - enum EnumBanaction { I_UNKNOWN, I_KILL, I_ZLINE, I_KLINE, I_GLINE }; - std::string name, domain, reason; + enum EnumBanaction { I_UNKNOWN, I_KILL, I_ZLINE, I_KLINE, I_GLINE, I_MARK }; + enum EnumType { A_RECORD, A_BITMASK }; + std::string name, ident, host, domain, reason; EnumBanaction banaction; - long duration; - int bitmask; - unsigned long stats_hits, stats_misses; - DNSBLConfEntry(): duration(86400),bitmask(0),stats_hits(0), stats_misses(0) {} - ~DNSBLConfEntry() { } + EnumType type; + unsigned long duration; + unsigned int bitmask; + unsigned char records[256]; + unsigned long stats_hits, stats_misses, stats_errors; + DNSBLConfEntry() + : type(A_BITMASK) + , duration(86400) + , bitmask(0) + , stats_hits(0) + , stats_misses(0) + , stats_errors(0) + { + } }; -/** Resolver for CGI:IRC hostnames encoded in ident/GECOS +/** Resolver for CGI:IRC hostnames encoded in ident/real name */ -class DNSBLResolver : public Resolver +class DNSBLResolver : public DNS::Request { - int theirfd; - userrec* them; - DNSBLConfEntry *ConfEntry; + private: + irc::sockets::sockaddrs theirsa; + std::string theiruid; + LocalStringExt& nameExt; + LocalIntExt& countExt; + reference 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) + DNSBLResolver(DNS::Manager *mgr, Module *me, LocalStringExt& match, LocalIntExt& ctr, const std::string &hostname, LocalUser* u, reference conf) + : DNS::Request(mgr, me, hostname, DNS::QUERY_A, true) + , theirsa(u->client_sa) + , theiruid(u->uuid) + , nameExt(match) + , countExt(ctr) + , ConfEntry(conf) { - theirfd = userfd; - them = u; - ConfEntry = conf; } - virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0) + /* Note: This may be called multiple times for multiple A record results */ + void OnLookupComplete(const DNS::Query *r) CXX11_OVERRIDE { /* Check the user still exists */ - if ((them) && (them == ServerInstance->SE->GetRef(theirfd))) + LocalUser* them = IS_LOCAL(ServerInstance->FindUUID(theiruid)); + if (!them || them->client_sa != theirsa) + return; + + int i = countExt.get(them); + if (i) + countExt.set(them, i - 1); + + // The DNSBL reply must contain an A result. + const DNS::ResourceRecord* const ans_record = r->FindAnswerOfType(DNS::QUERY_A); + if (!ans_record) + { + ConfEntry->stats_errors++; + ServerInstance->SNO->WriteGlobalSno('d', "%s returned an result with no IPv4 address.", + ConfEntry->name.c_str()); + return; + } + + // The DNSBL reply must be a valid IPv4 address. + in_addr resultip; + if (inet_pton(AF_INET, ans_record->rdata.c_str(), &resultip) != 1) + { + ConfEntry->stats_errors++; + ServerInstance->SNO->WriteGlobalSno('d', "%s returned an invalid IPv4 address: %s", + ConfEntry->name.c_str(), ans_record->rdata.c_str()); + return; + } + + // The DNSBL reply should be in the 127.0.0.0/8 range. + if ((resultip.s_addr & 0xFF) != 127) { - // Now we calculate the bitmask: 256*(256*(256*a+b)+c)+d - if(result.length()) + ConfEntry->stats_errors++; + ServerInstance->SNO->WriteGlobalSno('d', "%s returned an IPv4 address which is outside of the 127.0.0.0/8 subnet: %s", + ConfEntry->name.c_str(), ans_record->rdata.c_str()); + return; + } + + bool match = false; + unsigned int result = 0; + switch (ConfEntry->type) + { + case DNSBLConfEntry::A_BITMASK: + { + result = (resultip.s_addr >> 24) & ConfEntry->bitmask; + match = (result != 0); + break; + } + case DNSBLConfEntry::A_RECORD: { - unsigned int bitmask = 0; - bool show = false; - in_addr resultip; + result = resultip.s_addr >> 24; + match = (ConfEntry->records[result] == 1); + break; + } + } - /* 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 */ + 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, them->GetIPString()); + x = reason.find("%ip%"); + } - bitmask &= ConfEntry->bitmask; + ConfEntry->stats_hits++; - if (bitmask != 0) + switch (ConfEntry->banaction) + { + case DNSBLConfEntry::I_KILL: + { + ServerInstance->Users->QuitUser(them, "Killed (" + reason + ")"); + break; + } + case DNSBLConfEntry::I_MARK: { - std::string reason = ConfEntry->reason; - std::string::size_type x = reason.find("%ip%"); - while (x != std::string::npos) + if (!ConfEntry->ident.empty()) { - reason.erase(x, 4); - reason.insert(x, them->GetIPString()); - x = reason.find("%ip%"); + them->WriteNotice("Your ident has been set to " + ConfEntry->ident + " because you matched " + reason); + them->ChangeIdent(ConfEntry->ident); } - ConfEntry->stats_hits++; - - switch (ConfEntry->banaction) + if (!ConfEntry->host.empty()) { - case DNSBLConfEntry::I_KILL: - { - userrec::QuitUser(ServerInstance, them, std::string("Killed (") + reason + ")"); - break; - } - case DNSBLConfEntry::I_KLINE: - { - 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: - { - 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: - { - 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: - { - break; - } - break; + them->WriteNotice("Your host has been set to " + ConfEntry->host + " because you matched " + reason); + them->ChangeDisplayedHost(ConfEntry->host); } - if (show) + nameExt.set(them, ConfEntry->name); + break; + } + case DNSBLConfEntry::I_KLINE: + { + KLine* kl = new KLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName.c_str(), reason.c_str(), + "*", them->GetIPString()); + if (ServerInstance->XLines->AddLine(kl,NULL)) + { + ServerInstance->SNO->WriteToSnoMask('x', "K-line added due to DNSBL match on *@%s to expire in %s (on %s): %s", + them->GetIPString().c_str(), InspIRCd::DurationString(kl->duration).c_str(), + InspIRCd::TimeString(kl->expiry).c_str(), reason.c_str()); + ServerInstance->XLines->ApplyLines(); + } + else + { + delete kl; + return; + } + break; + } + case DNSBLConfEntry::I_GLINE: + { + GLine* gl = new GLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName.c_str(), reason.c_str(), + "*", them->GetIPString()); + if (ServerInstance->XLines->AddLine(gl,NULL)) + { + ServerInstance->SNO->WriteToSnoMask('x', "G-line added due to DNSBL match on *@%s to expire in %s (on %s): %s", + them->GetIPString().c_str(), InspIRCd::DurationString(gl->duration).c_str(), + InspIRCd::TimeString(gl->expiry).c_str(), reason.c_str()); + ServerInstance->XLines->ApplyLines(); + } + else + { + delete gl; + return; + } + break; + } + case DNSBLConfEntry::I_ZLINE: + { + ZLine* zl = new ZLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName.c_str(), reason.c_str(), + them->GetIPString()); + if (ServerInstance->XLines->AddLine(zl,NULL)) + { + ServerInstance->SNO->WriteToSnoMask('x', "Z-line added due to DNSBL match on %s to expire in %s (on %s): %s", + them->GetIPString().c_str(), InspIRCd::DurationString(zl->duration).c_str(), + InspIRCd::TimeString(zl->expiry).c_str(), reason.c_str()); + ServerInstance->XLines->ApplyLines(); + } + else { - ServerInstance->WriteOpers("*** Connecting user %s detected as being on a DNS blacklist (%s) with result %d", them->GetFullRealHost(), ConfEntry->name.c_str(), bitmask); + delete zl; + return; } + break; } - else - ConfEntry->stats_misses++; + case DNSBLConfEntry::I_UNKNOWN: + default: + break; } - else - ConfEntry->stats_misses++; + + ServerInstance->SNO->WriteGlobalSno('d', "Connecting user %s (%s) detected as being on the '%s' DNS blacklist with result %d", + them->GetFullRealHost().c_str(), them->GetIPString().c_str(), ConfEntry->name.c_str(), result); } + else + ConfEntry->stats_misses++; } - virtual void OnError(ResolverError e, const std::string &errormessage) + void OnError(const DNS::Query *q) CXX11_OVERRIDE { - } + LocalUser* them = IS_LOCAL(ServerInstance->FindUUID(theiruid)); + if (!them || them->client_sa != theirsa) + return; - virtual ~DNSBLResolver() - { + int i = countExt.get(them); + if (i) + countExt.set(them, i - 1); + + if (q->error == DNS::ERROR_NO_RECORDS || q->error == DNS::ERROR_DOMAIN_NOT_FOUND) + { + ConfEntry->stats_misses++; + return; + } + + ConfEntry->stats_errors++; + ServerInstance->SNO->WriteGlobalSno('d', "An error occurred whilst checking whether %s (%s) is on the '%s' DNS blacklist: %s", + them->GetFullRealHost().c_str(), them->GetIPString().c_str(), ConfEntry->name.c_str(), this->manager->GetErrorStr(q->error).c_str()); } }; -class ModuleDNSBL : public Module +typedef std::vector > DNSBLConfList; + +class ModuleDNSBL : public Module, public Stats::EventListener { - private: - std::vector DNSBLConfEntries; + DNSBLConfList DNSBLConfEntries; + dynamic_reference DNS; + LocalStringExt nameExt; + LocalIntExt countExt; /* * Convert a string to EnumBanaction */ DNSBLConfEntry::EnumBanaction str2banaction(const std::string &action) { - if(action.compare("KILL")==0) + if (stdalgo::string::equalsci(action, "kill")) return DNSBLConfEntry::I_KILL; - if(action.compare("KLINE")==0) + if (stdalgo::string::equalsci(action, "kline")) return DNSBLConfEntry::I_KLINE; - if(action.compare("ZLINE")==0) + if (stdalgo::string::equalsci(action, "zline")) return DNSBLConfEntry::I_ZLINE; - if(action.compare("GLINE")==0) + if (stdalgo::string::equalsci(action, "gline")) return DNSBLConfEntry::I_GLINE; - + if (stdalgo::string::equalsci(action, "mark")) + return DNSBLConfEntry::I_MARK; return DNSBLConfEntry::I_UNKNOWN; } public: - ModuleDNSBL(InspIRCd *Me) : Module(Me) + ModuleDNSBL() + : Stats::EventListener(this) + , DNS(this, "DNS") + , nameExt("dnsbl_match", ExtensionItem::EXT_USER, this) + , countExt("dnsbl_pending", ExtensionItem::EXT_USER, this) { - ReadConf(); } - virtual ~ModuleDNSBL() + void init() CXX11_OVERRIDE { - ClearEntries(); + ServerInstance->SNO->EnableSnomask('d', "DNSBL"); } - virtual Version GetVersion() + void Prioritize() CXX11_OVERRIDE { - return Version(2, 0, 0, 1, VF_VENDOR, API_VERSION); + Module* corexline = ServerInstance->Modules->Find("core_xline"); + ServerInstance->Modules->SetPriority(this, I_OnSetUserIP, PRIORITY_AFTER, corexline); } - void Implements(char* List) + Version GetVersion() CXX11_OVERRIDE { - 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(); + return Version("Allows the server administrator to check the IP address of connecting users against a DNSBL.", VF_VENDOR); } /** Fill our conf vector with data */ - virtual void ReadConf() + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - ConfigReader *MyConf = new ConfigReader(ServerInstance); - ClearEntries(); + DNSBLConfList newentries; - for (int i=0; i< MyConf->Enumerate("dnsbl"); i++) + ConfigTagList dnsbls = ServerInstance->Config->ConfTags("dnsbl"); + for(ConfigIter i = dnsbls.first; i != dnsbls.second; ++i) { - DNSBLConfEntry *e = new DNSBLConfEntry(); + ConfigTag* tag = i->second; + reference e = new DNSBLConfEntry(); + + e->name = tag->getString("name"); + e->ident = tag->getString("ident"); + e->host = tag->getString("host"); + e->reason = tag->getString("reason", "Your IP has been blacklisted.", 1); + e->domain = tag->getString("domain"); + + if (stdalgo::string::equalsci(tag->getString("type"), "bitmask")) + { + e->type = DNSBLConfEntry::A_BITMASK; + e->bitmask = tag->getUInt("bitmask", 0, 0, UINT_MAX); + } + else + { + memset(e->records, 0, sizeof(e->records)); + e->type = DNSBLConfEntry::A_RECORD; + irc::portparser portrange(tag->getString("records"), false); + long item = -1; + while ((item = portrange.GetToken())) + e->records[item] = 1; + } + + e->banaction = str2banaction(tag->getString("action")); + e->duration = tag->getDuration("duration", 60, 1); - e->name = MyConf->ReadValue("dnsbl", "name", i); - e->reason = MyConf->ReadValue("dnsbl", "reason", i); - e->domain = MyConf->ReadValue("dnsbl", "domain", i); - e->banaction = str2banaction(MyConf->ReadValue("dnsbl", "action", i)); - e->duration = ServerInstance->Duration(MyConf->ReadValue("dnsbl", "duration", i)); - e->bitmask = MyConf->ReadInteger("dnsbl", "bitmask", i, false); + /* 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); + throw ModuleException("Invalid at " + tag->getTagLocation()); } else if (e->name.empty()) { - ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid name",i); + throw ModuleException("Empty at " + tag->getTagLocation()); } else if (e->domain.empty()) { - ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid domain",i); + throw ModuleException("Empty at " + tag->getTagLocation()); } else if (e->banaction == DNSBLConfEntry::I_UNKNOWN) { - ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid banaction", i); + throw ModuleException("Unknown at " + tag->getTagLocation()); } else { - if (e->reason.empty()) - { - ServerInstance->WriteOpers("*** DNSBL(#%d): empty reason, using defaults",i); - e->reason = "Your IP has been blacklisted."; - } - /* add it, all is ok */ - DNSBLConfEntries.push_back(e); - continue; + newentries.push_back(e); } - - /* delete and drop it, error somewhere */ - delete e; } - delete MyConf; + DNSBLConfEntries.swap(newentries); } - virtual void OnRehash(userrec* user, const std::string ¶meter) + void OnSetUserIP(LocalUser* user) CXX11_OVERRIDE { - ReadConf(); - } + if (user->exempt || user->quitting || !DNS) + return; - virtual int OnUserRegister(userrec* user) - { - /* only do lookups on local users */ - if (IS_LOCAL(user)) + // Clients can't be in a DNSBL if they aren't connected via IPv4 or IPv6. + if (user->client_sa.family() != AF_INET && user->client_sa.family() != AF_INET6) + return; + + if (user->MyClass) { - /* following code taken from bopm, reverses an IP address. */ - struct in_addr in; - unsigned char a, b, c, d; - char reversedipbuf[128]; - std::string reversedip; - bool success = false; - - 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 + if (!user->MyClass->config->getBool("usednsbl", true)) + return; + } + else + { + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "User has no connect class in OnSetUserIP"); + return; + } + + std::string reversedip; + if (user->client_sa.family() == AF_INET) + { + unsigned int a, b, c, d; + d = (unsigned int) (user->client_sa.in4.sin_addr.s_addr >> 24) & 0xFF; + c = (unsigned int) (user->client_sa.in4.sin_addr.s_addr >> 16) & 0xFF; + b = (unsigned int) (user->client_sa.in4.sin_addr.s_addr >> 8) & 0xFF; + a = (unsigned int) user->client_sa.in4.sin_addr.s_addr & 0xFF; + + reversedip = ConvToStr(d) + "." + ConvToStr(c) + "." + ConvToStr(b) + "." + ConvToStr(a); + } + else if (user->client_sa.family() == AF_INET6) + { + const unsigned char* ip = user->client_sa.in6.sin6_addr.s6_addr; + + std::string buf = BinToHex(ip, 16); + for (std::string::const_reverse_iterator it = buf.rbegin(); it != buf.rend(); ++it) { - success = true; + reversedip.push_back(*it); + reversedip.push_back('.'); } + reversedip.erase(reversedip.length() - 1, 1); + } + else + return; - if (!success) - return 0; + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Reversed IP %s -> %s", user->GetIPString().c_str(), reversedip.c_str()); - d = (unsigned char) (in.s_addr >> 24) & 0xFF; - c = (unsigned char) (in.s_addr >> 16) & 0xFF; - b = (unsigned char) (in.s_addr >> 8) & 0xFF; - a = (unsigned char) in.s_addr & 0xFF; + countExt.set(user, DNSBLConfEntries.size()); - snprintf(reversedipbuf, 128, "%d.%d.%d.%d", d, c, b, a); - reversedip = std::string(reversedipbuf); + // For each DNSBL, we will run through this lookup + for (unsigned i = 0; i < DNSBLConfEntries.size(); ++i) + { + // Fill hostname with a dnsbl style host (d.c.b.a.domain.tld) + std::string hostname = reversedip + "." + DNSBLConfEntries[i]->domain; - // For each DNSBL, we will run through this lookup - for (std::vector::iterator i = DNSBLConfEntries.begin(); i != DNSBLConfEntries.end(); i++) + /* now we'd need to fire off lookups for `hostname'. */ + DNSBLResolver *r = new DNSBLResolver(*this->DNS, this, nameExt, countExt, hostname, user, DNSBLConfEntries[i]); + try { - // Fill hostname with a dnsbl style host (d.c.b.a.domain.tld) - std::string hostname = reversedip + "." + (*i)->domain; - - /* now we'd need to fire off lookups for `hostname'. */ - bool cached; - DNSBLResolver *r = new DNSBLResolver(this, ServerInstance, hostname, user, user->GetFd(), *i, cached); - ServerInstance->AddResolver(r, cached); + this->DNS->Process(r); + } + catch (DNS::Exception &ex) + { + delete r; + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, ex.GetReason()); } + + if (user->quitting) + break; } + } - /* don't do anything with this hot potato */ - return 0; + ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) CXX11_OVERRIDE + { + std::string dnsbl; + if (!myclass->config->readString("dnsbl", dnsbl)) + return MOD_RES_PASSTHRU; + + std::string* match = nameExt.get(user); + if (!match) + { + ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as it requires a DNSBL mark", + myclass->GetName().c_str()); + return MOD_RES_DENY; + } + + if (!InspIRCd::Match(*match, dnsbl)) + { + ServerInstance->Logs->Log("CONNECTCLASS", LOG_DEBUG, "The %s connect class is not suitable as the DNSBL mark (%s) does not match %s", + myclass->GetName().c_str(), match->c_str(), dnsbl.c_str()); + return MOD_RES_DENY; + } + + return MOD_RES_PASSTHRU; } - - virtual int OnStats(char symbol, userrec* user, string_list &results) + + ModResult OnCheckReady(LocalUser *user) CXX11_OVERRIDE + { + if (countExt.get(user)) + return MOD_RES_DENY; + return MOD_RES_PASSTHRU; + } + + ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE { - if (symbol != 'd') - return 0; - - unsigned long total_hits = 0, total_misses = 0; + if (stats.GetSymbol() != 'd') + return MOD_RES_PASSTHRU; - for (std::vector::iterator i = DNSBLConfEntries.begin(); i != DNSBLConfEntries.end(); i++) + unsigned long total_hits = 0; + unsigned long total_misses = 0; + unsigned long total_errors = 0; + for (std::vector >::const_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"); + total_errors += (*i)->stats_errors; + + stats.AddRow(304, InspIRCd::Format("DNSBLSTATS \"%s\" had %lu hits, %lu misses, and %lu errors", + (*i)->name.c_str(), (*i)->stats_hits, (*i)->stats_misses, (*i)->stats_errors)); } - - 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; + + stats.AddRow(304, "DNSBLSTATS Total hits: " + ConvToStr(total_hits)); + stats.AddRow(304, "DNSBLSTATS Total misses: " + ConvToStr(total_misses)); + stats.AddRow(304, "DNSBLSTATS Total errors: " + ConvToStr(total_errors)); + return MOD_RES_PASSTHRU; } };