dns-zonefile 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd38c55e83f1bf952fdba0831fd183b81bf2f556
-  data.tar.gz: 11c7b7481eb3bf6f56ca8fe46f64ee4c5516e421
+  metadata.gz: 2d2cf8f81008cd088e5a4beb910bdd6fac23bc21
+  data.tar.gz: 9585b78227f0ec5b9fe993c108febfc20962c9fe
 SHA512:
-  metadata.gz: 3820bd3385d77de0f50d99afa3ab5bd74ca370ebfb92caa9984042d318936c9e9de968437af0d117f97d65341b6455594c1262417011a39d9be6696ecb339ee7
-  data.tar.gz: 83b879336f94c811c1b4075b7a5e86dedc2304ae94f7d6dad28c2b09166c665d565be90c3f4f37dae2fc74ea7a45dda001a07318b3785fc48f977db58f407918
+  metadata.gz: d361f79d9ea5ff9f0ff49ce4bb21d3c31e2e4794169c752edd78e51f3d0d90641b8bd6eea1d79f1c248ed5031485036f8102ffce5a5942054c9f51d28dc9bcb3
+  data.tar.gz: b281a14ab6d5bfa7cfbfa48f9012daad168ab87ed6bc3bfa2d25c89d581d0127908e5b4fa5e603d427b13de78f770d6815d2bd1d0a0dd7f05231495487f42c28

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.2.2
+FROM ruby:2.3
 
 RUN mkdir -p /u/app
 WORKDIR /u/app

data/circle.yml

@@ -0,0 +1,6 @@
+dependencies:
+  pre:
+    - gem install bundler --version 1.11
+machine:
+  ruby:
+    version: 2.3.0

data/dns-zonefile.gemspec

@@ -19,7 +19,7 @@ This is an attempt to use Ruby parse them into an object graph which can
 be investigated programatically, manipulated, validated or printed into
 some canonical form.
   EOD
-  spec.homepage      = "http://barkingiguana.com/"
+  spec.homepage      = "https://github.com/craigw/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.rb

@@ -51,6 +51,7 @@ module DNS
 	    when 'PTR'    then @records << PTR.new(@vars, e)
 	    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 'TXT'    then @records << TXT.new(@vars, e)
 	    when 'SOA'    then ;
 	    else
@@ -70,34 +71,6 @@ module DNS
     end
 
     class Record
-      # assign, with handling for '@'
-      def self.writer_for_at(*attribs)
-	attribs.each do |attrib|
-	  c = <<-MTH
-	    def #{attrib}=(val)
-	      @#{attrib} = val.gsub('@', @vars['origin'])
-	    end
-	  MTH
-	  class_eval c, __FILE__, __LINE__
-	end
-      end
-
-      # assign, with handling for '@', with inheritance
-      def self.inheriting_writer_for_at(*attribs)
-	attribs.each do |attrib|
-	  c = <<-MTH
-	    def #{attrib}=(val)
-	      if val.strip.empty?
-		@#{attrib} = @vars[:last_host]
-	      else
-		@#{attrib} = val.gsub('@', @vars['origin'])
-	      end
-	    end
-	  MTH
-	  class_eval c, __FILE__, __LINE__
-	end
-      end
-
       # assign, with handling for global TTL
       def self.writer_for_ttl(*attribs)
 	attribs.each do |attrib|
@@ -119,22 +92,37 @@ module DNS
 	@klass ||= 'IN'
       end
 
+      private
+      def qualify_host(host)
+        origin = vars['origin']
+        host = vars[:last_host] if host =~ /^\s*$/
+        host = host.gsub(/@/, origin)
+        if host =~ /\.$/
+          host
+        else
+          if origin =~ /^\./
+            host + origin
+          else
+            host + "." + origin
+          end
+        end
+      end
+      attr_accessor :vars
+
     end
 
     class SOA < Record
       attr_accessor :origin, :nameserver, :responsible_party, :serial, :refresh_time, :retry_time, :expiry_time, :nxttl
 
-      writer_for_at  :origin, :nameserver, :responsible_party
-
       def initialize(vars, zonefile_soa=nil)
 	@vars = vars
 	if zonefile_soa
-	  self.origin            = zonefile_soa.origin.to_s
+	  self.origin            = qualify_host(zonefile_soa.origin.to_s)
 	  @vars[:last_host]      = self.origin
 	  self.ttl               = zonefile_soa.ttl.to_i
 	  self.klass             = zonefile_soa.klass.to_s
