X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_dnsbl.cpp;h=2160b02dc68fcbd51a47d14b126b3ef582f74f0b;hb=c93af7582aed5f62e484550330697c634ba95f8b;hp=70cc4076574b8b6978a6f4b3abc6a1c74ebcc6fa;hpb=78f98065d5d1cab8b40207cf2d03dc48b4de8420;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index 70cc40765..2160b02dc 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -1,22 +1,28 @@ -/* +------------------------------------+ - * | 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) 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" -#include "dns.h" -#include "users.h" -#include "channels.h" -#include "modules.h" #ifndef WINDOWS #include @@ -31,13 +37,16 @@ class DNSBLConfEntry { 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; + 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() { } }; @@ -46,42 +55,51 @@ class DNSBLConfEntry */ class DNSBLResolver : public Resolver { - int theirfd; - userrec* them; + std::string theiruid; + LocalStringExt& nameExt; + LocalIntExt& countExt; 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) + DNSBLResolver(Module *me, LocalStringExt& match, LocalIntExt& ctr, const std::string &hostname, LocalUser* u, DNSBLConfEntry *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) { /* 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()) { - unsigned int bitmask = 0; - bool show = false; + unsigned int bitmask = 0, record = 0; + bool 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%"); @@ -98,33 +116,66 @@ class DNSBLResolver : public Resolver { case DNSBLConfEntry::I_KILL: { - userrec::QuitUser(ServerInstance, them, std::string("Killed (") + reason + ")"); + ServerInstance->Users->QuitUser(them, std::string("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: { - 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)); + 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->WriteGlobalSno('x',"K:line added due to DNSBL match 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: { - 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)); + 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->WriteGlobalSno('x',"G:line added due to DNSBL match 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: { - 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())); + 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->WriteGlobalSno('x',"Z:line added due to DNSBL match 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: @@ -134,10 +185,7 @@ class DNSBLResolver : public Resolver break; } - if (show) - { - ServerInstance->WriteOpers("*** Connecting user %s detected as being on a DNS blacklist (%s) with result %d", them->GetFullRealHost(), 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->domain.c_str(), (ConfEntry->type==DNSBLConfEntry::A_BITMASK) ? bitmask : record); } else ConfEntry->stats_misses++; @@ -149,6 +197,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() @@ -158,8 +213,9 @@ class DNSBLResolver : public Resolver class ModuleDNSBL : public Module { - private: std::vector DNSBLConfEntries; + LocalStringExt nameExt; + LocalIntExt countExt; /* * Convert a string to EnumBanaction @@ -174,13 +230,21 @@ 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) + ModuleDNSBL() : nameExt("dnsbl_match", this), countExt("dnsbl_pending", this) { } + + void init() { ReadConf(); + ServerInstance->Modules->AddService(nameExt); + ServerInstance->Modules->AddService(countExt); + Implementation eventlist[] = { I_OnRehash, I_OnUserInit, I_OnStats, I_OnSetConnectClass, I_OnCheckReady }; + ServerInstance->Modules->Attach(eventlist, this, 5); } virtual ~ModuleDNSBL() @@ -188,21 +252,15 @@ class ModuleDNSBL : public Module ClearEntries(); } - virtual Version GetVersion() - { - return Version(2, 0, 0, 1, VF_VENDOR, API_VERSION); - } - - void Implements(char* List) + Version GetVersion() { - List[I_OnRehash] = List[I_OnUserRegister] = List[I_OnStats] = 1; + return Version("Provides handling of DNS blacklists", VF_VENDOR); } /** 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(); @@ -210,44 +268,68 @@ class ModuleDNSBL : public Module /** Fill our conf vector with data */ - virtual void ReadConf() + void ReadConf() { - ConfigReader *MyConf = new ConfigReader(ServerInstance); ClearEntries(); - for (int i=0; i< MyConf->Enumerate("dnsbl"); i++) + ConfigTagList dnsbls = ServerInstance->Config->ConfTags("dnsbl"); + for(ConfigIter i = dnsbls.first; i != dnsbls.second; ++i) { + ConfigTag* tag = i->second; DNSBLConfEntry *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->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->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 (tag->getString("type") == "bitmask") + { + e->type = DNSBLConfEntry::A_BITMASK; + e->bitmask = tag->getInt("bitmask"); + } + 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 = ServerInstance->Duration(tag->getString("duration", "60")); + + /* 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(%s): invalid bitmask",tag->getTagLocation().c_str()); } - else if (e->name == "") + else if (e->name.empty()) { - ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid name",i); + ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(%s): Invalid name",tag->getTagLocation().c_str()); } - else if (e->domain == "") + else if (e->domain.empty()) { - ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid domain",i); + ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(%s): Invalid domain",tag->getTagLocation().c_str()); } else if (e->banaction == DNSBLConfEntry::I_UNKNOWN) { - ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid banaction", i); + ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(%s): Invalid banaction",tag->getTagLocation().c_str()); + } + else if (e->duration <= 0) + { + ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(%s): Invalid duration",tag->getTagLocation().c_str()); } else { - if (e->reason == "") + if (e->reason.empty()) { - ServerInstance->WriteOpers("*** DNSBL(#%d): empty reason, using defaults",i); + ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(%s): empty reason, using defaults",tag->getTagLocation().c_str()); e->reason = "Your IP has been blacklisted."; } @@ -259,119 +341,89 @@ class ModuleDNSBL : public Module /* delete and drop it, error somewhere */ delete e; } - - delete MyConf; } - virtual void OnRehash(userrec* user, const std::string ¶meter) + void OnRehash(User* user) { ReadConf(); } - virtual int OnUserRegister(userrec* user) + void OnUserInit(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 = 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 - { - success = true; - } + if (user->exempt) + return; - 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; + if (user->client_sa.sa.sa_family != AF_INET) + return; - snprintf(reversedipbuf, 128, "%d.%d.%d.%d", d, c, b, a); - reversedip = std::string(reversedipbuf); + 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; - // 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; + snprintf(reversedipbuf, 128, "%d.%d.%d.%d", d, c, b, a); + reversedip = std::string(reversedipbuf); - /* 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); + i++; } + countExt.set(user, 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; } - virtual int OnStats(char symbol, userrec* user, string_list &results) + ModResult OnCheckReady(LocalUser *user) + { + if (countExt.get(user)) + return MOD_RES_DENY; + return MOD_RES_PASSTHRU; + } + + 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++) { 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(std::string(ServerInstance->Config->ServerName.c_str()) + " 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() - { - } + results.push_back(std::string(ServerInstance->Config->ServerName.c_str()) + " 304 " + user->nick + " :DNSBLSTATS Total hits: " + ConvToStr(total_hits)); + results.push_back(std::string(ServerInstance->Config->ServerName.c_str()) + " 304 " + user->nick + " :DNSBLSTATS Total misses: " + ConvToStr(total_misses)); - virtual Module *CreateModule(InspIRCd *Me) - { - return new ModuleDNSBL(Me); + return MOD_RES_PASSTHRU; } - }; - -extern "C" DllExport void * init_module( void ) -{ - return new ModuleDNSBLFactory; -} +MODULE_INIT(ModuleDNSBL)