Add SVCB and HTTPS to LDAP schema

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3ea55f4484e4a9f01b25b10158b337695d371759..4a83b9093cdb33adf7bebd53bf06e4660d129e86 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -788,7 +788,7 @@ jobs:
       - image: debian:buster
         environment:
           LDAPHOST: ldap://ldapserver/
-      - image: powerdns/ldap-regress:1.2.4-0 # OpenLDAP 2.4.47
+      - image: powerdns/ldap-regress:1.2.4-1 # OpenLDAP 2.4.47
         name: ldapserver
         command: '--loglevel debug'
         environment:

diff --git a/build-scripts/docker/ldap-regress/Makefile b/build-scripts/docker/ldap-regress/Makefile
index 0b6611d5c4a0ee9bb5c25b08d4208af4bc1e5bb8..4f5bfa057fb91e08a2019dc35f553cf535ff4107 100644 (file)
--- a/build-scripts/docker/ldap-regress/Makefile
+++ b/build-scripts/docker/ldap-regress/Makefile
@@ -1,6 +1,6 @@
 NAME = powerdns/ldap-regress
 VERSION = 1.2.4
-REVISION = 0
+REVISION = 1
 
 .PHONY: all build build-nocache dep
 
@@ -17,4 +17,4 @@ build-nocache: dep
        docker build --build-arg VERSION=$(VERSION) -t $(NAME):$(VERSION)-$(REVISION) --no-cache --rm .
 
 push: build
-       docker push powerdns/ldap-regress:$(VERSION)-$(REVISION)
\ No newline at end of file
+       docker push powerdns/ldap-regress:$(VERSION)-$(REVISION)

diff --git a/modules/ldapbackend/dnsdomain2.schema b/modules/ldapbackend/dnsdomain2.schema
index 2c88c341bb8ad8b273f1c570014670fdf57daaf6..fbb890d253c3ce1c32ec1f662386bb5b644270fe 100644 (file)
--- a/modules/ldapbackend/dnsdomain2.schema
+++ b/modules/ldapbackend/dnsdomain2.schema
@@ -212,6 +212,18 @@ attributetype ( 1.3.6.1.4.1.2428.20.1.61 NAME 'openPGPKeyRecord'
        SUBSTR caseIgnoreIA5SubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
 
+attributetype ( 1.3.6.1.4.1.2428.20.1.64 NAME 'SVCBRecord'
+       DESC 'Service binding, draft-ietf-dnsop-svcb-https-01'
+       EQUALITY caseIgnoreIA5Match
+       SUBSTR caseIgnoreIA5SubstringsMatch
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
+attributetype ( 1.3.6.1.4.1.2428.20.1.65 NAME 'HTTPSRecord'
+       DESC 'HTTPS service binding, draft-ietf-dnsop-svcb-https-01'
+       EQUALITY caseIgnoreIA5Match
+       SUBSTR caseIgnoreIA5SubstringsMatch
+       SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
+
 attributetype ( 1.3.6.1.4.1.2428.20.1.99 NAME 'sPFRecord'
        DESC 'Sender Policy Framework, RFC 4408'
        EQUALITY caseIgnoreIA5Match
@@ -277,6 +289,7 @@ objectclass ( 1.3.6.1.4.1.2428.20.2 NAME 'dNSDomain2'
                IPSECKEYRecord $ RRSIGRecord $ NSECRecord $
                DNSKEYRecord $ DHCIDRecord $ NSEC3Record $ NSEC3PARAMRecord $
                TLSARecord $ CDSRecord $ CDNSKEYRecord $ OPENPGPKEYRecord $
+               SVCBRecord $ HTTPSRecord $
                SPFRecord $ EUI48Record $ EUI64Record $ TKEYRecord $
                URIRecord $ CAARecord $ DLVRecord $ TYPE65226Record $
                TYPE65534Record

diff --git a/modules/ldapbackend/ldapbackend.hh b/modules/ldapbackend/ldapbackend.hh
index e0589ff2aa547bf7db43ea42aa4216a7717c8ff1..61b2f4614864c247ed5818bac4ed3064e332533b 100644 (file)
--- a/modules/ldapbackend/ldapbackend.hh
+++ b/modules/ldapbackend/ldapbackend.hh
@@ -91,6 +91,8 @@ __attribute__ ((unused)) static const char* ldap_attrany[] = {
   "cDSRecord",
   "cDNSKeyRecord",
   "openPGPKeyRecord",
+  "SVCBRecord",
+  "HTTPSRecord",
   "sPFRecord",
   "EUI48Record",
   "EUI64Record",

diff --git a/regression-tests/tests/autoptr/expected_result.ldap-strict b/regression-tests/tests/autoptr/expected_result.ldap-strict
index c0f16dbdd6f95b546366f8602e723f08ed1e3341..c4bbeba8c12864bb8295c6bb4d66757da754e6e7 100644 (file)
--- a/regression-tests/tests/autoptr/expected_result.ldap-strict
+++ b/regression-tests/tests/autoptr/expected_result.ldap-strict
@@ -1,3 +1,5 @@
+0      1.2.0.192.in-addr.arpa. IN      PTR     120     bar.svcb.example.com.
+0      1.2.0.192.in-addr.arpa. IN      PTR     120     foo.svcb.example.com.
 0      1.2.0.192.in-addr.arpa. IN      PTR     120     host-for-auto-ptr.example.com.
 Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='1.2.0.192.in-addr.arpa.', qtype=PTR