X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_dnsbl.cpp;h=cb32ede78e6cd950266f6a1ed69db5b562a37f6f;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;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..cb32ede78 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -27,9 +27,9 @@ class DNSBLConfEntry : public classbase { 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; @@ -51,8 +51,8 @@ class DNSBLResolver : public Resolver 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, const std::string &hostname, User* u, int userfd, DNSBLConfEntry *conf, bool &cached) + : Resolver(hostname, DNS_QUERY_A, cached, me) { theirfd = userfd; them = u; @@ -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))) { @@ -111,12 +107,30 @@ class DNSBLResolver : public Resolver 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()); + } + + 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, 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 @@ -125,10 +139,12 @@ class DNSBLResolver : public Resolver } 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, 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 @@ -137,10 +153,12 @@ class DNSBLResolver : public Resolver } 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, 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 @@ -154,7 +172,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 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++; @@ -191,12 +209,13 @@ 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() { ReadConf(); Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnStats }; ServerInstance->Modules->Attach(eventlist, this, 3); @@ -209,7 +228,7 @@ class ModuleDNSBL : public Module virtual Version GetVersion() { - return Version("$Id$", VF_VENDOR, API_VERSION); + return Version("Provides handling of DNS blacklists", VF_VENDOR, API_VERSION); } @@ -226,7 +245,7 @@ class ModuleDNSBL : public Module */ virtual void ReadConf() { - ConfigReader *MyConf = new ConfigReader(ServerInstance); + ConfigReader *MyConf = new ConfigReader; ClearEntries(); for (int i=0; i< MyConf->Enumerate("dnsbl"); i++) @@ -234,6 +253,8 @@ class ModuleDNSBL : public Module DNSBLConfEntry *e = new DNSBLConfEntry(); e->name = MyConf->ReadValue("dnsbl", "name", i); + e->ident = MyConf->ReadValue("dnsbl", "ident", i); + e->host = MyConf->ReadValue("dnsbl", "host", i); e->reason = MyConf->ReadValue("dnsbl", "reason", i); e->domain = MyConf->ReadValue("dnsbl", "domain", i); @@ -253,32 +274,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) && (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."; } @@ -294,12 +319,12 @@ class ModuleDNSBL : public Module delete MyConf; } - virtual void OnRehash(User* user, const std::string ¶meter) + virtual void OnRehash(User* user) { ReadConf(); } - virtual int OnUserRegister(User* user) + virtual ModResult OnUserRegister(User* user) { /* only do lookups on local users */ if (IS_LOCAL(user)) @@ -314,7 +339,7 @@ class ModuleDNSBL : public Module success = inet_aton(user->GetIPString(), &in); if (!success) - return 0; + return MOD_RES_PASSTHRU; d = (unsigned char) (in.s_addr >> 24) & 0xFF; c = (unsigned char) (in.s_addr >> 16) & 0xFF; @@ -332,19 +357,19 @@ class ModuleDNSBL : public Module /* now we'd need to fire off lookups for `hostname'. */ bool cached; - DNSBLResolver *r = new DNSBLResolver(this, ServerInstance, hostname, user, user->GetFd(), *i, cached); + DNSBLResolver *r = new DNSBLResolver(this, hostname, user, user->GetFd(), *i, cached); ServerInstance->AddResolver(r, cached); } } /* don't do anything with this hot potato */ - return 0; + return MOD_RES_PASSTHRU; } - virtual int OnStats(char symbol, User* user, string_list &results) + virtual 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; @@ -360,7 +385,7 @@ class ModuleDNSBL : public Module 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; + return MOD_RES_PASSTHRU; } };