dns-zonefile 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e03fd7e584a66f2ad1dfa8b55214bb4c84e2eacce69cb99d4717b195fccff9d
-  data.tar.gz: 64727fe7326f916e0b49d25bc662285220b3c6bc77c2cdc161ea6baaa36d912f
+  metadata.gz: dd9e724e734aee2290ed838fd531986b9023f8240fcbd94d2ed150de8a15d108
+  data.tar.gz: 69ddce22ad9489e91395a237b69c06d1ae836cc6bb91af9b5cf0ae35d79dfb57
 SHA512:
-  metadata.gz: def79e0087a99c705347dca181448696cbc0d44587c111241128c8b56250847505cefe5b34661fd6ebe26952b14ef037a86ab9d031ce7164cfa1bde06d4cbefc
-  data.tar.gz: 9106004e78e04153b04f94b5e054595faad619804c8584192d7b2ea328128cbb1306cc1098dce919df50f7c1d8a2905ad13432959896913e3d394b12ac3943db
+  metadata.gz: 9eb5b44b4ac7f3087caa36d67fa4393a3c91e6380fa825cddaaf9b91e3000e619d89d354d7117f9b4914b3189a087539aa4954a9bdf80c9ac3199735ef163d35
+  data.tar.gz: ef00e8c2abc08e5c47e6105a4530741621b2798b693ebe4a30cbc20880640623d352754465f2aa2eb30321e17fcbbc91009c1fa1602a1413a5c5aced8065f3bd

data/lib/dns/zonefile/version.rb

@@ -1,5 +1,5 @@
 module DNS
   module Zonefile
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

data/lib/dns/zonefile.rb

@@ -52,6 +52,8 @@ module DNS
             when "SRV" then @records << SRV.new(@vars, e)
             when "SPF" then @records << SPF.new(@vars, e)
             when "SSHFP" then @records << SSHFP.new(@vars, e)
+            when "SVCB" then @records << SVCB.new(@vars, e)
+            when "HTTPS" then @records << HTTPS.new(@vars, e)
             when "TLSA" then @records << TLSA.new(@vars, e)
             when "TXT" then @records << TXT.new(@vars, e)
             when "SOA" then
@@ -287,6 +289,42 @@ module DNS
       end
     end
 
+    class SVCB < Record
+      attr_accessor :host, :priority, :target_name
+      attr_reader :svcparams
+
+      def initialize(vars, zonefile_record)
+        @vars = vars
+        if zonefile_record
+          self.host = qualify_host(zonefile_record.host.to_s)
+          @vars[:last_host] = host
+          self.ttl = zonefile_record.ttl.to_i
+          self.klass = zonefile_record.klass.to_s
+          self.priority = zonefile_record.priority.to_i
+          self.target_name = zonefile_record.target.to_s == "." ? "." : qualify_host(zonefile_record.target.to_s)
+          @svcparams = parse_svcparams(zonefile_record.svcparams.to_s)
+        else
+          @svcparams = {}
+        end
+      end
+
+      # Parses SvcParams string (e.g. "alpn=h2,h3 ipv4hint=192.0.2.1") into a Hash of name => value.
+      # Handles quoted values (e.g. ech="base64...").
+      def parse_svcparams(str)
+        return {} if str.to_s.strip.empty?
+
+        # Key is word chars + hyphen; value is either "quoted" (with \ " and \ \ escapes) or unquoted (no spaces)
+        str.strip.scan(/([\w-]+)=(?:"((?:[^"\\]|\\.)*)"|([^\s]*))|([\w-]+)(?=\s|$)/).each_with_object({}) do |(key_with_val, quoted, unquoted, key_only), params|
+          key = key_with_val || key_only
+          value = quoted ? quoted.gsub(/\\"/, '"').gsub(/\\\\/, '\\') : (unquoted || "")
+          params[key] = value
+        end
+      end
+    end
+
+    class HTTPS < SVCB
+    end
+
     class TLSA < Record
       attr_accessor :host, :usage, :selector, :matching_type, :certificate_data
 

data/lib/dns/zonefile.treetop

@@ -56,7 +56,7 @@ grammar Zonefile
   end
 
   rule resource_record
-    record:(a_record / aaaa_record / caa_record / cname_record / mx_record / naptr_record / ns_record / ptr_record / srv_record / spf_record / sshfp_record / tlsa_record / txt_record / soa_record) space* comment? linebreak {
+    record:(a_record / aaaa_record / caa_record / cname_record / mx_record / naptr_record / ns_record / ptr_record / srv_record / spf_record / sshfp_record / svcb_record / https_record / tlsa_record / txt_record / soa_record) space* comment? linebreak {
       def zone
         p = parent
         while p.respond_to?(:parent) && p.parent
@@ -299,6 +299,66 @@ grammar Zonefile
     }
   end
 
+  rule svcb_record
+    (
+     host space ms_age ttl klass "SVCB" space priority:integer space target:svcb_target space svcparam_data:svcb_svcparams /
+     host space ms_age klass ttl "SVCB" space priority:integer space target:svcb_target space svcparam_data:svcb_svcparams /
+     host space ms_age ttl klass "SVCB" space priority:integer space target:svcb_target /
+     host space ms_age klass ttl "SVCB" space priority:integer space target:svcb_target
+    ) {
+      def to_s
+        base = "#{host} #{ttl} #{klass} SVCB #{priority} #{target}"
+        respond_to?(:svcparam_data) && svcparam_data ? "#{base} #{svcparam_data}" : base
+      end
+
+      def record_type
+        "SVCB"
+      end
+
+      def svcparams
+        (respond_to?(:svcparam_data) && svcparam_data) ? svcparam_data.to_s.strip : ""
+      end
+    }
+  end
+
+  rule https_record
+    (
+     host space ms_age ttl klass "HTTPS" space priority:integer space target:svcb_target space svcparam_data:svcb_svcparams /
+     host space ms_age klass ttl "HTTPS" space priority:integer space target:svcb_target space svcparam_data:svcb_svcparams /
+     host space ms_age ttl klass "HTTPS" space priority:integer space target:svcb_target /
+     host space ms_age klass ttl "HTTPS" space priority:integer space target:svcb_target
+    ) {
+      def to_s
+        base = "#{host} #{ttl} #{klass} HTTPS #{priority} #{target}"
+        respond_to?(:svcparam_data) && svcparam_data ? "#{base} #{svcparam_data}" : base
+      end
+
+      def record_type
+        "HTTPS"
+      end
+
+      def svcparams
+        (respond_to?(:svcparam_data) && svcparam_data) ? svcparam_data.to_s.strip : ""
+      end
+    }
+  end
+
+  rule svcb_target
+    ("." / host) {
+      def to_s
+        text_value
+      end
+    }
+  end
+
+  rule svcb_svcparams
+    [^;\n\r]+ {
+      def to_s
+        text_value.strip
+      end
+    }
+  end
+
   rule tlsa_record
     (
      host space ms_age ttl klass "TLSA" space usage:integer space selector:integer space matching_type:integer space certificate_data:tlsa_certificate_data /

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dns-zonefile
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Craig R Webster