implement timeouts and ifurlup and cnames

diff --git a/pdns/lua-auth4.cc b/pdns/lua-auth4.cc
index 2fc519ca0d3e76d0ad644e1f8375bfb72b9377e5..1ce405467ebb4e2e4eab01250a63df039e45d972 100644 (file)
--- a/pdns/lua-auth4.cc
+++ b/pdns/lua-auth4.cc
@@ -10,7 +10,7 @@
 #include <thread>
 #include <mutex>
 #include "minicurl.hh"
-
+#include "ueberbackend.hh"
 #if !defined(HAVE_LUA)
 
 AuthLua4::AuthLua4(const std::string& fname) { }
@@ -410,7 +410,7 @@ void IsUpOracle::checkURLThread(ComboAddress rem, std::string url, opts_t opts)
       if(opts.count("stringmatch") && content.find(opts["stringmatch"]) == string::npos) {
         cout<<"URL "<<url<<" is up at "<<rem.toString()<<", but could not find stringmatch "<<opts["stringmatch"]<<" in page content, setting DOWN"<<endl;
         setDown(rem, url, opts);
-        continue;
+        goto loop;
       }
       if(!upStatus(rem,url))
         cout<<"Declaring "<<rem.toString()<<" UP for URL "<<url<<"!"<<endl;
@@ -421,6 +421,7 @@ void IsUpOracle::checkURLThread(ComboAddress rem, std::string url, opts_t opts)
         cout<<"Failed to connect to "<<rem.toString()<<" for URL "<<url<<", setting DOWN, error: "<<ne.what()<<endl;
       setDown(rem,url);
     }
+  loop:;
     sleep(5);
   }
 }
@@ -428,12 +429,9 @@ void IsUpOracle::checkURLThread(ComboAddress rem, std::string url, opts_t opts)
 
 IsUpOracle g_up;
 
-std::vector<shared_ptr<DNSRecordContent>> luaSynth(const std::string& code, const DNSName& query, const ComboAddress& who, uint16_t qtype) 
+std::vector<shared_ptr<DNSRecordContent>> luaSynth(const std::string& code, const DNSName& query, const DNSName& zone, int zoneid, const ComboAddress& who, uint16_t qtype) 
 {
   std::vector<shared_ptr<DNSRecordContent>> ret;
-  cout<<"Code: "<<code<<endl;
-  string strip=code.c_str()+1;
-  strip.resize(strip.size()-1);
   
   LuaContext lua;
   lua.writeVariable("qname", query.toString());
@@ -462,32 +460,66 @@ std::vector<shared_ptr<DNSRecordContent>> luaSynth(const std::string& code, cons
     });
 
 
