Merge pull request #1130 from SaberUK/master+capnew

[user/henk/code/inspircd.git] / src / coremods / core_dns.cpp

diff --git a/src/coremods/core_dns.cpp b/src/coremods/core_dns.cpp
index 91bd45b54606167028d5375dbfbd1e9031311500..da468af5fae273a4ace9e1c48f266d45aa5552a7 100644 (file)
--- a/src/coremods/core_dns.cpp
+++ b/src/coremods/core_dns.cpp
@@ -374,7 +374,18 @@ class MyManager : public Manager, public Timer, public EventHandler
         */
        void AddCache(Query& r)
        {
-               const ResourceRecord& rr = r.answers[0];
+               // Determine the lowest TTL value and use that as the TTL of the cache entry
+               unsigned int cachettl = UINT_MAX;
+               for (std::vector<ResourceRecord>::const_iterator i = r.answers.begin(); i != r.answers.end(); ++i)
+               {
+                       const ResourceRecord& rr = *i;
+                       if (rr.ttl < cachettl)
+                               cachettl = rr.ttl;
+               }
+
+               ResourceRecord& rr = r.answers.front();
+               // Set TTL to what we've determined to be the lowest
+               rr.ttl = cachettl;
                ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "cache: added cache for " + rr.name + " -> " + rr.rdata + " ttl: " + ConvToStr(rr.ttl));
                this->cache[r.question] = r;
        }
@@ -464,11 +475,15 @@ class MyManager : public Manager, public Timer, public EventHandler
 
                if (SocketEngine::SendTo(this, buffer, len, 0, &this->myserver.sa, this->myserver.sa_size()) != len)
                        throw Exception("DNS: Unable to send query");
+
+               // Add timer for timeout
+               ServerInstance->Timers.AddTimer(req);
        }
 
        void RemoveRequest(DNS::Request* req)
        {
-               this->requests[req->id] = NULL;
+               if (requests[req->id] == req)
+                       requests[req->id] = NULL;
        }
 
        std::string GetErrorStr(Error e)
@@ -482,6 +497,7 @@ class MyManager : public Manager, public Timer, public EventHandler
                        case ERROR_NOT_AN_ANSWER:
                        case ERROR_NONSTANDARD_QUERY:
                        case ERROR_FORMAT_ERROR:
+                       case ERROR_MALFORMED:
                                return "Malformed answer";
                        case ERROR_SERVER_FAILURE:
                        case ERROR_NOT_IMPLEMENTED:
@@ -524,17 +540,19 @@ class MyManager : public Manager, public Timer, public EventHandler
                }
 
                Packet recv_packet;
+               bool valid = false;
 
                try
                {
                        recv_packet.Fill(buffer, length);
+                       valid = true;
                }
                catch (Exception& ex)
                {
                        ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, ex.GetReason());
-                       return;
                }
 
+               // recv_packet.id must be filled in here
                DNS::Request* request = this->requests[recv_packet.id];
                if (request == NULL)
                {
@@ -549,14 +567,20 @@ class MyManager : public Manager, public Timer, public EventHandler
                        return;
                }
 
-               if (recv_packet.flags & QUERYFLAGS_OPCODE)
+               if (!valid)
+               {
+                       ServerInstance->stats.DnsBad++;
+                       recv_packet.error = ERROR_MALFORMED;
+                       request->OnError(&recv_packet);
+               }
+               else if (recv_packet.flags & QUERYFLAGS_OPCODE)
                {
                        ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Received a nonstandard query");
                        ServerInstance->stats.DnsBad++;
                        recv_packet.error = ERROR_NONSTANDARD_QUERY;
                        request->OnError(&recv_packet);
                }
-               else if (recv_packet.flags & QUERYFLAGS_RCODE)
+               else if (!(recv_packet.flags & QUERYFLAGS_QR) || (recv_packet.flags & QUERYFLAGS_RCODE))
                {
                        Error error = ERROR_UNKNOWN;
 
@@ -724,7 +748,7 @@ class ModuleDNS : public Module
                        if (DNSServer == "nameserver")
                        {
                                resolv >> DNSServer;
-                               if (DNSServer.find_first_not_of("0123456789.") == std::string::npos)
+                               if (DNSServer.find_first_not_of("0123456789.") == std::string::npos || DNSServer.find_first_not_of("0123456789ABCDEFabcdef:") == std::string::npos)
                                {
                                        ServerInstance->Logs->Log("CONFIG", LOG_DEFAULT, "<dns:server> set to '%s' as first resolver in /etc/resolv.conf.",DNSServer.c_str());
                                        return;