Merge !233: trust anchors: store in prettier format

Closes #167.

.gitignore

@@ -46,6 +46,7 @@ _obj
 /daemon/kresc
 /daemon/kresd
 /daemon/lua/*.inc
+/daemon/lua/kres.lua
 /daemon/lua/trust_anchors.lua
 /daemon/lua/zonefile.lua
 /tests/test_array

daemon/daemon.mk

@@ -52,7 +52,12 @@ ifneq ($(SED),)
 	$(INSTALL) -m 0644 doc/kresd.8 $(DESTDIR)$(MANDIR)/man8/
 endif
 daemon-clean: kresd-clean
-	@$(RM) daemon/lua/*.inc daemon/lua/trust_anchors.lua
+	@$(RM) daemon/lua/*.inc daemon/lua/{kres,trust_anchors,zonefile}.lua
+
+KNOT_RRSET_TXT_DUMP := \
+	$(shell pkg-config libknot --atleast-version=2.4.0 && echo true || echo false)
+daemon/lua/kres.lua: daemon/lua/kres.lua.in
+	@$(call quiet,SED,$<) -e "s|@KNOT_RRSET_TXT_DUMP@|$(KNOT_RRSET_TXT_DUMP)|g" $< > $@
 
 daemon/lua/trust_anchors.lua: daemon/lua/trust_anchors.lua.in
 	@$(call quiet,SED,$<) -e "s|@ETCDIR@|$(ETCDIR)|g" $< > $@

daemon/lua/kres-gen.lua

@@ -169,7 +169,10 @@ char *knot_dname_to_str(char *, const knot_dname_t *, size_t);
 uint16_t knot_rdata_rdlen(const knot_rdata_t *);
 uint8_t *knot_rdata_data(const knot_rdata_t *);
 knot_rdata_t *knot_rdataset_at(const knot_rdataset_t *, size_t);
+int knot_rrset_add_rdata(knot_rrset_t *, const uint8_t *, const uint16_t, const uint32_t, knot_mm_t *);
+void knot_rrset_init_empty(knot_rrset_t *);
 uint32_t knot_rrset_ttl(const knot_rrset_t *);
+int knot_rrset_txt_dump(const knot_rrset_t *, char **, size_t *, const knot_dump_style_t *);
 int knot_rrset_txt_dump_data(const knot_rrset_t *, const size_t, char *, const size_t, const knot_dump_style_t *);
 const knot_dname_t *knot_pkt_qname(const knot_pkt_t *);
 uint16_t knot_pkt_qtype(const knot_pkt_t *);

daemon/lua/kres-gen.sh

@@ -77,7 +77,10 @@ genResType "enum kr_query_flag" | sed -e 's/enum kr_query_flag/struct query_flag
 	knot_rdata_rdlen
 	knot_rdata_data
 	knot_rdataset_at
+	knot_rrset_add_rdata
+	knot_rrset_init_empty
 	knot_rrset_ttl
+	knot_rrset_txt_dump
 	knot_rrset_txt_dump_data
 # Packet
 	knot_pkt_qname

daemon/lua/kres.lua → daemon/lua/kres.lua.in

 -- LuaJIT ffi bindings for libkres, a DNS resolver library.
 -- @note Since it's statically compiled, it expects to find the symbols in the C namespace.
 
+local kres -- the module
+
 ffi = require('ffi')
 local bit = require('bit')
 local bor = bit.bor
@@ -107,6 +109,7 @@ struct sockaddr {
 /*
  * libc APIs
  */
+void * malloc(size_t size);
 void free(void *ptr);
 int inet_pton(int af, const char *src, void *dst);
 ]]
@@ -127,7 +130,7 @@ ffi.metatype( sockaddr_t, {
 	}
 })
 
--- Metatype for RR set
+-- Metatype for RR set.  Beware, the indexing is 0-based (rdata, get, tostring).
 local rrset_buflen = (64 + 1) * 1024
 local rrset_buf = ffi.new('char[?]', rrset_buflen)
 local knot_rrset_t = ffi.typeof('knot_rrset_t')
