remove v3 lua recursor files (dead code)

diff --git a/pdns/lua-recursor.cc b/pdns/lua-recursor.cc
deleted file mode 100644 (file)
index 695a125..0000000
--- a/pdns/lua-recursor.cc
+++ /dev/null
@@ -1,350 +0,0 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include "lua-recursor.hh"
-// to avoid including all of syncres.hh
-int directResolve(const DNSName& qname, const QType& qtype, int qclass, vector<DNSRecord>& ret);
-
-#if !defined(HAVE_LUA)
-
-RecursorLua::RecursorLua(const std::string &fname)
-  : PowerDNSLua(fname)
-{
-  // empty
-}
-
-bool RecursorLua::nxdomain(const ComboAddress& remote,const ComboAddress& local, const DNSName& query, const QType& qtype, vector<DNSRecord>& ret, int& res, bool* variable)
-{
-  return false;
-}
-
-bool RecursorLua::nodata(const ComboAddress& remote,const ComboAddress& local, const DNSName& query, const QType& qtype, vector<DNSRecord>& ret, int& res, bool* variable)
-{
-  return false;
-}
-
-bool RecursorLua::postresolve(const ComboAddress& remote,const ComboAddress& local, const DNSName& query, const QType& qtype, vector<DNSRecord>& ret, int& res, bool* variable)
-{
-  return false;
-}
-
-
-bool RecursorLua::preresolve(const ComboAddress& remote, const ComboAddress& local, const DNSName& query, const QType& qtype, vector<DNSRecord>& ret, int& res, bool* variable)
-{
-  return false;
-}
-
-bool RecursorLua::preoutquery(const ComboAddress& remote, const ComboAddress& local,const DNSName& query, const QType& qtype, vector<DNSRecord>& ret, int& res)
-{
-  return false;
-}
-
-bool RecursorLua::ipfilter(const ComboAddress& remote, const ComboAddress& local)
-{
-  return false;
-}
-
-
-#else
-
-extern "C" {
-#undef L
-/* Include the Lua API header files. */
-#include <lua.h>
-#include <lauxlib.h>
-#include <lualib.h>
-}
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string>
-#include <vector>
-#include <stdexcept>
-
-#include "logger.hh"
-#include "dnsparser.hh"
-#include "namespaces.hh"
-#include "rec_channel.hh"
-#include "dnsrecords.hh"
-#undef L
-static int getRegisteredNameLua(lua_State *L) {
-  const char *name = luaL_checkstring(L, 1);
-  string regname=getRegisteredName(DNSName(name)).toString(); // hnnggg
-  lua_pushstring(L, regname.c_str());
-  return 1;
-}
-
-RecursorLua::RecursorLua(const std::string &fname)
-  : PowerDNSLua(fname)
-{
-  lua_pushcfunction(d_lua, getRegisteredNameLua);
-  lua_setglobal(d_lua, "getregisteredname");
-}
-
-static int followCNAMERecords(vector<DNSRecord>& ret, const QType& qtype)
-{
-  vector<DNSRecord> resolved;
-  string target; // XXX DNSNAME PAIN
-  for(DNSRecord& rr :  ret) {
-    if(rr.d_type == QType::CNAME) {
-      target=std::dynamic_pointer_cast<CNAMERecordContent>(rr.d_content)->getTarget().toString();
-      break;
-    }
-  }
-  if(target.empty())
-    return 0;
-
-  if(target[target.size()-1]!='.')
-    target.append(1, '.');
-
-  int rcode=directResolve(DNSName(target), qtype, 1, resolved); // 1 == class
-
-  for(const DNSRecord& rr :  resolved)
-  {
-    ret.push_back(rr);
-  }
-  return rcode;
-
-}
-
-
-static int getFakeAAAARecords(const std::string& qname, const std::string& prefix, vector<DNSRecord>& ret)
-{
-  int rcode=directResolve(DNSName(qname), QType(QType::A), 1, ret);
-
-  ComboAddress prefixAddress(prefix);
-
-  for(DNSRecord& rr :  ret)
-  {
-    if(rr.d_type == QType::A && rr.d_place==DNSResourceRecord::ANSWER) {
-      ComboAddress ipv4(std::dynamic_pointer_cast<ARecordContent>(rr.d_content)->getCA());
-      uint32_t tmp;
-      memcpy((void*)&tmp, &ipv4.sin4.sin_addr.s_addr, 4);
-      // tmp=htonl(tmp);
-      memcpy(((char*)&prefixAddress.sin6.sin6_addr.s6_addr)+12, &tmp, 4);
-      rr.d_content = std::make_shared<AAAARecordContent>(prefixAddress);
-      rr.d_type = QType::AAAA;
-    }
-  }
-  return rcode;
-}
-
-static int getFakePTRRecords(const DNSName& qname, const std::string& prefix, vector<DNSRecord>& ret)
-{
-  /* qname has a reverse ordered IPv6 address, need to extract the underlying IPv4 address from it
-     and turn it into an IPv4 in-addr.arpa query */
-  ret.clear();
-  vector<string> parts = qname.getRawLabels();
-
-  if(parts.size() < 8)
-    return -1;
-
-  string newquery;
-  for(int n = 0; n < 4; ++n) {
-    newquery +=
-      std::to_string(std::stol(parts[n*2], 0, 16) + 16*std::stol(parts[n*2+1], 0, 16));
-    newquery.append(1,'.');
-  }
-  newquery += "in-addr.arpa.";
-
-
-  int rcode = directResolve(DNSName(newquery), QType(QType::PTR), 1, ret);
-  for(DNSRecord& rr :  ret)
-  {
-    if(rr.d_type == QType::PTR && rr.d_place==DNSResourceRecord::ANSWER) {
-      rr.d_name = qname;
-    }
-  }
-  return rcode;
-
-}
-
-bool RecursorLua::nxdomain(const ComboAddress& remote, const ComboAddress& local,const DNSName& query, const QType& qtype, vector<DNSRecord>& ret, int& res, bool* variable)
-{
-  if(d_nofuncs.nxdomain)
-    return false;
-
-  return passthrough("nxdomain", remote, local, query, qtype, ret, res, variable);
-}
-
-bool RecursorLua::preresolve(const ComboAddress& remote, const ComboAddress& local,const DNSName& query, const QType& qtype, vector<DNSRecord>& ret, int& res, bool* variable)
-{
-  if(d_nofuncs.preresolve)
-    return false;
-  return passthrough("preresolve", remote, local, query, qtype, ret, res, variable);
-}
-
-bool RecursorLua::nodata(const ComboAddress& remote, const ComboAddress& local,const DNSName& query, const QType& qtype, vector<DNSRecord>& ret, int& res, bool* variable)
-{
-  if(d_nofuncs.nodata)
-    return false;
-
-  return passthrough("nodata", remote, local, query, qtype, ret, res, variable);
-}
-
-bool RecursorLua::postresolve(const ComboAddress& remote, const ComboAddress& local,const DNSName& query, const QType& qtype, vector<DNSRecord>& ret, int& res, bool* variable)
-{
-  if(d_nofuncs.postresolve)
-    return false;
-  return passthrough("postresolve", remote, local, query, qtype, ret, res, variable);
-}
-
-bool RecursorLua::preoutquery(const ComboAddress& ns, const ComboAddress& requestor, const DNSName& query, const QType& qtype, vector<DNSRecord>& ret, int& res)
-{
-  if(d_nofuncs.preoutquery)
-    return false;
-
-  return passthrough("preoutquery", ns, requestor, query, qtype, ret, res, 0);
-}
-
-// returns true to block
-bool RecursorLua::ipfilter(const ComboAddress& remote, const ComboAddress& local)
-{
-  if(d_nofuncs.ipfilter)
-    return false;
-
-  lua_getglobal(d_lua,  "ipfilter");
-  if(!lua_isfunction(d_lua, -1)) {
-    d_nofuncs.regist("ipfilter");
-    lua_pop(d_lua, 1);
-    return false;
-  }
-  d_local = local;
-
-  ComboAddress* ca=(ComboAddress*)lua_newuserdata(d_lua, sizeof(ComboAddress));
-  *ca=remote;
-  luaL_getmetatable(d_lua, "iputils.ca");
-  lua_setmetatable(d_lua, -2);
-
-  if(lua_pcall(d_lua,  1, 1, 0)) {
-    string error=string("lua error in 'ipfilter' while processing: ")+lua_tostring(d_lua, -1);
-    lua_pop(d_lua, 1);
-    throw runtime_error(error);
-    return false;
-  }
-
-  int newres = (int)lua_tonumber(d_lua, 1);
-  lua_pop(d_lua, 1);
-  return newres != -1;
-}
-
-bool RecursorLua::passthrough(const string& func, const ComboAddress& remote, const ComboAddress& local, const DNSName& query, const QType& qtype, vector<DNSRecord>& ret,
-  int& res, bool* variable)
-{
-  d_variable = false;
-  lua_getglobal(d_lua,  func.c_str());
-  if(!lua_isfunction(d_lua, -1)) {
-    // we hit this rarely, so we can be slow
-    //    cerr<<"Registering negative for '"<<func<<"'"<<endl;
-    d_nofuncs.regist(func);
-
-    lua_pop(d_lua, 1);
-    return false;
-  }
-
-  d_local = local;
-  /* the first argument */
-  if(strcmp(func.c_str(),"preoutquery"))
-    lua_pushstring(d_lua,  remote.toString().c_str() );
-  else {
-    ComboAddress* ca=(ComboAddress*)lua_newuserdata(d_lua, sizeof(ComboAddress));
-    *ca=remote;
-    luaL_getmetatable(d_lua, "iputils.ca");
-    lua_setmetatable(d_lua, -2);
-  }
-
-  lua_pushstring(d_lua,  query.toString().c_str() );
-  lua_pushnumber(d_lua,  qtype.getCode() );
-
-  int extraParameter = 0;
-  if(!strcmp(func.c_str(),"nodata")) {
-    pushResourceRecordsTable(d_lua, ret);
-    extraParameter++;
-  }
-  else if(!strcmp(func.c_str(),"postresolve")) {
-    pushResourceRecordsTable(d_lua, ret);
-    lua_pushnumber(d_lua, res);
-    extraParameter+=2;
-  }
-
-  if(lua_pcall(d_lua,  3 + extraParameter, 3, 0)) {   // NOTE! Means we always get 3 stack entries back, no matter what our lua hook returned!
-    string error=string("lua error in '"+func+"' while processing query for '"+query.toString()+"|"+qtype.getName()+": ")+lua_tostring(d_lua, -1);
-    lua_pop(d_lua, 1);
-    throw runtime_error(error);
-    return false;
-  }
- loop:;
-  if(variable)
-    *variable |= d_variable;
-
-  if(!lua_isnumber(d_lua, 1)) {
-    string tocall = lua_tostring(d_lua,1);
-    lua_remove(d_lua, 1); // the name
-    ret.clear();
-    if(tocall == "udpQueryResponse") {
-      string dest = lua_tostring(d_lua,1);
-      string uquery;
-      getFromTable("query", uquery);
-      string callback;
-      getFromTable("callback", callback);
-
-      auto table = getLuaTable(d_lua, -1);
-      lua_pop(d_lua, 2);
-      string answer = GenUDPQueryResponse(ComboAddress(dest), uquery);
-      lua_getglobal(d_lua,  callback.c_str());
-      
-      lua_pushstring(d_lua,  remote.toString().c_str() );
-      lua_pushstring(d_lua,  query.toString().c_str() );
-      lua_pushnumber(d_lua,  qtype.getCode() );
-      table.push_back({"response", answer});
-      pushLuaTable(d_lua, table);
-
-      if(lua_pcall(d_lua,  4, 3, 0)) {   // NOTE! Means we always get 3 stack entries back, no matter what our lua hook returned!
-       string error=string("lua error in '"+func+"' while callback for '"+query.toString()+"|"+qtype.getName()+": ")+lua_tostring(d_lua, -1);
-       lua_pop(d_lua, 1);
-       throw runtime_error(error);
-       return false;
-      }
-      goto loop;
-    }
-    else if(tocall == "getFakeAAAARecords") {
-      string luaprefix = lua_tostring(d_lua, 2);
-      string luaqname = lua_tostring(d_lua,1);
-      lua_pop(d_lua, 2);
-      res = getFakeAAAARecords(luaqname, luaprefix, ret);
-    }
-    else if(tocall == "getFakePTRRecords") {
-      string luaprefix = lua_tostring(d_lua, 2);
-      string luaqname = lua_tostring(d_lua,1);
-      lua_pop(d_lua, 2);
-      res = getFakePTRRecords(DNSName(luaqname), luaprefix, ret);
-    }
-    else if(tocall == "followCNAMERecords") {
-      popResourceRecordsTable(d_lua, query, ret);
-      lua_pop(d_lua, 2);
-      res = followCNAMERecords(ret, qtype);
-    }
-
-    return true;
-    // returned a followup
-  }
-
-  int newres = (int)lua_tonumber(d_lua, 1); // new rcode
-  if(newres == -1) {
-    //    cerr << "handler did not handle"<<endl;
-    lua_pop(d_lua, 3);
-    return false;
-  }
-  res=newres;
-
-  ret.clear();
-
-  /*           1       2   3   4   */
-  /* stack:  boolean table key row */
-
-  popResourceRecordsTable(d_lua, query, ret); // doesn't actually pop the table itself!
-  lua_pop(d_lua, 3);
-  return true;
-}
-
-#endif