-	  self.nameserver        = zonefile_soa.ns.to_s
-	  self.responsible_party = zonefile_soa.rp.to_s
+          self.nameserver        = qualify_host(zonefile_soa.ns.to_s)
+	  self.responsible_party = qualify_host(zonefile_soa.rp.to_s)
 	  self.serial            = zonefile_soa.serial.to_i
 	  self.refresh_time      = zonefile_soa.refresh.to_i
 	  self.retry_time        = zonefile_soa.reretry.to_i
@@ -147,12 +135,10 @@ module DNS
     class A < Record
       attr_accessor :host, :address
 
-      inheriting_writer_for_at  :host
-
       def initialize(vars, zonefile_record)
 	@vars = vars
 	if zonefile_record
-	  self.host         = zonefile_record.host.to_s
+	  self.host         = qualify_host(zonefile_record.host.to_s)
 	  @vars[:last_host] = self.host
 	  self.ttl          = zonefile_record.ttl.to_i
 	  self.klass        = zonefile_record.klass.to_s
@@ -167,17 +153,14 @@ module DNS
     class CNAME < Record
       attr_accessor :host, :domainname
 
-      inheriting_writer_for_at  :host
-      writer_for_at :domainname
-
       def initialize(vars, zonefile_record)
 	@vars = vars
 	if zonefile_record
-	  self.host         = zonefile_record.host.to_s
+	  self.host         = qualify_host(zonefile_record.host.to_s)
 	  @vars[:last_host] = self.host
 	  self.ttl          = zonefile_record.ttl.to_i
 	  self.klass        = zonefile_record.klass.to_s
-	  self.domainname   = zonefile_record.target.to_s
+	  self.domainname   = qualify_host(zonefile_record.target.to_s)
 	end
       end
 
@@ -188,18 +171,15 @@ module DNS
     class MX < Record
       attr_accessor :host, :priority, :domainname
 
-      inheriting_writer_for_at  :host
-      writer_for_at :domainname
-
       def initialize(vars, zonefile_record)
 	@vars = vars
 	if zonefile_record
-	  self.host         = zonefile_record.host.to_s
+	  self.host         = qualify_host(zonefile_record.host.to_s)
 	  @vars[:last_host] = self.host
 	  self.ttl          = zonefile_record.ttl.to_i
 	  self.klass        = zonefile_record.klass.to_s
 	  self.priority     = zonefile_record.priority.to_i
-	  self.domainname   = zonefile_record.exchanger.to_s
+	  self.domainname   = qualify_host(zonefile_record.exchanger.to_s)
 	end
       end
 
@@ -210,12 +190,10 @@ module DNS
     class NAPTR < Record
       attr_accessor :host, :data
 
-      inheriting_writer_for_at  :host
-
       def initialize(vars, zonefile_record)
 	@vars = vars
 	if zonefile_record
-	  self.host         = zonefile_record.host.to_s
+	  self.host         = qualify_host(zonefile_record.host.to_s)
 	  @vars[:last_host] = self.host
 	  self.ttl          = zonefile_record.ttl.to_i
 	  self.klass        = zonefile_record.klass.to_s
@@ -227,17 +205,14 @@ module DNS
     class NS < Record
       attr_accessor :host, :domainname
 
-      inheriting_writer_for_at  :host
-      writer_for_at :domainname
-
       def initialize(vars, zonefile_record)
 	@vars = vars
 	if zonefile_record
-	  self.host         = zonefile_record.host.to_s
+	  self.host         = qualify_host(zonefile_record.host.to_s)
 	  @vars[:last_host] = self.host
 	  self.ttl          = zonefile_record.ttl.to_i
 	  self.klass        = zonefile_record.klass.to_s
-	  self.domainname   = zonefile_record.nameserver.to_s
+	  self.domainname   = qualify_host(zonefile_record.nameserver.to_s)
 	end
       end
 
@@ -247,17 +222,14 @@ module DNS
     class PTR < Record
       attr_accessor :host, :domainname
 
-      inheriting_writer_for_at  :host
-      writer_for_at :domainname
-
       def initialize(vars, zonefile_record)
 	@vars = vars
 	if zonefile_record
-	  self.host         = zonefile_record.host.to_s
+	  self.host         = qualify_host(zonefile_record.host.to_s)
 	  @vars[:last_host] = self.host
 	  self.ttl          = zonefile_record.ttl.to_i
 	  self.klass        = zonefile_record.klass.to_s
-	  self.domainname   = zonefile_record.target.to_s
+	  self.domainname   = qualify_host(zonefile_record.target.to_s)
 	end
       end
 
@@ -267,35 +239,47 @@ module DNS
     class SRV < Record
       attr_accessor :host, :priority, :weight, :port, :domainname
 
-      inheriting_writer_for_at  :host
-      writer_for_at :domainname
-
       def initialize(vars, zonefile_record)
 	@vars = vars
 	if zonefile_record
