zonefile 1.04 → 1.06

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 23d7b96f880fc4a87ae278280123e1425b68aa81
+  data.tar.gz: 35387ada562d7ae8cee0dbae606788fbc0862240
+SHA512:
+  metadata.gz: 352fab59555103484bb27a8594d5fefa49aa12c3d46f53256d846deebd2699db7122661184409e116ee692b76dad9d20428a11a4f6f0c80bba596aec3e8b214b
+  data.tar.gz: fa666a85d05633a00cf5ee589919b6ed0ec26f5192ba2bd45ca6a9414e96dc3b8c90b53def3278e2f43f8f0898e6289054bd124d22ddde189279fdce0ed9d27c

data/CHANGELOG

@@ -2,3 +2,4 @@
 1.01 - Fixes
 1.02 - Fixes
 1.03 - Fixes TXT records, quotes are not treated anymore
+1.05 - Adds support for TLSA records

data/lib/zonefile/zonefile.rb

@@ -40,8 +40,12 @@
 #    - :name, :ttl, :class, :algorithm, :flags, :iterations, :salt, :next, :types
 # * NSEC3PARAM
 #    - :name, :ttl, :class, :algorithm, :flags, :iterations, :salt
+# * TLSA
+#    - :name, :ttl, :class, :certificate_usage, :selector, :matching_type, :data
 # * NAPTR
 #    - :name, :ttl, :class, :order, :preference, :flags, :service, :regexp, :replacement
+# * SPF
+#    - :name, :ttl, :class, :text
 #
 # == Examples
 #
@@ -98,7 +102,7 @@
 
 class Zonefile
 
- RECORDS = %w{ mx a a4 ns cname txt ptr srv soa ds dnskey rrsig nsec nsec3 nsec3param naptr }
+ RECORDS = %w{ mx a a4 ns cname txt ptr srv soa ds dnskey rrsig nsec nsec3 nsec3param tlsa naptr spf }
  attr :records
  attr :soa
  attr :data
@@ -310,6 +314,16 @@ class Zonefile
       add_record( 'rrsig', :name => $1, :ttl => $2, :class => $3, :type_covered => $4, :algorithm => $5,
                   :labels => $6.to_i, :original_ttl => $7.to_i, :expiration => $8.to_i, :inception => $9.to_i,
                   :key_tag => $10.to_i, :signer => $11, :signature => $12.gsub( /\s/,'')  )
