Added list to the example backend lua script.

I rewrote this backend lua example script to not repeat things on
every record and to show how domain_id can be used when it is available.

diff --git a/modules/luabackend/test/powerdns-luabackend.lua b/modules/luabackend/test/powerdns-luabackend.lua
index 586dbbd18641186b257c26021e9d1d326f7eee7d..f92dbac60f14527f476d6ace451464c9e782cf25 100644 (file)
--- a/modules/luabackend/test/powerdns-luabackend.lua
+++ b/modules/luabackend/test/powerdns-luabackend.lua
@@ -1,70 +1,210 @@
---remember, this is just a test case to see that the minimal backend does work...
+-- An example of the minimal functions needed to test the lua backend
 
 local logger = logger
-local pairs = pairs
+local pairs, ipairs = pairs, ipairs
 local type = type
 
 local log_error = log_error
 local log_debug = log_debug
 local dnspacket = dnspacket
 
+local remote_ip, remote_port, local_ip
+
+local origin
+local domains = {}
 
-local domains_id = {}
-local domains_name = {}
-local records = {}
+-- shared state between lookup and get functions
+local domain_id, q_name, q_type
+local c, r, size
 
 
-domains_name["test.com."] = {domain_id = 11, name = "test.com.", type = "NATIVE", soa = { hostmaster = "ahu.test.com.", nameserver = "ns1.test.com.", serial = 2005092501, refresh = 28800, retry = 7200, expire = 604800, default_ttl = 86400, ttl = 3600 } }
-domains_id["11"] = domains_name["test.com."]
+function content_from_soatab(t)
+    return ("%s %s %u %u %u %u %u"):format(
+            t.hostmaster, t.nameserver,
+            t.serial, t.refresh, t.retry,
+            t.expire, t.default_ttl
+        )
+end
+
+origin = "test.com."
+domains[origin] = {
+    domain_id = 1 + #domains,
+    name = origin,
+    soa = {
+        hostmaster = "ahu."..origin,
+        nameserver = "ns1."..origin,
+        serial = 2005092501,
+        refresh = 28800,
+        retry = 7200,
+        expire = 604800,
+        default_ttl = 86400,
+        ttl = 3600,
+    },
+    records = {},
+}
+domains[domains[origin].domain_id] = domains[origin]
 
 
-records["test.com."] = { 
-    {domain_id = 11, name = "test.com.", type = "SOA", ttl = 36000, content = "ns1.test.com. ahu.test.com. 2005092501 7200 3600 1209600 3600"},
-    {domain_id = 11, name = "test.com.", type = "NS", ttl = 120, content = "ns1.test.com."},
-    {domain_id = 11, name = "test.com.", type = "NS", ttl = 120, content = "ns2.test.com."},
+domains[origin].records[origin] = {
+    {qtype = "SOA", ttl = domains[origin].soa.ttl, content = content_from_soatab(domains[origin].soa) },
+    {qtype = "NS", ttl = 120, content = "ns1."..origin },
+    {qtype = "NS", ttl = 120, content = "ns2."..origin },
 }
-records["ns1.test.com."] = {
-    {domain_id = 11, name = "ns1.test.com.", type = "A", ttl = 120, content = "10.11.12.14"},
-    {domain_id = 11, name = "ns1.test.com.", type = "AAAA", ttl = 120, content = "1:2:3:4:5:6:7:9"}
+domains[origin].records["ns1."..origin] = {
+    {qtype = "A", ttl = 120, content = "10.11.12.14" },
+    {qtype = "AAAA", ttl = 120, content = "1:2:3:4:5:6:7:9" },
 }
-records["ns2.test.com."] = {
-    {domain_id = 11, name = "ns2.test.com.", type = "A", ttl = 120, content = "10.11.12.15"},
-    {domain_id = 11, name = "ns2.test.com.", type = "AAAA", ttl = 120, content = "1:2:3:4:5:6:7:10"}
+domains[origin].records["ns2."..origin] = {
+    {qtype = "A", ttl = 120, content = "10.11.12.15" },
+    {qtype = "AAAA", ttl = 120, content = "1:2:3:4:5:6:7:10" },
 }
 
-records["www.test.com."] = {
-    {domain_id = 11, name = "www.test.com.", type = "CNAME", ttl = 120, content = "host.test.com."} }
-records["host.test.com."] = {
-    {domain_id = 11, name = "host.test.com.", type = "A", ttl = 120, content = "10.11.12.13"},
-    {domain_id = 11, name = "host.test.com.", type = "AAAA", ttl = 120, content = "1:2:3:4:5:6:7:8"}
+domains[origin].records["www."..origin] = {
+    {qtype = "CNAME", ttl = 120, content = "host."..origin },
+}
+domains[origin].records["host."..origin] = {
+    {qtype = "A", ttl = 120, content = "10.11.12.13" },
+    {qtype = "AAAA", ttl = 120, content = "1:2:3:4:5:6:7:8" },
 }
 
 
+origin = "example.com."
+domains[origin] = {
+    domain_id = 1 + #domains,
+    name = origin,
+    soa = {
+        hostmaster = "hostmaster."..origin,
+        nameserver = "ns1."..origin,
+        serial = 2017080201,
+        refresh = 28800,
+        retry = 7200,
+        expire = 604800,
+        default_ttl = 86400,
+        ttl = 3600,
+    },
+    records = {},
+}
+domains[domains[origin].domain_id] = domains[origin]
 
-function list(target, domain_id)
-    logger(log_debug, "(l_list)", "target:", target, " domain_id:", domain_id )
-    
-    return false
+
+domains[origin].records[origin] = {
+    {qtype = "SOA", ttl = domains[origin].soa.ttl, content = content_from_soatab(domains[origin].soa) },
+    {qtype = "NS", ttl = 120, content = "ns1."..origin },
+    {qtype = "A", ttl = 120, content = "10.9.8.7" },
+    {qtype = "AAAA", ttl = 120, content = "10:9:8::7" },
+}
+domains[origin].records["ns1."..origin] = {
+    {qtype = "A", ttl = 120, content = "10.9.8.6" },
+    {qtype = "AAAA", ttl = 120, content = "10:9:8::6" },
+}
+
+
+function table_deepjoin(tab1, tab2)
+    local new = {}
+    local seen = {}
+
+    if tab1 then
+        seen[tab1] = new
+    end
+    if tab2 then
+        seen[tab2] = new
+    end
+
+    local function dj(ret, tab)
+        if not tab then
+            return ret
+        end
+
+        local k, v
+        for k,v in pairs(tab) do
+            if ("table" ~= type(v)) then
+                if not ret[k] then
+                    ret[k] = v
+                end
+            elseif seen[v] then
+                ret[k] = seen[v]
+            elseif ("table" == type(v)) then
+                if not ret[k] then
+                    ret[k] = table_deepjoin(v, nil)
+                else
+                    ret[k] = table_deepjoin(ret[k], v)
+                end
+                seen[v] = ret[k]
+            end
+        end
+
+        return ret
+    end
+
+    new = dj(new, tab1)
+    new = dj(new, tab2)
+
+    return new
 end
 
-local size, c, r, n, nn, q_type, q_name, domainid
-local remote_ip, remote_port, local_ip
+function list(qname, domainid)
+    q_type = "ANY"
+    q_name = qname
+    domain_id = domainid
+    logger(log_debug, "(l_list)", "target:", q_name, " domain_id:", domain_id )
+
+    c = 0
+    r = nil
+    size = 0
+
+    local tab = domains[domain_id] or domains[q_name:lower()]
+    if (("table" == type(tab)) and ("table" == type(tab.records))) then
+        r = {}
+        local k, v, kk, vv
+        for k, v in pairs(tab.records) do
+            for kk, vv in ipairs(v) do
+                r[1 + #r] = table_deepjoin(vv, {domain_id = domain_id, qname = k, name = k})
+            end
+        end
+    end
+
+    if ("table" == type(r)) then
+       size = #r
+        return true
+    end
 
-function lookup(qtype, qname, domain_id)
-    logger(log_debug, "(l_lookup)", "qtype:", qtype, " qname:", qname, " domain_id:", domain_id )
-    q_type = qtype
+    return false
+end
+
+-- Args:
+--    qtype table: { name = "SOA", code = 6 }
+--    qname string: "test.com."
+--    domainid number: 1
+function lookup(qtype, qname, domainid)
+    q_type = ("table" == type(qtype)) and qtype.name or qtype
     q_name = qname
-    domainid = domain_id
-    
-    r = records[q_name]
-    
+    domain_id = domainid
+    logger(log_debug, "(l_lookup)", "q_type:", q_type, " q_name:", q_name, " domain_id:", domain_id )
+
+    if (0 < domain_id) then
+        r = domains[domain_id].records[q_name:lower()]
+    else
+        -- domain_id of -1 means we need to search all the records
+        local k, v, kk, vv
+        for k, v in ipairs(domains) do
+            if ("table" == type(v.records)) then
+                for kk, vv in ipairs(v.records) do
+                    if (q_name:lower() == kk) then
+                        r = vv
+                        domain_id = v.domain_id
+                    end
+                end
+            end
+        end
+    end
+
     c = 0
     size = 0
 
     -- remote_ip, remote_port, local_ip = dnspacket()
     -- logger(log_debug, "(l_lookup) dnspacket", "remote:", remote_ip, " port:", remote_port, " local:", local_ip)
 
-    if type(r) == "table" then
+    if ("table" == type(r)) then
        size = #r
     end
     logger(log_debug, "(l_lookup)", "size:", size)
@@ -73,14 +213,15 @@ end
 function get()
     logger(log_debug, "(l_get) begin")
 
+    local kk, vv
     while c < size do
        c = c + 1
-       if (q_type == "ANY" or q_type == r[c]["type"]) then 
-           for kk,vv in pairs(r[c]) do
+       if (("ANY" == q_type) or (r[c].qtype == q_type)) then
+           for kk,vv in ipairs(r[c]) do
                logger(log_debug, "(l_get) ", kk, type(vv), vv)
            end
             logger(log_debug, "(l_get) end: success")
-           return r[c]
+           return table_deepjoin(r[c], {domain_id = domain_id, qname = q_name:lower(), name = q_name:lower()})
        end
     end
 
@@ -88,17 +229,17 @@ function get()
     return false
 end
 
-local k,v,kk,vv
+-- Args:
+--    qname string: "test.com."
+function getsoa(qname)
+    logger(log_debug, "(l_getsoa) begin", "qname:", qname)
 
-function getsoa(name)
-    logger(log_debug, "(l_getsoa) begin", "name:", name)
-
-    r = domains_name[name]
-    if type(r) == "table" then
-       logger(log_debug, "(l_getsoa) end: ", type(r), type(r["soa"]))
-       return r["soa"] 
+    r = domains[qname:lower()]
+    if (("table" == type(r)) and ("table" == type(r.soa))) then
+       logger(log_debug, "(l_getsoa) end: ", r.name, r.domain_id, r.soa.serial)
+       return table_deepjoin({qname = qname, domain_id = r.domain_id}, r.soa)
     end
-    
+
     logger(log_debug, "(l_getsoa) end: not found")
 end
 
@@ -107,9 +248,3 @@ logger(log_debug, "the powerdns-luabackend is starting up!")
 --for k,v in pairs(QTypes) do
 --    logger(log_debug, k, v)
 --end
-
---for k,v in pairs(records) do
---    for kk,vv in pairs(v) do
---     logger(log_debug, kk, type(vv), vv["type"])
---    end
---end