-  lua.writeFunction("ifurlup", [](const std::string& url, const vector<pair<int, string> >& ips, boost::optional<std::unordered_map<string,string>> options) {
-
-      vector<ComboAddress> candidates;
-      for(const auto& i : ips) {
-        ComboAddress rem(i.second, 80);
-        std::unordered_map<string,string> opts;
-        if(options)
-          opts = *options;
-        if(g_up.isUp(rem, url, opts))
-          candidates.push_back(rem);
+  lua.writeFunction("ifurlup", [](const std::string& url,
+                                  const boost::variant<
+                                  vector<pair<int, string> >,
+                                  vector<pair<int, vector<pair<int, string> > > >
+                                  > & ips, boost::optional<std::unordered_map<string,string>> options) {
+
+      vector<vector<ComboAddress> > candidates;
+      std::unordered_map<string,string> opts;
+      if(options)
+        opts = *options;
+      if(auto simple = boost::get<vector<pair<int,string>>>(&ips)) {
+        vector<ComboAddress> unit;
+        for(const auto& i : *simple) {
+          ComboAddress rem(i.second, 80);
+          unit.push_back(rem);
+        }
+        candidates.push_back(unit);
+      } else {
+        auto units = boost::get<vector<pair<int, vector<pair<int, string> > > >>(ips);
+        for(const auto& u : units) {
+          vector<ComboAddress> unit;
+          for(const auto& c : u.second) {
+            ComboAddress rem(c.second, 80);
+            unit.push_back(rem);
+          }
+          candidates.push_back(unit);
+        }
       }
-      cout<<"Have "<<candidates.size()<<" candidate IP addresses: ";
-      for(const auto& c : candidates)
-        cout<<c.toString()<<" ";
-      cout<<endl;
 
+      //
+      cout<<"Have "<<candidates.size()<<" units of IP addresses: "<<endl;
+      int ucount=1;
+      for(const auto& unit : candidates) {
+        cout<<"Unit "<<ucount<<": ";
+        for(const auto& c : unit)
+          cout<<c.toString()<<" ";
+        cout<<endl;
+        ucount++;
+      }
       vector<string> ret;
-      if(candidates.empty()) {
-        cout<<"Everything is down, returning all IP addresses"<<endl;
-        for(const auto& i : ips) 
-          ret.push_back(i.second);
+      for(const auto& unit : candidates) {
+        vector<ComboAddress> available;
+        for(const auto& c : unit)
+          if(g_up.isUp(c, url, opts))
+            available.push_back(c);
+        if(available.empty()) {
+          cerr<<"Entire unit is down, trying next one if available"<<endl;
+          continue;
+        }
+        ret.push_back(available[random() % available.size()].toString());
+        return ret;
+      }      
+      cerr<<"ALL units are down, returning all IP addresses"<<endl;
+      for(const auto& unit : candidates) {
+        for(const auto& c : unit)
+          ret.push_back(c.toString());
       }
-      else
-        ret.push_back(candidates[random() % candidates.size()].toString());
+
       return ret;
-    });
+                    });
 
   
   lua.writeFunction("pickRandom", [](const vector<pair<int, string> >& ips) {
@@ -509,21 +541,50 @@ std::vector<shared_ptr<DNSRecordContent>> luaSynth(const std::string& code, cons
       
     });
 
-  
-  auto content=lua.executeCode<boost::variant<string, vector<pair<int, string> > > >(strip);
+  int counter=0;
+  lua.writeFunction("report", [&counter](string event, boost::optional<string> line){
+      cout<<"It was toooo much"<<endl;
+      throw std::runtime_error("Script took too long");
+    });
+  lua.executeCode("debug.sethook(report, '', 1000)");
 
-  vector<string> contents;
-  if(auto str = boost::get<string>(&content))
-    contents.push_back(*str);
-  else
-    for(const auto& c : boost::get<vector<pair<int,string>>>(content))
-      contents.push_back(c.second);
+  lua.writeFunction("continent", [&who](const std::string& continent) {
+      return true;
+    });
 
-  for(const auto& content: contents) {
-    if(qtype==QType::TXT)
-      ret.push_back(std::shared_ptr<DNSRecordContent>(DNSRecordContent::mastermake(qtype, 1, '"'+content+'"' )));
+  lua.writeFunction("include", [&lua,zone,zoneid](string record) {
+      try {
+        cerr<<"Wants to load record '"<<record<<"'"<<endl;
+        UeberBackend ub;
+        ub.lookup(QType(QType::LUA), DNSName(record) +zone, 0, zoneid);
+        DNSZoneRecord dr;
+        while(ub.get(dr)) {
+          auto lr = getRR<LUARecordContent>(dr.dr);
+          cout<<"About to execute "<<lr->getCode()<<endl;
+          lua.executeCode(lr->getCode());
+        }
+      }catch(std::exception& e) { cerr<<"Oops: "<<e.what()<<endl; }
+    });
+
+  
+  try {
+    auto content=lua.executeCode<boost::variant<string, vector<pair<int, string> > > >(code);
+    //  cout<<"Counter: "<<counter<<endl;
+    vector<string> contents;
+    if(auto str = boost::get<string>(&content))
+      contents.push_back(*str);
     else
-      ret.push_back(std::shared_ptr<DNSRecordContent>(DNSRecordContent::mastermake(qtype, 1, content )));
+      for(const auto& c : boost::get<vector<pair<int,string>>>(content))
+        contents.push_back(c.second);
+    
+    for(const auto& content: contents) {
+      if(qtype==QType::TXT)
+        ret.push_back(std::shared_ptr<DNSRecordContent>(DNSRecordContent::mastermake(qtype, 1, '"'+content+'"' )));
+      else
+        ret.push_back(std::shared_ptr<DNSRecordContent>(DNSRecordContent::mastermake(qtype, 1, content )));
+    }
+  }catch(std::exception &e) {
+    cerr<<"Lua reported: "<<e.what()<<endl;
   }
 
   return ret;

diff --git a/pdns/lua-auth4.hh b/pdns/lua-auth4.hh
index e7aec2fb1333e61d4f8c53fbd9741b5944b94f4a..ca3797585f452f70c8fd25eaf2092c0a3cf7c475 100644 (file)
--- a/pdns/lua-auth4.hh
+++ b/pdns/lua-auth4.hh
@@ -42,4 +42,5 @@ private:
   luacall_update_policy_t d_update_policy;
   luacall_axfr_filter_t d_axfr_filter;
 };
-std::vector<shared_ptr<DNSRecordContent>> luaSynth(const std::string& code, const DNSName& qname, const ComboAddress& who, uint16_t qtype);
+std::vector<shared_ptr<DNSRecordContent>> luaSynth(const std::string& code, const DNSName& qname,
+                                                   const DNSName& zone, int zoneid, const ComboAddress& who, uint16_t qtype);

diff --git a/pdns/minicurl.cc b/pdns/minicurl.cc
index 50477cafa0738c0000607487cbcdaca39c5e34c8..42d073ac830301efedb3fd4f66551a90c9cd82b0 100644 (file)
--- a/pdns/minicurl.cc
+++ b/pdns/minicurl.cc
@@ -59,7 +59,7 @@ void MiniCurl::setupURL(const std::string& str, const ComboAddress* rem)
   curl_easy_setopt(d_curl, CURLOPT_URL, str.c_str());
   curl_easy_setopt(d_curl, CURLOPT_WRITEFUNCTION, write_callback);
   curl_easy_setopt(d_curl, CURLOPT_WRITEDATA, this);
-
+  curl_easy_setopt(d_curl, CURLOPT_TIMEOUT, 2L);
   
   d_data.clear();
 }

diff --git a/pdns/packethandler.cc b/pdns/packethandler.cc
index 3c34485b4ec341217bcf95595def681154324cc4..397caeae4ebe310cf824fa8c6026227c7b47bd4f 100644 (file)
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
@@ -1285,18 +1285,21 @@ DNSPacket *PacketHandler::doQuestion(DNSPacket *p)
     while(B.get(rr)) {
       if(rr.dr.d_type == QType::LUA) {
         auto rec=getRR<LUARecordContent>(rr.dr);
-        if(rec->d_type != p->qtype.getCode())
+        if(rec->d_type != QType::CNAME && rec->d_type != p->qtype.getCode())
           continue;
         
-        auto recvec=luaSynth(rec->getCode(), target, p->getRemote(), p->qtype.getCode());
+        auto recvec=luaSynth(rec->getCode(), target, sd.qname, sd.domain_id, p->getRemote(), rec->d_type);
         if(!recvec.empty()) {
           for(const auto& r : recvec) {
-            rr.dr.d_type = p->qtype.getCode();
+            rr.dr.d_type = rec->d_type; // might be CNAME
             rr.dr.d_content = r;
             rr.scopeMask = 32;
             rrset.push_back(rr);
           }
-          weDone = 1;
+          if(rec->d_type == QType::CNAME && p->qtype.getCode() != QType::CNAME)
+            weRedirected = 1;
+          else
+            weDone = 1;
         }
       }
       //cerr<<"got content: ["<<rr.content<<"]"<<endl;