+    elsif line=~/^(#{valid_name}) \s*
+                #{ttl_cls}
+                TLSA \s
+                (\d+) \s
+                (\d+) \s
+                (\d+) \s
+                #{base64}
+                /ix
+      add_record( 'tlsa', :name => $1, :ttl => $2, :class => $3, :certificate_usage => $4.to_i,
+                  :selector => $5.to_i, :matching_type => $6.to_i, :data => $7 )
     elsif line=~/^(#{valid_name})? \s*
                 #{ttl_cls}
                 NAPTR \s
@@ -353,6 +367,8 @@ class Zonefile
             add_record('ptr', :name => $1, :class => $3, :ttl => $2, :host => $4)
     elsif line =~ /^(#{valid_name})? \s* #{ttl_cls} TXT \s+ (.*)$/ix
              add_record('txt', :name => $1, :ttl => $2, :class => $3, :text => $4.strip)
+    elsif line =~ /^(#{valid_name})? \s* #{ttl_cls} SPF \s+ (.*)$/ix
+             add_record('spf', :name => $1, :ttl => $2, :class => $3, :text => $4.strip)
     elsif line =~ /\$TTL\s+(#{rr_ttl})/i 
             @ttl = $1
     end
@@ -383,9 +399,8 @@ class Zonefile
 
 #{@origin ? "$ORIGIN #{@origin}" : ''}
 #{@ttl ? "$TTL #{@ttl}" : ''}
-				
-; Zone NS Records
 ENDH
+   out << "\n; Zone NS Records\n" unless self.ns.empty?
    self.ns.each do |ns|
      out <<  "#{ns[:name]}	#{ns[:ttl]}	#{ns[:class]}	NS	#{ns[:host]}\n"
    end
@@ -414,6 +429,11 @@ ENDH
      out << "#{tx[:name]}	#{tx[:ttl]}	#{tx[:class]}	TXT	#{tx[:text]}\n"
    end
 
+   out << "\n; Zone SPF Records\n" unless self.spf.empty?
+   self.spf.each do |spf|
+     out << "#{spf[:name]} #{spf[:ttl]} #{spf[:class]} SPF #{spf[:text]}\n"
+   end
+
    out << "\n; Zone SRV Records\n" unless self.srv.empty?
    self.srv.each do |srv|
      out << "#{srv[:name]}	#{srv[:ttl]}	#{srv[:class]}	SRV	#{srv[:pri]} #{srv[:weight]} #{srv[:port]}	#{srv[:host]}\n"
@@ -454,6 +474,11 @@ ENDH
      out << "#{rrsig[:name]} #{rrsig[:ttl]} #{rrsig[:class]} RRSIG #{rrsig[:type_covered]} #{rrsig[:algorithm]} #{rrsig[:labels]} #{rrsig[:original_ttl]} #{rrsig[:expiration]} #{rrsig[:inception]} #{rrsig[:key_tag]} #{rrsig[:signer]} #{rrsig[:signature]}\n"
    end
 
+   out << "\n; Zone TLSA Records\n" unless self.tlsa.empty?
+   self.tlsa.each do |tlsa|
+     out << "#{tlsa[:name]} #{tlsa[:ttl]} #{tlsa[:class]} TLSA #{tlsa[:certificate_usage]} #{tlsa[:selector]} #{tlsa[:matching_type]} #{tlsa[:data]}\n"
+   end
+
    out << "\n; Zone NAPTR Records\n" unless self.ds.empty?
    self.naptr.each do |naptr|
      out << "#{naptr[:name]} #{naptr[:ttl]} #{naptr[:class]} NAPTR #{naptr[:order]} #{naptr[:preference]} #{naptr[:flags]} #{naptr[:service]} #{naptr[:regexp]} #{naptr[:replacement]}\n"

data/tests/test-zone.db

@@ -15,6 +15,7 @@ $ORIGIN	 test-zone.db
 
 @                       IN	A	127.0.0.1
 @                       IN	MX	10	mail
+@                       IN  SPF "v=spf1 mx ~all"
 ftp                     IN	CNAME	www
 localhost               IN	A	127.0.0.1
 mail                    IN	A	127.0.0.1
@@ -24,11 +25,13 @@ www                     IN	A	127.0.0.1
                         IN      MX      10      10.0.0.4
                                 A       10.0.0.5
                                 TXT     "web;server"
+                                SPF     "v=spf1 -all"
 foo                     IN      A       10.0.0.6
 mini                            A       10.0.0.7
 icarus                  IN      AAAA    fe80::0260:83ff:fe7c:3a2a
 soup                    IN      TXT     "This is a text message"
 txta                            TXT     "t=y; o=-" 	; Nasty Comment
+elsewhere               IN      SPF     "v=spf1 mx ?all"
 _kerberos           IN  TXT     maxnet.ao
 _sip._tcp.example.com. 86400 IN SRV 0 5 5060 sipserver.example.com.
 12.23.21.23.in-addr.arpa	IN 	PTR	www.myhost.example.com.
@@ -54,4 +57,9 @@ alfa.example.com. 86400 IN NSEC host.example.com. (
                                    A MX RRSIG NSEC TYPE1234 )
                         IN NSEC3   1 1 12 aabbccdd ( 2vptu5timamqttgl4luu7kg2leoaor3s A RRSIG )
                         IN NSEC3PARAM 1 0 12 aabbccdd
+_443._tcp.www.example.com. 86400 IN TLSA (
+                                    1 1 2 92003ba34942dc74152e2f2c408d29ec
+                                          a5a520e7f2e06bb944f4dca346baf63c
+                                          1b177615d466f6c4b71c216a50292bd5
+                                          8c9ebdd2f74e38fe51ffd48c43326cbc )
 urn.example.com.        IN NAPTR 100  50  "s"    "http+N2L+N2C+N2R"  ""   www.example.com.

data/tests/zonefile.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'minitest/autorun'
 
 
 $: << File.expand_path(File.dirname(__FILE__) + '/../lib')
@@ -9,7 +9,7 @@ require 'zonefile'
 
 $zonefile = ARGV[0] || 'test-zone.db'
 
-class TC_Zonefile  < Test::Unit::TestCase
+class TC_Zonefile  < Minitest::Unit::TestCase
 
   def setup
     @zf = Zonefile.from_file(File.dirname(__FILE__) + '/'+$zonefile, 'test-origin')
@@ -32,7 +32,7 @@ class TC_Zonefile  < Test::Unit::TestCase
     assert_equal 2, @zf.ptr.size    
     assert @zf.ptr[0][:host] == data[0][:host]
     assert @zf.ptr[1][:name] == data[1][:name]
-    assert_raise(NoMethodError) do
+    assert_raises(NoMethodError) do
         @zf.dont_exist(123,123,123)
     end
   end
@@ -132,6 +132,26 @@ class TC_Zonefile  < Test::Unit::TestCase
     end unless @swap_txt
   end
   
+  def test_spf
+    assert_equal '"v=spf1 mx ~all"', @zf.spf[0][:text]
+    assert_equal "IN", @zf.spf[0][:class]
+    assert_equal "@", @zf.spf[0][:name]
+    assert_equal '"v=spf1 -all"', @zf.spf[1][:text]
+    assert_equal 'www', @zf.spf[1][:name]
+    assert_nil @zf.spf[1][:class]
+    assert_equal "elsewhere", @zf.spf[2][:name]
+    assert_equal '"v=spf1 mx ?all"', @zf.spf[2][:text]
+
+    assert_equal 3, @zf.spf.size
+
+    begin
+      @swap_txt = true
+      swap
+      test_txt
+    end unless @swap_txt
+  end
+
+
   def test_a4
     assert_equal 'icarus', @zf.a4[0][:name]
     assert_equal 'IN', @zf.a4[0][:class]
@@ -302,6 +322,28 @@ SIGNATURE
     end unless @swap_rrsig
   end
 
+  def test_tlsa
+    assert_equal "_443._tcp.www.example.com.", @zf.tlsa[0][:name]
+    assert_equal '86400', @zf.srv[0][:ttl]
+    assert_equal 1, @zf.tlsa[0][:certificate_usage]
+    assert_equal 1, @zf.tlsa[0][:selector]
+    assert_equal 2, @zf.tlsa[0][:matching_type]
+
+    sig = <<SIGNATURE.gsub( /\s+/,'').strip
+        92003ba34942dc74152e2f2c408d29ec
+        a5a520e7f2e06bb944f4dca346baf63c
+        1b177615d466f6c4b71c216a50292bd5
+        8c9ebdd2f74e38fe51ffd48c43326cbc
+SIGNATURE
+    assert_equal sig, @zf.tlsa[0][:data].gsub( /\s+/,'')
+    
+    begin 
+      @swap_tlsa= true
+      swap
+      test_tlsa
+    end unless @swap_tlsa
+  end
+
   def test_origin
      assert_equal 'test-zone.db', @zf.origin
      swap

metadata

@@ -1,71 +1,50 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: zonefile
-version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
-  segments: 
-  - 1
-  - 4
-  version: "1.04"
+version: !ruby/object:Gem::Version
+  version: '1.06'
 platform: ruby
-authors: 
+authors:
 - Martin Boese
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-06 00:00:00 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies: []
-
-description: |-
-  A library that can create, read, write, modify BIND compatible Zonefiles (RFC1035).
-  Warning: It probably works for most cases, but it might not be able to read all files 
-  even if they are valid for bind.
+description: "A library that can create, read, write, modify BIND compatible Zonefiles
+  (RFC1035).\nWarning: It probably works for most cases, but it might not be able
+  to read all files \neven if they are valid for bind."
 email: martin@internet.ao
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/zonefile/zonefile.rb
+files:
+- CHANGELOG
 - lib/zonefile.rb
+- lib/zonefile/zonefile.rb
 - tests/test-zone.db
 - tests/zonefile.rb
-- CHANGELOG
 homepage: http://zonefile.rubyforge.org/
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: zonefile
-rubygems_version: 1.8.24
+rubygems_version: 2.4.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: BIND 8/9 Zonefile Reader and Writer
 test_files: []
-