X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_dnsbl.cpp;h=d4101686a03c1daaba9115da2a8244e2898838d0;hb=68211809ee3111bdc9609fbd46dc3c875fbb5ea6;hp=be2e86eb5a19286c581a487e19ca7be72e8e7bc5;hpb=929cd28544c59d122a8d36b2b5e3a394aa03108b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index be2e86eb5..d4101686a 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -1,35 +1,38 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * Copyright (C) 2009-2010 Daniel De Graaf + * Copyright (C) 2006-2008 Robin Burchell + * Copyright (C) 2007 Craig Edwards + * Copyright (C) 2006-2007 Dennis Friis + * Copyright (C) 2007 John Brooks * - * 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" -#ifndef WINDOWS -#include -#include -#include -#include -#endif - /* $ModDesc: Provides handling of DNS blacklists */ /* Class holding data for a single entry */ -class DNSBLConfEntry : public classbase +class DNSBLConfEntry : public refcountbase { public: - enum EnumBanaction { I_UNKNOWN, I_KILL, I_ZLINE, I_KLINE, I_GLINE }; + enum EnumBanaction { I_UNKNOWN, I_KILL, I_ZLINE, I_KLINE, I_GLINE, I_MARK }; enum EnumType { A_RECORD, A_BITMASK }; - std::string name, domain, reason; + std::string name, ident, host, domain, reason; EnumBanaction banaction; EnumType type; long duration; @@ -45,30 +48,28 @@ class DNSBLConfEntry : public classbase */ class DNSBLResolver : public Resolver { - int theirfd; - User* them; - DNSBLConfEntry *ConfEntry; + std::string theiruid; + LocalStringExt& nameExt; + LocalIntExt& countExt; + reference ConfEntry; 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) + DNSBLResolver(Module *me, LocalStringExt& match, LocalIntExt& ctr, const std::string &hostname, LocalUser* u, reference conf, bool &cached) + : Resolver(hostname, DNS_QUERY_A, cached, me), theiruid(u->uuid), nameExt(match), countExt(ctr), ConfEntry(conf) { - 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, 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))) + LocalUser* them = (LocalUser*)ServerInstance->FindUUID(theiruid); + if (them) { + int i = countExt.get(them); + if (i) + countExt.set(them, i - 1); // Now we calculate the bitmask: 256*(256*(256*a+b)+c)+d if(result.length()) { @@ -108,43 +109,78 @@ class DNSBLResolver : public Resolver { case DNSBLConfEntry::I_KILL: { - ServerInstance->Users->QuitUser(them, std::string("Killed (") + reason + ")"); + ServerInstance->Users->QuitUser(them, "Killed (" + reason + ")"); + break; + } + case DNSBLConfEntry::I_MARK: + { + if (!ConfEntry->ident.empty()) + { + them->WriteServ("304 " + them->nick + " :Your ident has been set to " + ConfEntry->ident + " because you matched " + reason); + them->ChangeIdent(ConfEntry->ident.c_str()); + } + + if (!ConfEntry->host.empty()) + { + them->WriteServ("304 " + them->nick + " :Your host has been set to " + ConfEntry->host + " because you matched " + reason); + them->ChangeDisplayedHost(ConfEntry->host.c_str()); + } + + nameExt.set(them, ConfEntry->name); break; } case DNSBLConfEntry::I_KLINE: { - KLine* kl = new KLine(ServerInstance, ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), + KLine* kl = new KLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName.c_str(), reason.c_str(), "*", them->GetIPString()); if (ServerInstance->XLines->AddLine(kl,NULL)) { + std::string timestr = ServerInstance->TimeString(kl->expiry); + ServerInstance->SNO->WriteGlobalSno('x',"K:line added due to DNSBL match on *@%s to expire on %s: %s", + them->GetIPString(), timestr.c_str(), reason.c_str()); ServerInstance->XLines->ApplyLines(); } else + { delete kl; + return; + } break; } case DNSBLConfEntry::I_GLINE: { - GLine* gl = new GLine(ServerInstance, ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), + GLine* gl = new GLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName.c_str(), reason.c_str(), "*", them->GetIPString()); if (ServerInstance->XLines->AddLine(gl,NULL)) { + std::string timestr = ServerInstance->TimeString(gl->expiry); + ServerInstance->SNO->WriteGlobalSno('x',"G:line added due to DNSBL match on *@%s to expire on %s: %s", + them->GetIPString(), timestr.c_str(), reason.c_str()); ServerInstance->XLines->ApplyLines(); } else + { delete gl; + return; + } break; } case DNSBLConfEntry::I_ZLINE: { - ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), + ZLine* zl = new ZLine(ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName.c_str(), reason.c_str(), them->GetIPString()); if (ServerInstance->XLines->AddLine(zl,NULL)) { + std::string timestr = ServerInstance->TimeString(zl->expiry); + ServerInstance->SNO->WriteGlobalSno('x',"Z:line added due to DNSBL match on *@%s to expire on %s: %s", + them->GetIPString(), timestr.c_str(), reason.c_str()); ServerInstance->XLines->ApplyLines(); } else + { delete zl; + return; + } break; } case DNSBLConfEntry::I_UNKNOWN: @@ -154,7 +190,7 @@ class DNSBLResolver : public Resolver break; } - 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%s detected as being on a DNS blacklist (%s) with result %d", them->nick.empty() ? "" : "", them->GetFullRealHost().c_str(), ConfEntry->domain.c_str(), (ConfEntry->type==DNSBLConfEntry::A_BITMASK) ? bitmask : record); } else ConfEntry->stats_misses++; @@ -166,6 +202,13 @@ class DNSBLResolver : public Resolver virtual void OnError(ResolverError e, const std::string &errormessage) { + LocalUser* them = (LocalUser*)ServerInstance->FindUUID(theiruid); + if (them) + { + int i = countExt.get(them); + if (i) + countExt.set(them, i - 1); + } } virtual ~DNSBLResolver() @@ -175,8 +218,9 @@ class DNSBLResolver : public Resolver class ModuleDNSBL : public Module { - private: - std::vector DNSBLConfEntries; + std::vector > DNSBLConfEntries; + LocalStringExt nameExt; + LocalIntExt countExt; /* * Convert a string to EnumBanaction @@ -191,176 +235,195 @@ class ModuleDNSBL : public Module return DNSBLConfEntry::I_ZLINE; if(action.compare("GLINE")==0) return DNSBLConfEntry::I_GLINE; + if(action.compare("MARK")==0) + return DNSBLConfEntry::I_MARK; return DNSBLConfEntry::I_UNKNOWN; } public: - ModuleDNSBL(InspIRCd *Me) : Module(Me) - { - ReadConf(); - Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnStats }; - ServerInstance->Modules->Attach(eventlist, this, 3); - } - - virtual ~ModuleDNSBL() - { - ClearEntries(); - } + ModuleDNSBL() : nameExt("dnsbl_match", this), countExt("dnsbl_pending", this) { } - virtual Version GetVersion() + void init() { - return Version("$Id$", VF_VENDOR, API_VERSION); + ReadConf(); + ServerInstance->Modules->AddService(nameExt); + ServerInstance->Modules->AddService(countExt); + Implementation eventlist[] = { I_OnRehash, I_OnSetUserIP, I_OnStats, I_OnSetConnectClass, I_OnCheckReady }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); } - - /** Clear entries and free the mem it was using - */ - void ClearEntries() + Version GetVersion() { - for (std::vector::iterator i = DNSBLConfEntries.begin(); i != DNSBLConfEntries.end(); i++) - delete *i; - DNSBLConfEntries.clear(); + return Version("Provides handling of DNS blacklists", VF_VENDOR); } /** Fill our conf vector with data */ - virtual void ReadConf() + void ReadConf() { - ConfigReader *MyConf = new ConfigReader(ServerInstance); - ClearEntries(); + DNSBLConfEntries.clear(); - 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 = MyConf->ReadValue("dnsbl", "name", i); - e->reason = MyConf->ReadValue("dnsbl", "reason", i); - e->domain = MyConf->ReadValue("dnsbl", "domain", i); + e->name = tag->getString("name"); + e->ident = tag->getString("ident"); + e->host = tag->getString("host"); + e->reason = tag->getString("reason"); + e->domain = tag->getString("domain"); - if (MyConf->ReadValue("dnsbl", "type", i) == "bitmask") + if (tag->getString("type") == "bitmask") { e->type = DNSBLConfEntry::A_BITMASK; - e->bitmask = MyConf->ReadInteger("dnsbl", "bitmask", i, false); + e->bitmask = tag->getInt("bitmask"); } else { memset(e->records, 0, sizeof(e->records)); e->type = DNSBLConfEntry::A_RECORD; - irc::portparser portrange(MyConf->ReadValue("dnsbl", "records", i), false); + irc::portparser portrange(tag->getString("records"), 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)); + e->banaction = str2banaction(tag->getString("action")); + e->duration = ServerInstance->Duration(tag->getString("duration", "60")); /* Use portparser for record replies */ /* yeah, logic here is a little messy */ if ((e->bitmask <= 0) && (DNSBLConfEntry::A_BITMASK == e->type)) { - ServerInstance->SNO->WriteToSnoMask('a', "DNSBL(#%d): invalid bitmask",i); + std::string location = tag->getTagLocation(); + ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(%s): invalid bitmask", location.c_str()); } else if (e->name.empty()) { - ServerInstance->SNO->WriteToSnoMask('a', "DNSBL(#%d): Invalid name",i); + std::string location = tag->getTagLocation(); + ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(%s): Invalid name", location.c_str()); } else if (e->domain.empty()) { - ServerInstance->SNO->WriteToSnoMask('a', "DNSBL(#%d): Invalid domain",i); + std::string location = tag->getTagLocation(); + ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(%s): Invalid domain", location.c_str()); } else if (e->banaction == DNSBLConfEntry::I_UNKNOWN) { - ServerInstance->SNO->WriteToSnoMask('a', "DNSBL(#%d): Invalid banaction", i); + std::string location = tag->getTagLocation(); + ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(%s): Invalid banaction", location.c_str()); + } + else if (e->duration <= 0) + { + std::string location = tag->getTagLocation(); + ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(%s): Invalid duration", location.c_str()); } else { if (e->reason.empty()) { - ServerInstance->SNO->WriteToSnoMask('a', "DNSBL(#%d): empty reason, using defaults",i); + std::string location = tag->getTagLocation(); + ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(%s): empty reason, using defaults", location.c_str()); e->reason = "Your IP has been blacklisted."; } /* add it, all is ok */ DNSBLConfEntries.push_back(e); - continue; } - - /* delete and drop it, error somewhere */ - delete e; } - - delete MyConf; } - virtual void OnRehash(User* user, const std::string ¶meter) + void OnRehash(User* user) { ReadConf(); } - virtual int OnUserRegister(User* user) + void OnSetUserIP(LocalUser* user) { - /* only do lookups on local users */ - if (IS_LOCAL(user)) - { - /* 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; + if ((user->exempt) || (user->client_sa.sa.sa_family != AF_INET)) + return; - success = inet_aton(user->GetIPString(), &in); + if (user->MyClass) + { + if (!user->MyClass->config->getBool("usednsbl", true)) + return; + } + else + ServerInstance->Logs->Log("m_dnsbl", DEBUG, "User has no connect class in OnSetUserIP"); - if (!success) - return 0; + unsigned char a, b, c, d; + char reversedipbuf[128]; + std::string reversedip; - 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; + d = (unsigned char) (user->client_sa.in4.sin_addr.s_addr >> 24) & 0xFF; + c = (unsigned char) (user->client_sa.in4.sin_addr.s_addr >> 16) & 0xFF; + b = (unsigned char) (user->client_sa.in4.sin_addr.s_addr >> 8) & 0xFF; + a = (unsigned char) user->client_sa.in4.sin_addr.s_addr & 0xFF; - snprintf(reversedipbuf, 128, "%d.%d.%d.%d", d, c, b, a); - reversedip = std::string(reversedipbuf); + 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 (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; + countExt.set(user, DNSBLConfEntries.size()); - /* 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); - } + // For each DNSBL, we will run through this lookup + unsigned int i = 0; + while (i < DNSBLConfEntries.size()) + { + // Fill hostname with a dnsbl style host (d.c.b.a.domain.tld) + std::string hostname = reversedip + "." + DNSBLConfEntries[i]->domain; + + /* now we'd need to fire off lookups for `hostname'. */ + bool cached; + DNSBLResolver *r = new DNSBLResolver(this, nameExt, countExt, hostname, user, DNSBLConfEntries[i], cached); + ServerInstance->AddResolver(r, cached); + if (user->quitting) + break; + i++; } + } - /* don't do anything with this hot potato */ - return 0; + ModResult OnSetConnectClass(LocalUser* user, ConnectClass* myclass) + { + std::string dnsbl; + if (!myclass->config->readString("dnsbl", dnsbl)) + return MOD_RES_PASSTHRU; + std::string* match = nameExt.get(user); + std::string myname = match ? *match : ""; + if (dnsbl == myname) + return MOD_RES_PASSTHRU; + return MOD_RES_DENY; + } + + ModResult OnCheckReady(LocalUser *user) + { + if (countExt.get(user)) + return MOD_RES_DENY; + return MOD_RES_PASSTHRU; } - virtual int OnStats(char symbol, User* user, string_list &results) + ModResult OnStats(char symbol, User* user, string_list &results) { if (symbol != 'd') - return 0; + return MOD_RES_PASSTHRU; unsigned long total_hits = 0, total_misses = 0; - for (std::vector::iterator i = DNSBLConfEntries.begin(); i != DNSBLConfEntries.end(); i++) + 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 " + + results.push_back(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)); + results.push_back(ServerInstance->Config->ServerName + " 304 " + user->nick + " :DNSBLSTATS Total hits: " + ConvToStr(total_hits)); + results.push_back(ServerInstance->Config->ServerName + " 304 " + user->nick + " :DNSBLSTATS Total misses: " + ConvToStr(total_misses)); - return 0; + return MOD_RES_PASSTHRU; } };