Merge pull request #16977 from miodvallat/wallet-rrtype

auth: Add support to the new WALLET RRType

Author: miodvallat

docs/appendices/types.rst

@@ -393,6 +393,7 @@ The following, rarely used or obsolete record types, are also supported:
 -  MR (:rfc:`1035`)
 -  NID (:rfc:`6742`)
 -  RKEY (`draft-reid-dnsext-rkey-00.txt <https://tools.ietf.org/html/draft-reid-dnsext-rkey-00>`__)
+- WALLET (`wallet-completed-template <https://www.iana.org/assignments/dns-parameters/WALLET/wallet-completed-template>`__)
 
 .. _types-unknown:
 

modules/tinydnsbackend/data

@@ -20134,6 +20134,7 @@
 :phil.mb.example.com:7:\002pc\303\343:120
 :philip.mb.example.com:9:\303\362:120
 :sheila.mb.example.com:7:\004bill\303\343:120
+:test.wallet.example.com:262:\023currency-identifier\021wallet-identifier:120
 :text.example.com:16:\025Hi\054\040this\040is\040some\040text:120
 :text0.example.com:16:\014k\075rsa\073\040p\075one:120
 :text1.example.com:16:\014k\075rsa\073\040p\075one:120

modules/tinydnsbackend/data.cdb

@@ -23,7 +23,7 @@ done
 
 # CD to regression test because named.conf has relative paths.
 cd ../../regression-tests
-../pdns/pdns_server --daemon=no --local-port=5300 --socket-dir=./ \
+${PDNS_BUILD_PATH:-../pdns}/pdns_server --daemon=no --local-port=5300 --socket-dir=./ \
   --no-shuffle --launch=bind --bind-config=../regression-tests/named.conf \
   --query-logging --loglevel=0 \
   --cache-ttl=0 --no-config --local-address=127.0.0.1 \

modules/tinydnsbackend/generate-data.sh

@@ -176,6 +176,10 @@ boilerplate_conv(OPT,
                  );
 //NOLINTEND
 
+// NOLINTBEGIN
+boilerplate_conv(WALLET, conv.xfrText(d_text, true));
+// NOLINTEND
+
 #ifdef HAVE_LUA_RECORDS
 
 bool g_luaRecordInsertWhitespace;
@@ -1017,6 +1021,7 @@ static void reportOtherTypes(const ReportIsOnlyCallableByReportAllTypes& guard)
    L32RecordContent::report(guard);
    L64RecordContent::report(guard);
    LPRecordContent::report(guard);
+   WALLETRecordContent::report(guard);
    ZONEMDRecordContent::report(guard);
 }
 

pdns/dnsrecords.cc

@@ -1139,6 +1139,20 @@ private:
   DNSName d_fqdn;
 };
 
+class WALLETRecordContent : public DNSRecordContent
+{
+public:
+  includeboilerplate(WALLET)
+
+  [[nodiscard]] size_t sizeEstimate() const override
+  {
+    return sizeof(*this) + d_text.size();
+  }
+
+  string d_text;
+};
+
+
 class EUI48RecordContent : public DNSRecordContent
 {
 public:

pdns/dnsrecords.hh

@@ -95,6 +95,7 @@ const map<const string, uint16_t> QType::names = {
   {"URI", 256},
   {"CAA", 257},
   {"RESINFO", 261},
+  {"WALLET", 262},
   {"DLV", 32769},
   {"ADDR", 65400},
 #if !defined(RECURSOR)

pdns/qtype.cc

@@ -142,6 +142,7 @@ public:
     URI = 256,
     CAA = 257,
     RESINFO = 261,
+    WALLET = 262,
     DLV = 32769,
     ADDR = 65400,
 #if !defined(RECURSOR)

pdns/qtype.hh

@@ -1,4 +1,4 @@
-196ff1338193d25caf18c4ad61620ed7  ../regression-tests/zones/example.com
+46d06f67cb9597003fb060d051feb907  ../regression-tests/zones/example.com
 5cce94d1d050925d3bb8c5271a10961b  ../regression-tests/zones/test.com
 e5e3ee998d151fe194b98997eaa36c53  ../regression-tests/zones/test.dyndns
 dee3e8b568549d9450134b555ca73990  ../regression-tests/zones/sub.test.dyndns
@@ -15,5 +15,5 @@ a98864b315f16bcf49ce577426063c42  ../regression-tests/zones/cdnskey-cds-test.com
 9aeed2c26d0c3ba3baf22dfa9568c451  ../regression-tests/zones/2.0.192.in-addr.arpa
 99c73e8b5db5781fec1ac3fa6a2662a9  ../regression-tests/zones/cryptokeys.org
 1f9e19be0cff67330f3a0a5347654f91  ../regression-tests/zones/hiddencryptokeys.org
-c0c013171adc9e838fe0263150205406  ../modules/tinydnsbackend/data
-979d7e1b1f025ce8964dc29f76723232  ../modules/tinydnsbackend/data.cdb
+c0c62775abc8045753fd0012c0dd00de  ../modules/tinydnsbackend/data
+c693b7034e64bcd18a53b88b1e8d1e9f  ../modules/tinydnsbackend/data.cdb

regression-tests.nobackend/tinydns-data-check/expected_result

@@ -0,0 +1,2 @@
+#!/bin/sh
+cleandig test.wallet.example.com WALLET