dnsruby 1.60.0 → 1.60.1

data/lib/dnsruby/resource/MX.rb

@@ -38,6 +38,9 @@ module Dnsruby
       def from_string(input) #:nodoc: all
         if (input.length > 0)
           names = input.split(" ")
+          if(names.size != 2)
+            raise DecodeError.new("MX record expects preference and domain")
+          end
           @preference = names[0].to_i
           @exchange = Name.create(names[1])
         end

data/lib/dnsruby/resource/OPT.rb

@@ -148,7 +148,7 @@ module Dnsruby
       def options(args)
         if (args==nil)
           return @options
-        elsif args.kind_of?Fixnum
+        elsif args.kind_of?(Integer)
           #  return list of options with that code
           ret = []
           @options.each do |option|

data/lib/dnsruby/resource/RRSIG.rb

@@ -181,7 +181,7 @@ module Dnsruby
       end
 
       def RRSIG.get_time(input)
-        if (input.kind_of?Fixnum)
+        if input.kind_of?(Integer)
           return input
         end
         #  RFC 4034, section 3.2

data/lib/dnsruby/resource/TLSA.rb

@@ -0,0 +1,149 @@
+require 'openssl'
+
+module Dnsruby
+  class RR
+    module IN
+      # Class for DNS TLSA server certificate or public key (TLSA) resource records.
+      #
+      # RFC 6698
+      class TLSA < RR
+        ClassHash[[TypeValue = Types::TLSA, ClassValue = ClassValue]] = self #:nodoc: all
+        # sec 2.1.1 ,7,2
+        #
+        # 0 CA constraint
+        # 1 Service certificate constraint
+        # 2 Trust anchor assertion
+        # 3 Domain-issued certificate
+        # 4-254 Unassigned
+        # 255 Private use
+        attr_accessor :usage
+        # sec 2.1.2, 7.3
+        #
+        # 0 Full certificate
+        # 1 SubjectPublicKeyInfo
+        # 2-254 Unassigned
+        # 255 Private use
+        attr_accessor :selector
+        # sec 2.3.1
+        #
+        # 0 Exact match on selected content
+        # 1 SHA-256 hash of selected content
+        # 2 SHA-512 hash of selected content
+        # 3-254 Unassigned
+        # 255 Private use
+        attr_accessor :matching_type
+        # sec 2.1.4
+        attr_accessor :data
+        attr_accessor :databin
+
+        def verify
+          raise ArgumentError, "usage with invalid value: #{@usage}" if @usage < 0 || @usage > 255
+          raise ArgumentError, "selector with invalid value: #{@selector}" if @selector < 0 || @selector > 255
+          raise ArgumentError, "matching_type with invalid value: #{@matching_type}" if @matching_type < 0 || @matching_type > 255
+          raise ArgumentError, "data with invalid value: #{@data}" if (@matching_type == 1 && @databin.bytesize != 32) || (@matching_type == 2 && @databin.bytesize != 64)
+          pkey if @matching_type == 0
+        end
+
+        def from_data(data) #:nodoc: all
+          self.usage = data[0]
+          self.selector = data[1]
+          self.matching_type = data[2]
+          self.databin = data[3]
+          verify
+        end
+
+        # Create the RR from a hash
+        def from_hash(hash)
+          super(hash)
+          verify
+        end
+
+        def data=(data)
+          self.databin = parse_string(data)
+        end
+
+        def databin=(databin)
+          @databin = databin
+          @data = @databin.unpack('H*')[0].each_char.each_slice(57).map(&:join).join(' ')
+        end
+
+        def cert
+          if @matching_type == 0 && @selector == 0 && @databin
+            begin
+              cert = OpenSSL::X509::Certificate.new(@databin)
+            rescue => e
+              raise ArgumentError, 'data is invalid cert '
+            end
+          end
+          cert
+        end
+
+        def pkey
+          pubkey = nil
+          if @matching_type == 0 && @databin
+            if @selector == 0
+              cert = self.cert
+              pubkey = cert.public_key
+            elsif @selector == 1
+              begin
+                pubkey = OpenSSL::PKey.read(@databin)
+              rescue
+                raise ArgumentError, 'data is invalid pkey'
+              end
+            end
+          end
+          pubkey
+        end
+
+        def parse_string(data)
+          buf = ''
+          comment = false
+          multiline = false
+          data.each_char do |ch|
+            case ch
+            when ';' then comment = true
+            when '\n'
+              raise ArgumentError, 'string format error' unless multiline
+              comment = false
+            when '\r' then next
+            when ' ' then next
+            when comment then next
+            when '(' then multiline = true
+            when ')' then multiline = false
+            else
+              buf += ch
+            end
+          end
+          raise ArgumentError, 'string format error' if multiline
+
+          [buf].pack('H*')
+        end
+
+        #  Create the RR from a standard string
+        def from_string(input)
+          values = input.split(' ', 4)
+          self.usage = values[0].to_i
+          self.selector = values[1].to_i
+          self.matching_type = values[2].to_i
+          self.data = values[3]
+          verify
+        end
+
+        def rdata_to_string
+          "#{@usage} #{@selector} #{@matching_type} #{@data}"
+        end
+
+        def encode_rdata(msg, _canonical = false) #:nodoc: all
+          msg.put_pack('CCC', @usage, @selector, @matching_type)
+          msg.put_bytes(@databin)
+        end
+
+        def self.decode_rdata(msg) #:nodoc: all
+          usage, selector, matching_type = msg.get_unpack('CCC')
+          databin = msg.get_bytes
+          new([usage, selector, matching_type, databin])
+        end
+      end
+    end
+  end
+end