@@ -158,7 +161,42 @@ ffi.metatype( knot_rrset_t, {
 				return ret >= 0 and ffi.string(rrset_buf)
 			end
 		end,
-	}
+
+		-- Dump the rrset in presentation format (dig-like).
+		txt_dump = function(rr, style)
+			if @KNOT_RRSET_TXT_DUMP@ then
+				local bufsize = 1024
+				local dump = ffi.new('char *[1]', C.malloc(bufsize))
+					-- ^ one pointer to a string
+				local size = ffi.new('size_t[1]', { bufsize }) -- one size_t = bufsize
+
+				local ret = knot.knot_rrset_txt_dump(rr, dump, size,
+								style or knot.KNOT_DUMP_STYLE_DEFAULT)
+				local result = nil
+				if ret >= 0 then
+					result = ffi.string(dump[0], ret)
+				end
+				C.free(dump[0])
+				return result
+			else
+				-- different _txt_dump ABI -> use old "binary" method
+				local function hex_encode(str)
+					return (str:gsub('.', function (c)
+						return string.format('%02X', string.byte(c))
+					end))
+				end
+				local result = ''
+				local i
+				for i = 0, rr.rrs.rr_count - 1 do
+					local rr1 = rr:get(i)
+					local rdata = hex_encode(rr1.rdata)
+					result = result .. string.format('%s %d IN TYPE%d \\# %d %s\n',
+						kres.dname2str(rr1.owner), rr1.ttl, rr1.type, #rr1.rdata, rdata)
+				end
+				return result
+			end
+		end,
+	},
 })
 
 -- Metatype for packet
@@ -273,22 +311,34 @@ local function dname2str(dname)
 	return ffi.string(ffi.gc(C.knot_dname_to_str(nil, dname, 0), C.free))
 end
 
--- Pretty print for RR
-local function rr2str(rr)
-	local function hex_encode(str)
-		return (str:gsub('.', function (c)
-			return string.format('%02X', string.byte(c))
-		end))
+-- Pretty-print a single RR (which is a table with .owner .ttl .type .rdata)
+-- Extension: append .comment if exists.
+local function rr2str(rr, style)
+	-- Construct a single-RR temporary set while minimizing copying.
+	local rrs = knot_rrset_t()
+	knot.knot_rrset_init_empty(rrs)
+	rrs._owner = ffi.cast('char *', rr.owner) -- explicit cast needed here
+	rrs.type = rr.type
+	rrs.rclass = kres.class.IN
+	knot.knot_rrset_add_rdata(rrs, rr.rdata, #rr.rdata, rr.ttl, nil)
+
+	local ret = rrs:txt_dump(style)
+	C.free(rrs.rrs.data)
+
+	-- Trim the newline and append comment (optionally).
+	if ret then
+		if ret:byte(-1) == string.byte('\n', -1) then
+			ret = ret:sub(1, -2)
+		end
+		if rr.comment then
+ 			ret = ret .. ' ;' .. rr.comment
+		end
 	end
-	local rdata = hex_encode(rr.rdata)
-	res = string.format('%s %d IN TYPE%d \\# %d %s',
-		dname2str(rr.owner), rr.ttl, rr.type, #rr.rdata, rdata)
-	if rr.comment then res = res .. ';' .. rr.comment end
-	return res
+	return ret
 end
 
 -- Module API
-local kres = {
+kres = {
 	-- Constants
 	class = ffi.new('struct rr_class'),
 	type = ffi.new('struct rr_type'),

daemon/lua/trust_anchors.lua.in

@@ -219,6 +219,7 @@ local function keyset_write(keyset, path)
 	for i = 1, #keyset do
 		local ta = keyset[i]
 		ta.comment = ' ' .. ta.state .. ':' .. (ta.timer or '')
+					.. ' ; KeyTag:' .. ta.key_tag -- the tag is just for humans
 		local rr_str = kres.rr2str(ta) .. '\n'
 		if ta.state ~= key_state.Valid and ta.state ~= key_state.Missing then
 			rr_str = '; '..rr_str -- Invalidate key string (for older kresd versions)
@@ -280,6 +281,11 @@ local function keyset_read(path)
 			end
 		end
 	end
+
+	local _k, ta
+	for _k, ta in pairs(tas) do
+		ta.key_tag = C.kr_dnssec_key_tag(ta.type, ta.rdata, #ta.rdata)
+	end
 	return tas
 end
 

modules/version/version.lua.in

@@ -45,8 +45,7 @@ end
 --Parses version from server and compares it to the installed one
 local function parse(record)
     local output = ""
-    local str = getLastWord(kres.rr2str(record))
-    str = hex2string(str)
+    local str = record:tostring(0)
     local CVE = parseCVE(str)
     local version = parseVersion(str)
     local localVersion = '@VERSION@'
@@ -66,7 +65,7 @@ end
 local function request (answer)
     local pkt = kres.pkt_t(answer)
     if pkt:rcode() == kres.rcode.NOERROR then
-        parse(pkt:section(kres.section.ANSWER)[1])
+        parse(pkt:rrsets(kres.section.ANSWER)[1])
     else
         print ('Request for version ended with rcode: ', pkt:rcode())
         return
@@ -104,4 +103,4 @@ function M.deinit()
     if M.ev then event.cancel(M.ev) end
 end
 
-return M
\ No newline at end of file
+return M