dns-zonefile 1.1.12 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cb49e3ee8ed92d42323f4619979ee16eea492f643ccf44bec74ce237f97512b
-  data.tar.gz: 940ed29605e9b5b650bc925414cfdd7d807eaf51f20ae1c96302f3e59a85f0ba
+  metadata.gz: 2e03fd7e584a66f2ad1dfa8b55214bb4c84e2eacce69cb99d4717b195fccff9d
+  data.tar.gz: 64727fe7326f916e0b49d25bc662285220b3c6bc77c2cdc161ea6baaa36d912f
 SHA512:
-  metadata.gz: 342403e936bc703dea402e4ab9801e345a83ea8a6b767085476bd67afe69c9ba9a182df215cc35d7ebe8e7dd53f5f19459385d4fa10d381814c8f0c9f5741dad
-  data.tar.gz: f06db28573800361166c693a3bd86209325225f6ae7520cdfb1384649e2eb6e3c0bbef1a717b16dbd04bc67b1d39d3918ddf880f342fed8dce748d8091c79159
+  metadata.gz: def79e0087a99c705347dca181448696cbc0d44587c111241128c8b56250847505cefe5b34661fd6ebe26952b14ef037a86ab9d031ce7164cfa1bde06d4cbefc
+  data.tar.gz: 9106004e78e04153b04f94b5e054595faad619804c8584192d7b2ea328128cbb1306cc1098dce919df50f7c1d8a2905ad13432959896913e3d394b12ac3943db

data/.github/workflows/ci.yml

@@ -19,8 +19,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, ubuntu-latest]
-        ruby: ['2.7', '3.0', '3.1', head, jruby, truffleruby]
+        os: [ubuntu-latest]
+        ruby: ['2.7', '3.0', '3.1', '3.4', jruby, truffleruby]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3

data/CONTRIBUTING.md

@@ -5,7 +5,7 @@
 Clone the repository and move into it:
 
 ```
-$ git clone git@github.com:craigw/dns-zonefile.git
+$ git clone git@github.com:aeden/dns-zonefile.git
 $ cd dns-zonefile
 ```
 
@@ -33,4 +33,4 @@ Submit unit tests for your changes. You can test your changes on your machine by
 
 ## Publishing
 
-Once a PR is merged into master, bump the version in `lib/dns/zonefile/version.rb` and commit that change. Next, add a new tag with that version number 'git tag vx.x.x' and push the tag to GitHub 'git push origin vx.x.x'. Finally, if you are a maintainer with access rights for rubygems.org, run `gem build dns-zonefile.gemspec` followed by `gem push dns-zonefile-x.x.x.gem` where x.x.x is the version number you just set.
+Once a PR is merged into `main`, bump the version in `lib/dns/zonefile/version.rb` and commit that change. Next, add a new tag with that version number 'git tag vx.x.x' and push the tag to GitHub 'git push origin vx.x.x'. Finally, if you are a maintainer with access rights for rubygems.org, run `gem build dns-zonefile.gemspec` followed by `gem push dns-zonefile-x.x.x.gem` where x.x.x is the version number you just set.

data/{TODO → TODO.md}

@@ -2,5 +2,3 @@
 * Output the zone object-graph as a zone string.
 * Allow comparison of resource records and zones for checking equality.
 * Allow unqualified ns and rp in SOA
-* Implement the changes in the eam pull request for other record types:
-    https://github.com/craigw/dns-zonefile/pull/1

data/dns-zonefile.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
     be investigated programatically, manipulated, validated or printed into
     some canonical form.
   EOD
-  spec.homepage = "https://github.com/craigw/dns-zonefile"
+  spec.homepage = "https://github.com/aeden/dns-zonefile"
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.

data/lib/dns/zonefile/version.rb

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

data/lib/dns/zonefile.rb

@@ -52,6 +52,7 @@ 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 "TLSA" then @records << TLSA.new(@vars, e)
             when "TXT" then @records << TXT.new(@vars, e)
             when "SOA" then
               # No-op
@@ -286,6 +287,24 @@ module DNS
       end
     end
 
+    class TLSA < Record
+      attr_accessor :host, :usage, :selector, :matching_type, :certificate_data
+
+      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.usage = zonefile_record.usage.to_i
+          self.selector = zonefile_record.selector.to_i
+          self.matching_type = zonefile_record.matching_type.to_i
+          self.certificate_data = zonefile_record.certificate_data.to_s
+        end
+      end
+    end
+
     class TXT < Record
       attr_accessor :host, :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 / 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 / tlsa_record / txt_record / soa_record) space* comment? linebreak {
       def zone
         p = parent
         while p.respond_to?(:parent) && p.parent
@@ -299,6 +299,29 @@ grammar Zonefile
     }
   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 /
+     host space ms_age klass ttl "TLSA" space usage:integer space selector:integer space matching_type:integer space certificate_data:tlsa_certificate_data
+    ) {
+      def to_s
+        "#{host} #{ttl} #{klass} TLSA #{usage} #{selector} #{matching_type} #{certificate_data}"
+      end
+
+      def record_type
+        "TLSA"
+      end
+    }
+  end
+
+  rule tlsa_certificate_data
+    [a-fA-F0-9 ]+ {
+      def to_s
+        text_value.strip
+      end
+    }
+  end
+
   rule txt_record
     (
      host space ms_age ttl klass "TXT" space data:ms_txt_data /

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dns-zonefile
 version: !ruby/object:Gem::Version
-  version: 1.1.12
+  version: 1.2.0
 platform: ruby
 authors:
 - Craig R Webster
 - Anthony Eden
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -106,7 +105,7 @@ files:
 - LICENCE
 - README.md
 - Rakefile
-- TODO
+- TODO.md
 - bin/console
 - bin/setup
 - dns-zonefile.gemspec
@@ -122,11 +121,10 @@ files:
 - lib/dns/zonefile.rb
 - lib/dns/zonefile.treetop
 - lib/dns/zonefile/version.rb
-homepage: https://github.com/craigw/dns-zonefile
+homepage: https://github.com/aeden/dns-zonefile
 licenses: []
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -141,8 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Work with zonefiles (RFC 1035 section 5 and RFC 1034 section 3.6.1)
 test_files: []