data/lib/dnsruby/resource/domain_name.rb

@@ -51,7 +51,7 @@ module Dnsruby
       def self.decode_rdata(msg) #:nodoc: all
         n = msg.get_name
         if n.length == 0
-          n = nil
+          # n = nil
         end
         self.new(n)
       end

data/lib/dnsruby/resource/generic.rb

@@ -165,3 +165,4 @@ require 'dnsruby/resource/KX'
 require 'dnsruby/resource/DHCID'
 require 'dnsruby/resource/GPOS'
 require 'dnsruby/resource/NXT'
+require 'dnsruby/resource/CAA'

data/lib/dnsruby/version.rb

@@ -1,3 +1,3 @@
 module Dnsruby
-  VERSION = '1.60.0'
+  VERSION = '1.60.1'
 end

data/lib/dnsruby/zone_transfer.rb

@@ -27,6 +27,8 @@ module Dnsruby
     attr_accessor :port
     #  If using IXFR, this is the SOA serial number to start the incrementals from
     attr_accessor :serial
+    #  The source address to connect to
+    attr_accessor :src_address
     #  The TSIG record used to sign the transfer
     attr_reader :tsig
     #  Returns the tsigstate of the last transfer (nil if no TSIG signed transfer has occurred)
@@ -51,6 +53,7 @@ module Dnsruby
       @serial=0
       @tsig = nil
       @axfr = nil
+      @src_address = nil
     end
 
     #  Perform a zone transfer (RFC1995)
@@ -104,7 +107,7 @@ module Dnsruby
     def do_transfer(zone, server) #:nodoc: all
       @transfer_type = Types.new(@transfer_type)
       @state = :InitialSoa
-      socket = TCPSocket.new(server, @port)
+      socket = TCPSocket.new(server, @port, @src_address)
       begin
         #  Send an initial query
         msg = Message.new(zone, @transfer_type, @klass)
@@ -375,4 +378,4 @@ module Dnsruby
       return msg
     end
   end
-end
+end

data/test/run-tests-individually

