add zone file parsing for SVCB and HTTPS

hickory-dns · Mar 12, 2021 · 1b7ba9c · 1b7ba9c
1 parent 1e7b941
commit 1b7ba9c
Show file tree

Hide file tree

Showing 5 changed files with 586 additions and 16 deletions.
diff --git a/crates/client/src/error/parse_error.rs b/crates/client/src/error/parse_error.rs
@@ -196,6 +196,12 @@ impl From<ProtoError> for Error {
     }
 }
 
+impl From<std::convert::Infallible> for Error {
+    fn from(_e: std::convert::Infallible) -> Error {
+        panic!("infallible")
+    }
+}
+
 impl From<Error> for io::Error {
     fn from(e: Error) -> Self {
         match *e.kind() {

diff --git a/crates/client/src/serialize/txt/parse_rdata.rs b/crates/client/src/serialize/txt/parse_rdata.rs
@@ -46,8 +46,7 @@ impl RDataParser for RData {
             RecordType::CAA => caa::parse(tokens).map(RData::CAA)?,
             RecordType::CNAME => RData::CNAME(name::parse(tokens, origin)?),
             RecordType::HINFO => RData::HINFO(hinfo::parse(tokens)?),
-            // FIXME: actually implement this
-            RecordType::HTTPS => unimplemented!("HTTPS records not yet supported in zone files"),
+            RecordType::HTTPS => svcb::parse(tokens).map(RData::SVCB)?,
             RecordType::IXFR => panic!("parsing IXFR doesn't make sense"), // valid panic, never should happen
             RecordType::MX => RData::MX(mx::parse(tokens, origin)?),
             RecordType::NAPTR => RData::NAPTR(naptr::parse(tokens, origin)?),
@@ -59,8 +58,7 @@ impl RDataParser for RData {
             RecordType::SOA => RData::SOA(soa::parse(tokens, origin)?),
             RecordType::SRV => RData::SRV(srv::parse(tokens, origin)?),
             RecordType::SSHFP => RData::SSHFP(sshfp::parse(tokens)?),
-            // FIXME: actually implement this
-            RecordType::SVCB => unimplemented!("SVCB records not yet supported in zone files"),
+            RecordType::SVCB => svcb::parse(tokens).map(RData::SVCB)?,
             RecordType::TLSA => RData::TLSA(tlsa::parse(tokens)?),
             RecordType::TXT => RData::TXT(txt::parse(tokens)?),
             RecordType::DNSSEC(DNSSECRecordType::SIG) => panic!("parsing SIG doesn't make sense"), // valid panic, never should happen

diff --git a/crates/client/src/serialize/txt/rdata_parsers/mod.rs b/crates/client/src/serialize/txt/rdata_parsers/mod.rs
@@ -31,5 +31,6 @@ pub(crate) mod openpgpkey;
 pub(crate) mod soa;
 pub(crate) mod srv;
 pub(crate) mod sshfp;
+pub(crate) mod svcb;
 pub(crate) mod tlsa;
 pub(crate) mod txt;