diff --git a/pdns/lua-recursor.hh b/pdns/lua-recursor.hh
deleted file mode 100644 (file)
index 65d63fb..0000000
--- a/pdns/lua-recursor.hh
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef PDNS_LUA_RECURSOR_HH
-#define PDNS_LUA_RECURSOR_HH
-#include "dns.hh"
-#include "iputils.hh"
-#include "lua-pdns.hh"
-string GenUDPQueryResponse(const ComboAddress& dest, const string& query);
-class RecursorLua : public PowerDNSLua
-{
-public:
-  explicit RecursorLua(const std::string& fname);
-  // ~RecursorLua();
-  bool preresolve(const ComboAddress& remote,const ComboAddress& local, const DNSName& query, const QType& qtype, vector<DNSRecord>& res, int& ret, bool* variable);
-  bool nxdomain(const ComboAddress& remote, const ComboAddress& local, const DNSName& query, const QType& qtype, vector<DNSRecord>& res, int& ret, bool* variable);
-  bool nodata(const ComboAddress& remote, const ComboAddress& local, const DNSName& query, const QType& qtype, vector<DNSRecord>& res, int& ret, bool* variable);
-  bool postresolve(const ComboAddress& remote, const ComboAddress& local, const DNSName& query, const QType& qtype, vector<DNSRecord>& res, int& ret, bool* variable);
-  bool preoutquery(const ComboAddress& ns, const ComboAddress& requestor, const DNSName& query, const QType& qtype, vector<DNSRecord>& res, int& ret);
-  bool ipfilter(const ComboAddress& remote, const ComboAddress& local);
-private:
-  bool passthrough(const string& func, const ComboAddress& remote,const ComboAddress& local, const DNSName& query, const QType& qtype, vector<DNSRecord>& ret, int& res, bool* variable);
-
-  struct NoFuncs
-  {
-    NoFuncs() : preresolve(0), nxdomain(0), nodata(0), postresolve(0), preoutquery(0), ipfilter()
-    {}
-    
-    void regist(const std::string& func)
-    {
-      if(func=="preresolve")       preresolve=1;
-      else if(func=="nxdomain")    nxdomain=1;
-      else if(func=="nodata")      nodata=1;
-      else if(func=="postresolve") postresolve=1;
-      else if(func=="preoutquery") preoutquery=1;
-      else if(func=="ipfilter")    ipfilter=1;
-      else throw std::runtime_error("Attempting to blacklist unknown Lua function");
-      
-    }
-
-    void reset()
-    {
-      *this = NoFuncs();
-    }
-    bool preresolve, nxdomain, nodata, postresolve, preoutquery, ipfilter;
-  } d_nofuncs;
-
-};
-
-
-#endif