-	  self.host         = zonefile_record.host.to_s
+	  self.host         = qualify_host(zonefile_record.host.to_s)
 	  @vars[:last_host] = self.host
 	  self.ttl          = zonefile_record.ttl.to_i
 	  self.klass        = zonefile_record.klass.to_s
 	  self.priority     = zonefile_record.priority.to_i
 	  self.weight       = zonefile_record.weight.to_i
 	  self.port         = zonefile_record.port.to_i
-	  self.domainname   = zonefile_record.target.to_s
+	  self.domainname   = qualify_host(zonefile_record.target.to_s)
 	end
       end
 
       alias :target :domainname
     end
 
+    class SSHFP < Record
+      attr_accessor :host, :alg, :fptype, :fp
+
+      def initialize(vars, zonefile_record)
+        @vars = vars
+        if zonefile_record
+          self.host         = qualify_host(zonefile_record.host.to_s)
+          @vars[:last_host] = self.host
+          self.ttl          = zonefile_record.ttl.to_i
+          self.klass        = zonefile_record.klass.to_s
+          self.alg          = zonefile_record.alg.to_i
+          self.fptype       = zonefile_record.fptype.to_i
+          self.fp           = zonefile_record.fp.to_s
+        end
+      end
+    end
+
     class TXT < Record
       attr_accessor :host, :data
 
-      inheriting_writer_for_at  :host
-
       def initialize(vars, zonefile_record)
 	@vars = vars
 	if zonefile_record
-	  self.host         = zonefile_record.host.to_s
+	  self.host         = qualify_host(zonefile_record.host.to_s)
 	  @vars[:last_host] = self.host
 	  self.ttl          = zonefile_record.ttl.to_i
 	  self.klass        = zonefile_record.klass.to_s

data/lib/dns/zonefile.treetop

@@ -53,7 +53,7 @@ grammar Zonefile
   end
 
   rule resource_record
-    record:(a_record / aaaa_record / cname_record / mx_record / naptr_record / ns_record / ptr_record / srv_record / spf_record / txt_record / soa_record) space* comment? linebreak {
+    record:(a_record / aaaa_record / cname_record / mx_record / naptr_record / ns_record / ptr_record / srv_record / spf_record / sshfp_record / txt_record / soa_record) space* comment? linebreak {
       def zone
         p = parent
         while p.respond_to?(:parent) && p.parent
@@ -221,7 +221,7 @@ grammar Zonefile
       end
     }
   end
-  
+
   rule spf_record
     host space ms_age ttl klass "SPF" space data:txt_data {
       def to_s
@@ -233,7 +233,19 @@ grammar Zonefile
       end
     }
   end
-  
+
+  rule sshfp_record
+    host space ms_age ttl klass "SSHFP" space alg:integer space fptype:integer space fp:fingerprint {
+      def to_s
+        "#{host} #{ttl} #{klass} SSHFP #{alg} #{fptype} #{fp}"
+      end
+
+      def record_type
+        "SSHFP"
+      end
+    }
+  end
+
   rule txt_record
     host space ms_age ttl klass "TXT" space data:ms_txt_data {
       def to_s
@@ -436,14 +448,15 @@ grammar Zonefile
   rule host
     ( ([*a-zA-Z0-9\-\._]+) / "@" / ' ' / "\t" ) {
       def to_s
-        case text_value
-        when /\.$/
-          text_value
-        when "@", /\s/
-          text_value
-        else
-          text_value + '.@'
-        end
+        text_value
+      end
+    }
+  end
+
+  rule fingerprint
+    [a-fA-Z0-9:]+ {
+      def to_s
+        text_value.strip
       end
     }
   end

data/lib/dns/zonefile/version.rb

@@ -1,5 +1,5 @@
 module DNS
   module Zonefile
-    VERSION = "1.1.2"
+    VERSION = "1.1.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dns-zonefile
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Craig R Webster
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -96,7 +96,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - Dockerfile
 - Gemfile
 - LICENCE
@@ -105,6 +104,7 @@ files:
 - TODO
 - bin/console
 - bin/setup
+- circle.yml
 - dns-zonefile.gemspec
 - doc/example.com.zone
 - doc/example2.com.zone
@@ -114,7 +114,7 @@ files:
 - lib/dns/zonefile.rb
 - lib/dns/zonefile.treetop
 - lib/dns/zonefile/version.rb
-homepage: http://barkingiguana.com/
+homepage: https://github.com/craigw/dns-zonefile
 licenses: []
 metadata:
   allowed_push_host: https://rubygems.org

data/.travis.yml

@@ -1,4 +0,0 @@
-language: ruby
-rvm:
-  - 2.2.4
-before_install: gem install bundler -v 1.11.2