X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fm_dnsbl.cpp;h=d97ea940a8aecf05e5f55e8218ef434ec31a8c7b;hb=a59d08fffd3dc8a9850ce34c9928fb6382b9b37f;hp=f70496d687546221144edf4adec15c7c5a721bdd;hpb=86775e2e98f55b3b88befe2daff0ca23f02f3155;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index f70496d68..d97ea940a 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -24,12 +24,12 @@ /* $ModDesc: Provides handling of DNS blacklists */ /* Class holding data for a single entry */ -class DNSBLConfEntry : public classbase +class DNSBLConfEntry { 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; @@ -107,13 +107,29 @@ 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.c_str(), reason.c_str(), "*", them->GetIPString()); if (ServerInstance->XLines->AddLine(kl,NULL)) { - ServerInstance->SNO->WriteToSnoMask('x',"m_dnsbl added K:line on *@%s to expire on %s (%s).", + 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(); } @@ -123,11 +139,11 @@ 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.c_str(), reason.c_str(), "*", them->GetIPString()); if (ServerInstance->XLines->AddLine(gl,NULL)) { - ServerInstance->SNO->WriteToSnoMask('x',"m_dnsbl added G:line on *@%s to expire on %s (%s).", + 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(); } @@ -137,11 +153,11 @@ 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.c_str(), reason.c_str(), them->GetIPString()); if (ServerInstance->XLines->AddLine(zl,NULL)) { - ServerInstance->SNO->WriteToSnoMask('x',"m_dnsbl added Z:line on *@%s to expire on %s (%s).", + 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(); } @@ -156,7 +172,7 @@ class DNSBLResolver : public Resolver break; } - 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); + 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++; @@ -193,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); @@ -211,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); } @@ -228,34 +245,36 @@ class ModuleDNSBL : public Module */ virtual void ReadConf() { - ConfigReader *MyConf = new ConfigReader(ServerInstance); + ConfigReader MyConf; ClearEntries(); - for (int i=0; i< MyConf->Enumerate("dnsbl"); i++) + for (int i=0; i< MyConf.Enumerate("dnsbl"); i++) { 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->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); - if (MyConf->ReadValue("dnsbl", "type", i) == "bitmask") + if (MyConf.ReadValue("dnsbl", "type", i) == "bitmask") { e->type = DNSBLConfEntry::A_BITMASK; - e->bitmask = MyConf->ReadInteger("dnsbl", "bitmask", i, false); + e->bitmask = MyConf.ReadInteger("dnsbl", "bitmask", i, false); } 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(MyConf.ReadValue("dnsbl", "records", i), 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", "60", i)); + e->banaction = str2banaction(MyConf.ReadValue("dnsbl", "action", i)); + e->duration = ServerInstance->Duration(MyConf.ReadValue("dnsbl", "duration", "60", i)); /* Use portparser for record replies */ @@ -296,8 +315,6 @@ class ModuleDNSBL : public Module /* delete and drop it, error somewhere */ delete e; } - - delete MyConf; } virtual void OnRehash(User* user) @@ -338,7 +355,7 @@ 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); } } @@ -359,12 +376,12 @@ class ModuleDNSBL : public Module 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)); + 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)); return MOD_RES_PASSTHRU; }