X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_dnsbl.cpp;h=c2f666c7ec1202cd24c56069a61dfcdd4d8af8b2;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=351ef688f67071570391a0815dc3d0e189aef851;hpb=d0fe371f7a286c082430b0ea4aa59cd39454cfa4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp index 351ef688f..c2f666c7e 100644 --- a/src/modules/m_dnsbl.cpp +++ b/src/modules/m_dnsbl.cpp @@ -34,6 +34,7 @@ class DNSBLConfEntry long duration; int bitmask; DNSBLConfEntry(): duration(86400),bitmask(0) {} + ~DNSBLConfEntry() { } }; @@ -46,59 +47,43 @@ class DNSBLResolver : public Resolver DNSBLConfEntry *ConfEntry; public: - DNSBLResolver(Module *me, InspIRCd *ServerInstance, const std::string &hostname, userrec* u, int userfd, DNSBLConfEntry *conf) - : Resolver(ServerInstance, hostname, DNS_QUERY_A, me) + 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) { theirfd = userfd; them = u; ConfEntry = conf; } - virtual void OnLookupComplete(const std::string &result) + virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached) { /* Check the user still exists */ if ((them) && (them == ServerInstance->SE->GetRef(theirfd))) { - ServerInstance->Log(DEBUG, "m_dnsbl: %s got a result from dnsbl %s", them->nick, ConfEntry->name.c_str()); - // Now we calculate the bitmask: 256*(256*(256*a+b)+c)+d if(result.length()) { unsigned int bitmask=0; - unsigned int octetpos=0; - std::string tmp = result; - - while(tmp.length()>0) - { - std::string octet; - /* Fix by brain, npos is -1, so unsigned int will never match */ - std::string::size_type lastdot = tmp.rfind("."); - - if (lastdot == std::string::npos) - { - octet=tmp; - tmp.clear(); - } - else - { - octet=tmp.substr(lastdot+1,tmp.length()-lastdot+1); - tmp.resize(lastdot); - } + in_addr resultip; - bitmask += (256 ^ octetpos) * atoi(octet.c_str()); - octetpos += 1; - } + /* 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; if (bitmask != 0) { std::string reason = ConfEntry->reason; - - std::string::size_type pos; - while ((pos = reason.find("%ip%")) != std::string::npos) + std::string::size_type x = reason.find("%ip%"); + while (x != std::string::npos) { - reason.replace(pos, 4, them->GetIPString()); + reason.erase(x, 4); + reason.insert(x, them->GetIPString()); + x = reason.find("%ip%"); } ServerInstance->WriteOpers("*** Connecting user %s detected as being on a DNS blacklist (%s) with result %d", them->GetFullRealHost(), ConfEntry->name.c_str(), bitmask); @@ -113,16 +98,19 @@ class DNSBLResolver : public Resolver case DNSBLConfEntry::I_KLINE: { ServerInstance->AddKLine(ConfEntry->duration, ServerInstance->Config->ServerName, reason, std::string("*@") + them->GetIPString()); + FOREACH_MOD(I_OnAddKLine,OnAddKLine(ConfEntry->duration, NULL, reason, std::string("*@") + them->GetIPString())); break; } case DNSBLConfEntry::I_GLINE: { ServerInstance->AddGLine(ConfEntry->duration, ServerInstance->Config->ServerName, reason, std::string("*@") + them->GetIPString()); + FOREACH_MOD(I_OnAddGLine,OnAddGLine(ConfEntry->duration, NULL, reason, std::string("*@") + them->GetIPString())); break; } case DNSBLConfEntry::I_ZLINE: { ServerInstance->AddZLine(ConfEntry->duration, ServerInstance->Config->ServerName, reason, them->GetIPString()); + FOREACH_MOD(I_OnAddZLine,OnAddZLine(ConfEntry->duration, NULL, reason, them->GetIPString())); break; } case DNSBLConfEntry::I_UNKNOWN: @@ -138,19 +126,8 @@ class DNSBLResolver : public Resolver virtual void OnError(ResolverError e, const std::string &errormessage) { - /* - this just means they don't appear in the respective dnsbl - if ((them) && (them == ServerInstance->SE->GetRef(theirfd))) - { - } - */ - /* Check the user still exists */ - if ((them) && (them == ServerInstance->SE->GetRef(theirfd))) - { - ServerInstance->Log(DEBUG, "m_dnsbl: %s got an error while resolving for dnsbl %s", them->nick, ConfEntry->name.c_str()); - } } - + virtual ~DNSBLResolver() { } @@ -160,7 +137,7 @@ class ModuleDNSBL : public Module { private: std::vector DNSBLConfEntries; - + /* * Convert a string to EnumBanaction */ @@ -174,7 +151,7 @@ class ModuleDNSBL : public Module return DNSBLConfEntry::I_ZLINE; if(action.compare("GLINE")==0) return DNSBLConfEntry::I_GLINE; - + return DNSBLConfEntry::I_UNKNOWN; } public: @@ -182,12 +159,12 @@ class ModuleDNSBL : public Module { ReadConf(); } - + virtual ~ModuleDNSBL() { ClearEntries(); } - + virtual Version GetVersion() { return Version(2, 0, 0, 1, VF_VENDOR, API_VERSION); @@ -203,15 +180,13 @@ class ModuleDNSBL : public Module void ClearEntries() { std::vector::iterator i; - while ((i = DNSBLConfEntries.begin()) != DNSBLConfEntries.end()) - { - DNSBLConfEntries.erase(i); + for (std::vector::iterator i = DNSBLConfEntries.begin(); i != DNSBLConfEntries.end(); i++) delete *i; - } + DNSBLConfEntries.clear(); } /** Fill our conf vector with data - */ + */ virtual void ReadConf() { ConfigReader *MyConf = new ConfigReader(ServerInstance); @@ -265,7 +240,7 @@ class ModuleDNSBL : public Module delete MyConf; } - virtual void OnRehash(const std::string ¶meter) + virtual void OnRehash(userrec* user, const std::string ¶meter) { ReadConf(); } @@ -282,12 +257,29 @@ class ModuleDNSBL : public Module unsigned char a, b, c, d; char reversedipbuf[128]; std::string reversedip; + bool success = false; if (!inet_aton(user->GetIPString(), &in)) { - ServerInstance->WriteOpers("Invalid IP address in m_dnsbl! Bailing check"); - return 0; +#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 (!success) + return 0; d = (unsigned char) (in.s_addr >> 24) & 0xFF; c = (unsigned char) (in.s_addr >> 16) & 0xFF; @@ -301,13 +293,12 @@ class ModuleDNSBL : public Module 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; - - ServerInstance->Log(DEBUG, "m_dnsbl: sending %s for resolution", hostname.c_str()); + std::string hostname = reversedip + "." + (*i)->domain; /* now we'd need to fire off lookups for `hostname'. */ - DNSBLResolver *r = new DNSBLResolver(this, ServerInstance, hostname, user, user->GetFd(), *i); - ServerInstance->AddResolver(r); + bool cached; + DNSBLResolver *r = new DNSBLResolver(this, ServerInstance, hostname, user, user->GetFd(), *i, cached); + ServerInstance->AddResolver(r, cached); } } @@ -324,16 +315,16 @@ class ModuleDNSBLFactory : public ModuleFactory ModuleDNSBLFactory() { } - + ~ModuleDNSBLFactory() { } - + virtual Module *CreateModule(InspIRCd *Me) { return new ModuleDNSBL(Me); } - + };