X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_dnsbl.cpp;h=1ec9879ae98ab7ecdddec399fe2abb3e83e185ab;hb=db7a49b071134cf3deadf05ce84fa6c7c46d80bf;hp=cd37b6895e74af3fef6fc87334e93162876008eb;hpb=ca7cb01b7a286f346748986da74b634edfe195c7;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index cd37b6895..1ec9879ae 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -24,7 +24,7 @@ /* $ModDesc: Provides handling of DNS blacklists */ /* Class holding data for a single entry */ -class DNSBLConfEntry +class DNSBLConfEntry : public classbase { public: enum EnumBanaction { I_UNKNOWN, I_KILL, I_ZLINE, I_KLINE, I_GLINE }; @@ -51,8 +51,8 @@ class DNSBLResolver : public Resolver public: - DNSBLResolver(Module *me, InspIRCd *ServerInstance, const std::string &hostname, User* u, int userfd, DNSBLConfEntry *conf, bool &cached) - : Resolver(ServerInstance, hostname, DNS_QUERY_A, cached, me) + 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) { theirfd = userfd; them = u; @@ -108,17 +108,16 @@ class DNSBLResolver : public Resolver { case DNSBLConfEntry::I_KILL: { - User::QuitUser(ServerInstance, them, std::string("Killed (") + reason + ")"); + ServerInstance->Users->QuitUser(them, std::string("Killed (") + reason + ")"); break; } case DNSBLConfEntry::I_KLINE: { KLine* kl = new KLine(ServerInstance, ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), "*", them->GetIPString()); - if (ServerInstance->XLines->AddLine(kl)) + if (ServerInstance->XLines->AddLine(kl,NULL)) { ServerInstance->XLines->ApplyLines(); - FOREACH_MOD(I_OnAddKLine,OnAddKLine(ConfEntry->duration, NULL, reason, them->MakeHostIP())); } else delete kl; @@ -128,10 +127,9 @@ class DNSBLResolver : public Resolver { GLine* gl = new GLine(ServerInstance, ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), "*", them->GetIPString()); - if (ServerInstance->XLines->AddLine(gl)) + if (ServerInstance->XLines->AddLine(gl,NULL)) { ServerInstance->XLines->ApplyLines(); - FOREACH_MOD(I_OnAddGLine,OnAddGLine(ConfEntry->duration, NULL, reason, them->MakeHostIP())); } else delete gl; @@ -141,12 +139,11 @@ class DNSBLResolver : public Resolver { ZLine* zl = new ZLine(ServerInstance, ServerInstance->Time(), ConfEntry->duration, ServerInstance->Config->ServerName, reason.c_str(), them->GetIPString()); - if (ServerInstance->XLines->AddLine(zl)) + if (ServerInstance->XLines->AddLine(zl,NULL)) { ServerInstance->XLines->ApplyLines(); - FOREACH_MOD(I_OnAddZLine,OnAddZLine(ConfEntry->duration, NULL, reason, them->GetIPString())); } - else + else delete zl; break; } @@ -159,7 +156,7 @@ class DNSBLResolver : public Resolver 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->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); } } else @@ -204,6 +201,8 @@ class ModuleDNSBL : public Module ModuleDNSBL(InspIRCd *Me) : Module(Me) { ReadConf(); + Implementation eventlist[] = { I_OnRehash, I_OnUserRegister, I_OnStats }; + ServerInstance->Modules->Attach(eventlist, this, 3); } virtual ~ModuleDNSBL() @@ -213,19 +212,14 @@ class ModuleDNSBL : public Module virtual Version GetVersion() { - return Version(2, 0, 0, 1, VF_VENDOR, API_VERSION); + return Version("$Id$", VF_VENDOR, API_VERSION); } - void Implements(char* List) - { - 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(); @@ -253,7 +247,7 @@ class ModuleDNSBL : public Module } else { - memset(e->records, 0, 256); + memset(e->records, 0, sizeof(e->records)); e->type = DNSBLConfEntry::A_RECORD; irc::portparser portrange(MyConf->ReadValue("dnsbl", "records", i), false); long item = -1; @@ -263,31 +257,31 @@ class ModuleDNSBL : public Module e->banaction = str2banaction(MyConf->ReadValue("dnsbl", "action", i)); e->duration = ServerInstance->Duration(MyConf->ReadValue("dnsbl", "duration", i)); - + /* Use portparser for record replies */ /* yeah, logic here is a little messy */ if (e->bitmask <= 0) { - ServerInstance->WriteOpers("*** DNSBL(#%d): invalid bitmask",i); + ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): invalid bitmask",i); } else if (e->name.empty()) { - ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid name",i); + ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): Invalid name",i); } else if (e->domain.empty()) { - ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid domain",i); + ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): Invalid domain",i); } else if (e->banaction == DNSBLConfEntry::I_UNKNOWN) { - ServerInstance->WriteOpers("*** DNSBL(#%d): Invalid banaction", i); + ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): Invalid banaction", i); } else { if (e->reason.empty()) { - ServerInstance->WriteOpers("*** DNSBL(#%d): empty reason, using defaults",i); + ServerInstance->SNO->WriteToSnoMask('A', "DNSBL(#%d): empty reason, using defaults",i); e->reason = "Your IP has been blacklisted."; } @@ -366,26 +360,26 @@ class ModuleDNSBL : public Module /* don't do anything with this hot potato */ return 0; } - + virtual int OnStats(char symbol, User* user, string_list &results) { if (symbol != 'd') return 0; - + 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 " + 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; } };