@@ -0,0 +1,347 @@
+#!/usr/bin/env ruby
+
+# Runs each test individually in its own Ruby VM,
+# shows output from those that failed, and outputs separate lists
+# of the tests that succeeded and those that failed.
+
+# Suggest you use tee to display while running but save results to a file, e.g.:
+# test/run-tests-individually | tee run-tests-individually.out.txt
+
+test_files = Dir[File.join(File.dirname(__FILE__), 'tc_*.rb')]
+
+def run_file(filespec)
+  output = `ruby #{filespec} 2>&1`
+  return_code = $?
+  if return_code == 0
+    puts "Ok:     Test #{filespec} completed successfully"
+    true
+  else
+    puts "Failed: Test #{filespec} failed with the following errors:\n#{output}"
+    false
+  end
+end
+
+
+successes, failures = test_files.partition { |filespec| run_file(filespec) }
+
+puts "Successes:\n\n"; puts successes; puts "\n\n"
+puts "Failures:\n\n";  puts failures
+
+
+=begin
+Sample output:
+Ok:     Test test/tc_axfr.rb completed successfully
+Ok:     Test test/tc_cache.rb completed successfully
+Failed: Test test/tc_dlv.rb failed with the following errors:
+Run options: --seed 19558
+
+# Running:
+
+
+TestDlv | R
+        | 0.00 s
+Slowest tests:
+2.04 s	TestDlv#test_dlv
+Slowest suites:
+2.04 s	TestDlv
+
+
+Finished in 2.040666s, 0.4900 runs/s, 0.4900 assertions/s.
+
+  1) Error:
+TestDlv#test_dlv:
+ArgumentError: Can't make sense of nameserver : ns2.nic.se, exception : Dnsruby::NXDomain
+    /Users/kbennett/work/dnsruby/lib/dnsruby/config.rb:293:in `rescue in rescue in rescue in resolve_server'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/config.rb:256:in `rescue in rescue in resolve_server'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/config.rb:252:in `rescue in resolve_server'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/config.rb:248:in `resolve_server'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/packet_sender.rb:230:in `initialize'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/resolver.rb:569:in `new'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/resolver.rb:569:in `add_server'
+    test/tc_dlv.rb:42:in `test_dlv'
+
+1 runs, 1 assertions, 0 failures, 1 errors, 0 skips
+Ok:     Test test/tc_dns.rb completed successfully
+Ok:     Test test/tc_dnskey.rb completed successfully
+Ok:     Test test/tc_ds.rb completed successfully
+Ok:     Test test/tc_escapedchars.rb completed successfully
+Ok:     Test test/tc_gpos.rb completed successfully
+Ok:     Test test/tc_hash.rb completed successfully
+Ok:     Test test/tc_header.rb completed successfully
+Ok:     Test test/tc_hip.rb completed successfully
+Ok:     Test test/tc_hs.rb completed successfully
+Ok:     Test test/tc_ipseckey.rb completed successfully
+Ok:     Test test/tc_message.rb completed successfully
+Ok:     Test test/tc_misc.rb completed successfully
+Ok:     Test test/tc_name.rb completed successfully
+Ok:     Test test/tc_naptr.rb completed successfully
+Ok:     Test test/tc_nsec.rb completed successfully
+Ok:     Test test/tc_nsec3.rb completed successfully
+Ok:     Test test/tc_nsec3param.rb completed successfully
+Ok:     Test test/tc_nxt.rb completed successfully
+Ok:     Test test/tc_packet.rb completed successfully
+Ok:     Test test/tc_packet_unique_push.rb completed successfully
+Ok:     Test test/tc_ptrin.rb completed successfully
+Ok:     Test test/tc_question.rb completed successfully
+Ok:     Test test/tc_queue.rb completed successfully
+Ok:     Test test/tc_recur.rb completed successfully
+Ok:     Test test/tc_res_config.rb completed successfully
+Failed: Test test/tc_res_env.rb failed with the following errors:
+Run options: --seed 61787
+
+# Running:
+
+
+TestResolverEnv | F
+                | 0.00 s
+Slowest tests:
+0.00 s	TestResolverEnv#test_res_env
+Slowest suites:
+0.00 s	TestResolverEnv
+
+
+Finished in 0.002247s, 445.0378 runs/s, 1335.1135 assertions/s.
+
+  1) Failure:
+TestResolverEnv#test_res_env [test/tc_res_env.rb:38]:
+Nameserver set correctly.
+Expected: "10.128.128.128"
+  Actual: "10.0.1.128"
+
+1 runs, 3 assertions, 1 failures, 0 errors, 0 skips
+Ok:     Test test/tc_res_file.rb completed successfully
+Ok:     Test test/tc_res_opt.rb completed successfully
+Ok:     Test test/tc_resolv.rb completed successfully
+Ok:     Test test/tc_resolver.rb completed successfully
+Ok:     Test test/tc_rr-opt.rb completed successfully
+Ok:     Test test/tc_rr-txt.rb completed successfully
+Ok:     Test test/tc_rr-unknown.rb completed successfully
+Ok:     Test test/tc_rr.rb completed successfully
+Ok:     Test test/tc_rrset.rb completed successfully
+Ok:     Test test/tc_rrsig.rb completed successfully
+Ok:     Test test/tc_single_resolver.rb completed successfully
+Failed: Test test/tc_soak.rb failed with the following errors:
+Run options: --seed 6029
+
+# Running:
+
+
+TestSingleResolverSoak | RRRRRRRRtest/tc_soak.rb:283:in `create_default_single_resolver': uninitialized constant TestSingleResolverSoak::SingleResolver (NameError)
+Did you mean?  SingleForwardable
+	from test/tc_soak.rb:243:in `block (2 levels) in test_many_threads_on_many_single_resolvers'
+Ok:     Test test/tc_soak_base.rb completed successfully
+Ok:     Test test/tc_sshfp.rb completed successfully
+Ok:     Test test/tc_tcp.rb completed successfully
+Ok:     Test test/tc_tcp_pipelining.rb completed successfully
+Ok:     Test test/tc_tkey.rb completed successfully
+Failed: Test test/tc_tsig.rb failed with the following errors:
+Run options: --seed 20864
+
+# Running:
+
+
+TestTSig | R..R
+         | 11.87 s
+Slowest tests:
+11.87 s	TestTSig#test_signed_update
+10.74 s	TestTSig#test_signed_zone_transfer
+0.00 s	TestTSig#test_bad_tsig
+0.00 s	TestTSig#test_message_signing
+Slowest suites:
+22.62 s	TestTSig
+
+
+Finished in 22.616872s, 0.1769 runs/s, 0.3095 assertions/s.
+
+  1) Error:
+TestTSig#test_signed_zone_transfer:
+ArgumentError: Can't make sense of nameserver : ns0.validation-test-servers.nominet.org.uk, exception : undefined method `answer' for nil:NilClass
+    /Users/kbennett/work/dnsruby/lib/dnsruby/config.rb:293:in `rescue in rescue in rescue in resolve_server'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/config.rb:256:in `rescue in rescue in resolve_server'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/config.rb:252:in `rescue in resolve_server'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/config.rb:248:in `resolve_server'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/zone_transfer.rb:94:in `block in transfer'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/zone_transfer.rb:92:in `each'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/zone_transfer.rb:92:in `transfer'
+    test/tc_tsig.rb:189:in `axfr'
+    test/tc_tsig.rb:180:in `test_signed_zone_transfer'
+
+
+  2) Error:
+TestTSig#test_signed_update:
+ArgumentError: Can't make sense of nameserver : , exception : Nameserver invalid!
+    /Users/kbennett/work/dnsruby/lib/dnsruby/config.rb:293:in `rescue in rescue in rescue in resolve_server'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/config.rb:256:in `rescue in rescue in resolve_server'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/config.rb:252:in `rescue in resolve_server'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/config.rb:248:in `resolve_server'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/packet_sender.rb:230:in `initialize'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/resolver.rb:488:in `new'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/resolver.rb:488:in `block (2 levels) in add_config_nameservers'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/resolver.rb:487:in `each'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/resolver.rb:487:in `block in add_config_nameservers'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/resolver.rb:485:in `synchronize'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/resolver.rb:485:in `add_config_nameservers'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/resolver.rb:514:in `set_config_nameserver'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/resolver.rb:469:in `initialize'
+    test/tc_tsig.rb:69:in `new'
+    test/tc_tsig.rb:69:in `run_test_client_signs'
+    test/tc_tsig.rb:31:in `test_signed_update'
+
+4 runs, 7 assertions, 0 failures, 2 errors, 0 skips
+Ok:     Test test/tc_update.rb completed successfully
+Failed: Test test/tc_validator.rb failed with the following errors:
+Run options: --seed 12765
+
+# Running:
+
+Test EventType API!
+
+TestValidator | .RRTest validation configuration options!
+.
+              | 10.05 s
+Slowest tests:
+5.05 s	TestValidator#test_validation
+5.01 s	TestValidator#test_resolver_cd_validation_fails
+0.00 s	TestValidator#test_eventtype_api
+0.00 s	TestValidator#test_config_api
+Slowest suites:
+10.05 s	TestValidator
+
+
+Finished in 10.054978s, 0.3978 runs/s, 0.0000 assertions/s.
+
+  1) Error:
+TestValidator#test_resolver_cd_validation_fails:
+Dnsruby::ResolvTimeout: Query timed out
+    /Users/kbennett/work/dnsruby/lib/dnsruby/resolver.rb:257:in `send_message'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/resolver.rb:203:in `query'
+    test/tc_validator.rb:52:in `test_resolver_cd_validation_fails'
+
+
+  2) Error:
+TestValidator#test_validation:
+Dnsruby::ResolvTimeout: Query timed out
+    /Users/kbennett/work/dnsruby/lib/dnsruby/resolver.rb:257:in `send_message'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/resolver.rb:203:in `query'
+    test/tc_validator.rb:40:in `test_validation'
+
+4 runs, 0 assertions, 0 failures, 2 errors, 0 skips
+Failed: Test test/tc_verifier.rb failed with the following errors:
+Run options: --seed 23316
+
+# Running:
+
+
+VerifierTest | .R.R....RF.
+             | 14.37 s
+Slowest tests:
+5.40 s	VerifierTest#test_tcp
+5.01 s	VerifierTest#test_trusted_key
+2.01 s	VerifierTest#test_expired_keys
+1.54 s	VerifierTest#test_verify_message_fails
+1.21 s	VerifierTest#test_dsa
+0.41 s	VerifierTest#test_sendraw
+Slowest suites:
+15.91 s	VerifierTest
+
+
+Finished in 15.914313s, 0.6912 runs/s, 0.3770 assertions/s.
+
+  1) Error:
+VerifierTest#test_tcp:
+Dnsruby::ResolvTimeout: Query timed out
+    /Users/kbennett/work/dnsruby/lib/dnsruby/resolver.rb:257:in `send_message'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/resolver.rb:203:in `query'
+    test/tc_verifier.rb:183:in `test_tcp'
+
+
+  2) Error:
+VerifierTest#test_trusted_key:
+Dnsruby::ResolvTimeout: Query timed out
+    /Users/kbennett/work/dnsruby/lib/dnsruby/resolver.rb:257:in `send_message'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/resolver.rb:203:in `query'
+    test/tc_verifier.rb:125:in `test_trusted_key'
+
+
+  3) Error:
+VerifierTest#test_verify_message:
+Dnsruby::VerifyError: Failed to verify DNSKEY RRSet
+    /Users/kbennett/work/dnsruby/lib/dnsruby/single_verifier.rb:277:in `block (2 levels) in verify'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/single_verifier.rb:275:in `each'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/single_verifier.rb:275:in `block in verify'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/message/message.rb:345:in `block in each_section'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/message/message.rb:345:in `each'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/message/message.rb:345:in `each_section'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/single_verifier.rb:261:in `verify'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/dnssec.rb:293:in `rescue in rescue in verify'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/dnssec.rb:290:in `rescue in verify'
+    /Users/kbennett/work/dnsruby/lib/dnsruby/dnssec.rb:287:in `verify'
+    test/tc_verifier.rb:98:in `test_verify_message'
+
+
+  4) Failure:
+VerifierTest#test_dsa [test/tc_verifier.rb:229]:
+Expected nil to be truthy.
+
+11 runs, 6 assertions, 1 failures, 3 errors, 0 skips
+Ok:     Test test/tc_zone_reader.rb completed successfully
+Successes:
+
+test/tc_axfr.rb
+test/tc_cache.rb
+test/tc_dns.rb
+test/tc_dnskey.rb
+test/tc_ds.rb
+test/tc_escapedchars.rb
+test/tc_gpos.rb
+test/tc_hash.rb
+test/tc_header.rb
+test/tc_hip.rb
+test/tc_hs.rb
+test/tc_ipseckey.rb
+test/tc_message.rb
+test/tc_misc.rb
+test/tc_name.rb
+test/tc_naptr.rb
+test/tc_nsec.rb
+test/tc_nsec3.rb
+test/tc_nsec3param.rb
+test/tc_nxt.rb
+test/tc_packet.rb
+test/tc_packet_unique_push.rb
+test/tc_ptrin.rb
+test/tc_question.rb
+test/tc_queue.rb
+test/tc_recur.rb
+test/tc_res_config.rb
+test/tc_res_file.rb
+test/tc_res_opt.rb
+test/tc_resolv.rb
+test/tc_resolver.rb
+test/tc_rr-opt.rb
+test/tc_rr-txt.rb
+test/tc_rr-unknown.rb
+test/tc_rr.rb
+test/tc_rrset.rb
+test/tc_rrsig.rb
+test/tc_single_resolver.rb
+test/tc_soak_base.rb
+test/tc_sshfp.rb
+test/tc_tcp.rb
+test/tc_tcp_pipelining.rb
+test/tc_tkey.rb
+test/tc_update.rb
+test/tc_zone_reader.rb
+
+
+Failures:
+
+test/tc_dlv.rb
+test/tc_res_env.rb
+test/tc_soak.rb
+test/tc_tsig.rb
+test/tc_validator.rb
+test/tc_verifier.rb
+
+=end
+