dnsruby 1.60.2 → 1.61.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 286d5426865cf680082a434f91ceb9004ef616ca
-  data.tar.gz: b6dfef1f6420e1246c074c86de4ddac5260ba02a
+  metadata.gz: 809b0ba42057c7e1dbec1239f295b2766b345c08
+  data.tar.gz: fdcd08cf292f773ac6e1423acdbee6d810ffd1c5
 SHA512:
-  metadata.gz: d447b1b997edfad80524e859f7088143e6b48dc3da6fdbf942777ff8d1f8ad40d09944b8679965ea1623804ecc92c54814d271d7faec73e858a5836d14196173
-  data.tar.gz: 5f4c06324994a7c07b2257cfaef48b2f482305189fad014a846cf88ccd91988e480949c3279f824e401724a1be7fd83d8427fc766a2b486f898c04430bcdab51
+  metadata.gz: ec0a38bb9fb0c517736727579606fa82bf04d03b81a918a19e1f660da746e6333c136f7fd9bb51f804d84d4132a6f9ea73a7dab7e3b2235b3c0aa4562efe4fa4
+  data.tar.gz: 2445c9aa9154a253a9c32c300d11b4166eaa2366be18dc8d6732f6ac3b4df5a5e64afa724ca59155ab8b425023239ac86ab309042b19b6d84d0cdd4a4508bdd1

data/.travis.yml

@@ -2,13 +2,13 @@ language: ruby
 cache: bundler
 sudo: false
 
+before_install: gem install bundler
+
 script: "bundle exec rake test"
 
 rvm:
   - 2.0.0
-  - 2.1.4
+  - 2.4.1
   - 2.3.0
-#  - rbx-2
-  - ruby-head
-#  - jruby-head
-#  - ree
+  - 2.5.1
+

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem "addressable", "~> 2.5"

data/README.md

@@ -1,6 +1,8 @@
 [![Build Status](https://travis-ci.org/alexdalitz/dnsruby.svg?branch=master)](https://travis-ci.org/alexdalitz/dnsruby)
 [![Coverage Status](https://img.shields.io/coveralls/alexdalitz/dnsruby.svg)](https://coveralls.io/r/alexdalitz/dnsruby?branch=master)
 
+<img src="http://caerkettontech.com/dnsruby/DNSRuby-colour-mid.png" width="200" height="200" />
+
 Dnsruby
 =======
 
@@ -16,10 +18,10 @@ queries. It is therefore suitable for high volume DNS applications.
 
 The following is a (non-exhaustive) list of features :
 
-- Implemented RRs :  A, AAAA, AFSDB, ANY, CERT, CNAME, DNAME, GPOS,
-     HINFO, ISDN, LOC, MB, MG, MINFO, MR, MX, NAPTR, NS, NSAP, NXT,
-     OPT, PTR, PX, RP, RT, SOA, SPF, SRV, TKEY, TSIG, TXT, WKS,
-     X25, DNSKEY, RRSIG, NSEC, NSEC3, NSEC3PARAM, DS, DLV
+- Implemented RRs :  A, AAAA, AFSDB, ANY, CAA, CERT, CNAME, DNAME,
+     GPOS, HINFO, ISDN, LOC, MB, MG, MINFO, MR, MX, NAPTR, NS, NSAP,
+     NXT, OPT, PTR, PX, RP, RT, SOA, SPF, SRV, TKEY, TSIG, TXT,
+     WKS, X25, DNSKEY, RRSIG, NSEC, NSEC3, NSEC3PARAM, DS, DLV
 
 - Generic RR types supported (RFC3597)
 

data/RELEASE_NOTES.md

@@ -1,5 +1,25 @@
 # Release Notes
 
+## v1.61.1
+
+* Add Addressable as a gem runtime dependency
+
+## v1.61.0
+
+* Add URI, CDS and CDNSKEY records
+* Supply port to DNS.new as optiona parameter
+* Supply timeout to zone transfer connect
+* Fix multi-line strings
+* Try absolute name as candidate in DNS even if not dot supplied
+* Do not try to generate candidates if no domain is given
+* Handle new OpenSSL interface as well as old
+* Handle new DSA interface
+* fix encode error select thread issue
+* handle encoding errors
+* add punycode support
+* Make sure dnssec is enabled in verifier and also in digroot demo
+* Other minor fixes and changes to test code and infrastructure
+
 ## v1.60.2
 
 * Fix deletion of TXT records with spaces in dynamic updates (thanks Sean Dilda)

data/demo/digroot.rb

@@ -51,7 +51,9 @@ end
 
 inner_resolver = Dnsruby::Resolver.new
 inner_resolver.do_validation = true
+inner_resolver.dnssec = true
 resolver = Dnsruby::Recursor.new(inner_resolver)
+resolver.dnssec = true
 
 #    Dnsruby::TheLog.level=Logger::DEBUG
 

data/dnsruby.gemspec

@@ -40,5 +40,7 @@ DNSSEC NSEC3 support.'
   if RUBY_VERSION >= "1.9.3"
     s.add_development_dependency 'coveralls', '~> 0.7'
   end
+
+  s.add_runtime_dependency 'addressable', '~> 2.5'
 end
 

data/lib/dnsruby/code_mappers.rb

@@ -162,6 +162,8 @@ module Dnsruby
     NSEC3PARAM= 51      # RFC still pending at time of writing
     TLSA      = 52      # RFC 6698
     HIP       = 55      # RFC 5205
+    CDS       = 59      # RFC 7344
+    CDNSKEY   = 60      # RFC 7344
     SPF       = 99      # RFC 4408
     UINFO     = 100     # non-standard
     UID       = 101     # non-standard
@@ -174,6 +176,7 @@ module Dnsruby
     MAILB     = 253     # RFC 1035 (MB, MG, MR)
     MAILA     = 254     # RFC 1035 (obsolete - see MX)
     ANY       = 255     # RFC 1035
+    URI       = 256     # RFC 7553
     CAA       = 257     # RFC 6844
     DLV       = 32769   # RFC 4431 (informational)
     update()

data/lib/dnsruby/config.rb

@@ -101,6 +101,7 @@ module Dnsruby
         dom=""
         nd = 1
         @ndots = 1
+        @port = 53
         @apply_search_list = true
         @apply_domain = true
         config_hash = Config.default_config_hash
@@ -122,6 +123,7 @@ module Dnsruby
         ns = config_hash[:nameserver] if config_hash.include? :nameserver
         s = config_hash[:search] if config_hash.include? :search
         nd = config_hash[:ndots] if config_hash.include? :ndots
+        p = config_hash[:port] if config_hash.include? :port
         @apply_search_list = config_hash[:apply_search_list] if config_hash.include? :apply_search_list
         @apply_domain= config_hash[:apply_domain] if config_hash.include? :apply_domain
         dom = config_hash[:domain] if config_hash.include? :domain
@@ -132,6 +134,7 @@ module Dnsruby
         @configured = true
         send("search=",s)
         send("ndots=",nd)
+        send("port=",p)
         send("domain=",dom)
       }
       Dnsruby.log.info{to_s}
@@ -159,6 +162,15 @@ module Dnsruby
       end
     end
 
+    #  Set port
+    def port=(p)
+      @configured = true
+      @port=p
+      if !@port.kind_of?(Integer)
+        raise ArgumentError.new("invalid port config: #{@port.inspect}")
+      end
+    end
+
     #  Set the default search path
     def search=(s)
       @configured = true
@@ -303,6 +315,7 @@ module Dnsruby
       search = nil
       domain = nil
       ndots = 1
+      port = 53
       open(filename) {|f|
         f.each {|line|
           line.sub!(/[#;].*/, '')
@@ -312,6 +325,8 @@ module Dnsruby
           }
           next unless keyword
           case keyword
+          when 'port'
+            port = args[0].to_i
           when 'nameserver'
             nameserver += args
           when 'domain'
@@ -337,7 +352,7 @@ module Dnsruby
           end
         }
       }
-      return { :nameserver => nameserver, :domain => domain, :search => search, :ndots => ndots }
+      return { :nameserver => nameserver, :domain => domain, :search => search, :ndots => ndots, :port => port }
     end
 
     def inspect #:nodoc: all
@@ -357,6 +372,7 @@ module Dnsruby
       ret += " domain : #{domain_string}, search : "
       search.each {|s| ret += s + ", " }
       ret += " ndots : #{@ndots}"
+      ret += " port : #{@port}"
       return ret
     end
 
@@ -423,18 +439,21 @@ module Dnsruby
       end
     end
 
-    def generate_candidates(name) #:nodoc: all
+    def generate_candidates(name_in) #:nodoc: all
       if !@configured
         parse_config
       end
       candidates = []
-      name = Name.create(name)
+      name = Name.create(name_in)
       if name.absolute?
         candidates = [name]
       else
+        candidates.push(Name.create(name_in.to_s + "."))
         if (@apply_domain)
           if @ndots > name.length - 1
-            candidates.push(Name.create(name.to_a+@domain))
+            if (@domain != nil)
+              candidates.push(Name.create(name.to_a+@domain))
+            end
           end
         end
         if (!@apply_search_list)

data/lib/dnsruby/message/encoder.rb

@@ -18,7 +18,7 @@ class MessageEncoder #:nodoc: all
     begin
       @data << d.pack(template)
     rescue Encoding::CompatibilityError => e
-      raise Dnsruby::OtherResolvError.new("IDN support currently requires punycode string")
+      raise Dnsruby::EncodeError.new("IDN support currently requires punycode string")
     end
   end
 
@@ -36,7 +36,7 @@ class MessageEncoder #:nodoc: all
       self.put_pack("C", d.length)
       @data << d
     rescue Encoding::CompatibilityError => e
-      raise Dnsruby::OtherResolvError.new("IDN support currently requires punycode string")
+      raise Dnsruby::EncodeError.new("IDN support currently requires punycode string")
     end
   end
 

data/lib/dnsruby/message/header.rb

@@ -190,29 +190,29 @@ class Header
     retval = ";; id = #{@id}\n"
 
     if (@opcode == OpCode::Update)
-      retval += ";; qr = #{@qr}    " +\
-        "opcode = #{@opcode.string}    "+\
+      retval += ";; qr = #{@qr}    " \
+        "opcode = #{@opcode.string}    "\
         "rcode = #{@rcode.string}\n"
 
-      retval += ";; zocount = #{@qdcount}  "+\
-        "prcount = #{@ancount}  " +\
-        "upcount = #{@nscount}  "  +\
+      retval += ";; zocount = #{@qdcount}  "\
+        "prcount = #{@ancount}  " \
+        "upcount = #{@nscount}  "  \
         "adcount = #{@arcount}\n"
     else
-      retval += ";; qr = #{@qr}    "  +\
-        "opcode = #{@opcode.string}    " +\
-        "aa = #{@aa}    "  +\
-        "tc = #{@tc}    " +\
+      retval += ";; qr = #{@qr}    "  \
+        "opcode = #{@opcode.string}    " \
+        "aa = #{@aa}    "  \
+        "tc = #{@tc}    " \
         "rd = #{@rd}\n"
 
-      retval += ";; ra = #{@ra}    " +\
-        "ad = #{@ad}    "  +\
-        "cd = #{@cd}    "  +\
+      retval += ";; ra = #{@ra}    " \
+        "ad = #{@ad}    "  \
+        "cd = #{@cd}    "  \
         "rcode  = #{rcode.string}\n"
 
-      retval += ";; qdcount = #{@qdcount}  " +\
-        "ancount = #{@ancount}  " +\
-        "nscount = #{@nscount}  " +\
+      retval += ";; qdcount = #{@qdcount}  " \
+        "ancount = #{@ancount}  " \
+        "nscount = #{@nscount}  " \
         "arcount = #{@arcount}\n"
     end
 

data/lib/dnsruby/name.rb

@@ -26,7 +26,8 @@ module Dnsruby
   # * Name#wild?
   # * Name#subdomain_of?(other)
   # * Name#labels
-  # 
+  #
+  require 'addressable'
   class Name
     include Comparable
     MaxNameLength=255
@@ -52,6 +53,7 @@ module Dnsruby
         if (arg=="")
           return Name.new([],false)
         end
+        arg = punycode(arg)
         return Name.new(split_escaped(arg), /\.\z/ =~ arg ? true : false)
         #         return Name.new(Label.split(arg), /\.\z/ =~ arg ? true : false)
       when Array
@@ -61,6 +63,22 @@ module Dnsruby
       end
     end
 
+    def self.punycode(d)
+        begin
+          c = Addressable::URI.parse("http://" + d.to_s)
+          ret = c.normalized_host.sub("http://", "")
+          if (!d.end_with?".")
+            return ret.chomp(".")
+          end
+          if (!ret.end_with?".")
+            return ret + "."
+          end
+          return ret
+        rescue Exception => e
+          return d
+        end
+    end
+
     def self.split_escaped(arg) #:nodoc: all
       encodedlabels = name2encodedlabels(arg)
       return encodedlabels
@@ -317,7 +335,7 @@ module Dnsruby
       i=0;
 
       while (i < length )
-        c=presentation.unpack("x#{i}C1") [0]
+        c=presentation.unpack("x#{i}C1")[0]
         if (c == 46) # ord('.')
           endstring = presentation[i+1, presentation.length-(i+1)]
           return Label.new(wire),endstring

data/lib/dnsruby/packet_sender.rb

@@ -331,7 +331,14 @@ module Dnsruby
         client_query_id = Time.now + rand(10000) # is this safe?!
       end
 
-      query_packet = make_query_packet(msg, use_tcp)
+      begin
+        query_packet = make_query_packet(msg, use_tcp)
+      rescue EncodeError => err
+        Dnsruby.log.error { "#{err}" }
+        st = SelectThread.instance
+        st.push_exception_to_select(client_query_id, client_queue, err, nil)
+        return
+      end
 
       if (msg.do_caching && (msg.class != Update))
         #  Check the cache!!
@@ -622,6 +629,11 @@ module Dnsruby
           #  Should send error back up to Resolver here, and then NOT QUERY AGAIN!!!
           return sig_value
         end
+        if ((response.header.get_header_rcode == RCode.FORMERR) &&
+            (query.header.arcount == 0))
+          # Raise an error
+          return true
+        end
         #  Should check that question section is same as question that was sent! RFC 5452
         #  If it's not an update...
         if (query.class == Update)

data/lib/dnsruby/recursor.rb

@@ -153,7 +153,7 @@ module Dnsruby
       end
     end
     attr_accessor :nameservers, :callback, :recurse, :ipv6_ok
-    attr_reader :hints
+    attr_reader :hints, :dnssec
     #  The resolver to use for the queries
     attr_accessor :resolver
 
@@ -164,6 +164,11 @@ module Dnsruby
     @@zones_cache = nil
     @@nameservers = nil
 
+    def dnssec=(dnssec_on)
+      @dnssec = dnssec_on
+      @resolver.dnssec = dnssec_on
+    end
+
     def initialize(res = nil)
       if (res)
         @resolver = res
@@ -174,6 +179,7 @@ module Dnsruby
           @resolver = Resolver.new
         end
       end
+      @resolver.dnssec = @dnssec
       @ipv6_ok = false
     end
     # Initialize the hint servers.  Recursive queries need a starting name
@@ -196,6 +202,7 @@ module Dnsruby
       @resolver = resolver
       if (resolver.single_resolvers.length == 0)
         resolver = Resolver.new()
+        resolver.dnssec = @dnssec
       end
       if (hints && hints.length > 0)
         resolver.nameservers=hints
@@ -372,6 +379,7 @@ module Dnsruby
     end
 
     def Recursor.clear_caches(resolver = Resolver.new)
+      resolver.dnssec = @dnssec
       Recursor.set_hints(Hash.new, resolver)
       @@zones_cache = Hash.new # key zone_name, values Hash of servers and AddressCaches
       @@zones_cache["."] = @@hints
@@ -613,6 +621,7 @@ module Dnsruby
         }
       end
       resolver = Resolver.new({:nameserver=>nameservers})
+      resolver.dnssec = @dnssec
       servers = []
       resolver.single_resolvers.each {|s|
         servers.push(s.server)

data/lib/dnsruby/resolver.rb

@@ -891,6 +891,14 @@ module Dnsruby
         return
       end
 
+      begin
+        msg.encode
+      rescue EncodeError => err
+        Dnsruby.log.error { "Can't encode " + msg.to_s + " : #{err}" }
+        client_queue.push([client_query_id, err])
+        return
+      end
+
       tick_needed = false
       #  add to our data structures
       #       @mutex.synchronize{
@@ -1124,6 +1132,9 @@ module Dnsruby
         increment_resolver_priority(resolver) unless response.cached
         stop_querying(client_query_id)
         #  @TODO@ Does the client want notified at this point?
+      elsif error.kind_of?(EncodeError)
+        Dnsruby.log.debug{'Encode error - sending to client'}
+        send_result_and_stop_querying(client_queue, client_query_id, select_queue, response, error)
       else
         #    - if it was any other error, then remove that server from the list for that query
         #    If a Too Many Open Files error, then don't remove, but let retry work.

data/lib/dnsruby/resource/CDNSKEY.rb

@@ -0,0 +1,17 @@
+module Dnsruby
+  class RR
+    # RFC4034, section 2
+    # DNSSEC uses public key cryptography to sign and authenticate DNS
+    # resource record sets (RRsets).  The public keys are stored in DNSKEY
+    # resource records and are used in the DNSSEC authentication process
+    # described in [RFC4035]: A zone signs its authoritative RRsets by
+    # using a private key and stores the corresponding public key in a
+    # DNSKEY RR.  A resolver can then use the public key to validate
+    # signatures covering the RRsets in the zone, and thus to authenticate
+    # them.
+    class CDNSKEY < DNSKEY
+      ClassValue = nil #:nodoc: all
+      TypeValue = Types::CDNSKEY #:nodoc: all
+    end
+  end
+end

data/lib/dnsruby/resource/CDS.rb

@@ -0,0 +1,35 @@
+# --
+# Copyright 2018 Caerketton Tech Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ++
+module Dnsruby
+  class RR
+    # RFC4034, section 4
+    # The DS Resource Record refers to a DNSKEY RR and is used in the DNS
+    # DNSKEY authentication process.  A DS RR refers to a DNSKEY RR by
+    # storing the key tag, algorithm number, and a digest of the DNSKEY RR.
+    # Note that while the digest should be sufficient to identify the
+    # public key, storing the key tag and key algorithm helps make the
+    # identification process more efficient.  By authenticating the DS
+    # record, a resolver can authenticate the DNSKEY RR to which the DS
+    # record points.  The key authentication process is described in
+    # [RFC4035].
+
+    class CDS < DS
+
+      ClassValue = nil #:nodoc: all
+      TypeValue = Types::CDS #:nodoc: all
+    end
+  end
+end

data/lib/dnsruby/resource/DNSKEY.rb

@@ -340,8 +340,12 @@ module Dnsruby
         @key_length = (@key.length - pos) * 8
 
         pkey = OpenSSL::PKey::RSA.new
-        pkey.e = exponent
-        pkey.n = modulus
+        begin
+          pkey.set_key(modulus, exponent, nil) # use set_key, present in later versions of openssl gem
+        rescue NoMethodError
+          pkey.e = exponent # set_key not available in earlier versions, use this approach instead
+          pkey.n = modulus
+        end
         return pkey
       end
 
@@ -361,10 +365,15 @@ module Dnsruby
         @key_length = (pgy_len * 8)
 
         pkey = OpenSSL::PKey::DSA.new
-        pkey.p = p
-        pkey.q = q
-        pkey.g = g
-        pkey.pub_key = y
+        begin
+          pkey.set_pgq(p,g,q)
+          pkey.set_key(y, nil) # use set_pgq and set_key, present in later versions of openssl gem
+        rescue NoMethodError
+          pkey.p = p # set_key not available in earlier versions, use this approach instead
+          pkey.q = q
+          pkey.g = g
+          pkey.pub_key = y
+        end
 
         pkey
       end

data/lib/dnsruby/resource/IN.rb

@@ -19,7 +19,11 @@ module Dnsruby
       Types::NS => NS,
       Types::CNAME => CNAME,
       Types::DNAME => DNAME,
+      Types::URI => URI,
+      Types::DS => DS,
+      Types::CDS => CDS,
       Types::DNSKEY => DNSKEY,
+      Types::CDNSKEY => CDNSKEY,
       Types::SOA => SOA,
       Types::PTR => PTR,
       Types::HINFO => HINFO,
@@ -45,7 +49,6 @@ module Dnsruby
       Types::ANY => ANY,
       Types::RRSIG => RRSIG,
       Types::NSEC => NSEC,
-      Types::DS => DS,
       Types::NSEC3 => NSEC3,
       Types::NSEC3PARAM => NSEC3PARAM,
       Types::DLV => DLV,

data/lib/dnsruby/resource/URI.rb

@@ -0,0 +1,57 @@
+module Dnsruby
+  class RR
+      class URI < RR
+        ClassValue = nil #:nodoc: all
+        TypeValue= Types::URI #:nodoc: all
+
+        #  The NAPTR RR order field
+        attr_accessor :priority
+
+        #  The NAPTR RR order field
+        attr_accessor :weight
+
+        #  The NAPTR RR order field
+        attr_accessor :target
+
+        def from_hash(hash) #:nodoc: all
+          @priority = hash[:priority]
+          @weight = hash[:weight]
+          @target = hash[:target]
+        end
+
+        def from_data(data) #:nodoc: all
+          @priority,  @weight, @target = data
+        end
+
+        def from_string(input) #:nodoc: all
+          if (input.strip.length > 0)
+            values = input.split(" ")
+            @priority = values [0].to_i
+            @weight = values [1].to_i
+            @target = values [2].gsub!("\"", "")
+          end
+        end
+
+        def rdata_to_string #:nodoc: all
+            "#{@priority} #{@weight} \"#{@target}\""
+        end
+
+        def encode_rdata(msg, canonical=false) #:nodoc: all
+          if (@priority != nil)
+            msg.put_pack('n', @priority)
+            msg.put_pack('n', @weight)
+            msg.put_bytes(@target)
+          end
+        end
+
+        def self.decode_rdata(msg) #:nodoc: all
+          priority, = msg.get_unpack('n')
+          weight, = msg.get_unpack('n')
+          target = msg.get_bytes
+          return self.new([priority, weight, target])
+        end
+
+
+      end
+  end
+end

data/lib/dnsruby/resource/generic.rb

@@ -152,9 +152,12 @@ require 'dnsruby/resource/OPT'
 require 'dnsruby/resource/TSIG'
 require 'dnsruby/resource/TKEY'
 require 'dnsruby/resource/DNSKEY'
+require 'dnsruby/resource/CDNSKEY'
 require 'dnsruby/resource/RRSIG'
 require 'dnsruby/resource/NSEC'
 require 'dnsruby/resource/DS'
+require 'dnsruby/resource/CDS'
+require 'dnsruby/resource/URI'
 require 'dnsruby/resource/NSEC3'
 require 'dnsruby/resource/NSEC3PARAM'
 require 'dnsruby/resource/DLV'

data/lib/dnsruby/select_thread.rb

@@ -194,7 +194,7 @@ module Dnsruby
         rescue SelectWakeup
           #  If SelectWakeup, then just restart this loop - the select call will be made with the new data
           next
-        rescue IOError => e
+        rescue IOError, EncodeError => e
           #           print "IO Error  =: #{e}\n"
           exceptions = clean_up_closed_sockets
           exceptions.each { |exception| send_exception_to_client(*exception) }

data/lib/dnsruby/single_verifier.rb

@@ -65,6 +65,7 @@ module Dnsruby
           @@recursor = Recursor.new
         end
       end
+      @@recursor.dnssec = true
       return @@recursor
     end
 
@@ -72,12 +73,15 @@ module Dnsruby
       #       if (Dnssec.do_validation_with_recursor?)
       #         return Recursor.new
       #       else
+      resolver = nil
       if (Dnssec.default_resolver)
-        return Dnssec.default_resolver
+        resolver = Dnssec.default_resolver
       else
-        return Resolver.new
+        resolver = Resolver.new
       end
       #       end
+      resolver.dnssec = true
+      return resolver
     end
     def add_dlv_key(key)
       #  Is this a ZSK or a KSK?
@@ -848,6 +852,7 @@ module Dnsruby
           end
         end
       end
+      res.dnssec = true
       #       query = Message.new(name, Types.DNSKEY)
       #       query.do_validation = false
       ret = nil
@@ -1011,6 +1016,7 @@ module Dnsruby
                 end
               end
             end
+            parent_res.dnssec = true
           end
           #  Use that Resolver to query for DS record and NS for children
           ds_rrset = current_anchor
@@ -1068,6 +1074,7 @@ module Dnsruby
                 child_res = Resolver.new
               end
             end
+            child_res.dnssec = true
           end
         end
         #  Query for DNSKEY record, and verify against DS in parent.
@@ -1143,11 +1150,14 @@ module Dnsruby
       if (Dnssec.do_validation_with_recursor?)
         return get_recursor
       else
+        resolver = nil
         if (Dnssec.default_resolver)
-          return Dnssec.default_resolver
+          resolver = Dnssec.default_resolver
         else
-          return Resolver.new
+          resolver = Resolver.new
         end
+        resolver.dnssec = true
+        return resolver
       end
     end
 

data/lib/dnsruby/version.rb

@@ -1,3 +1,3 @@
 module Dnsruby
-  VERSION = '1.60.2'
+  VERSION = '1.61.1'
 end

data/lib/dnsruby/zone_transfer.rb

@@ -33,6 +33,8 @@ module Dnsruby
     attr_reader :tsig
     #  Returns the tsigstate of the last transfer (nil if no TSIG signed transfer has occurred)
     attr_reader :last_tsigstate
+    # Sets the connect timeout in seconds
+    attr_accessor :connect_timeout
 
     # Sets the TSIG to sign the zone transfer with.
     # Pass in either a Dnsruby::RR::TSIG, or a key_name and key (or just a key)
@@ -54,6 +56,7 @@ module Dnsruby
       @tsig = nil
       @axfr = nil
       @src_address = nil
+      @connect_timeout = 5
     end
 
     #  Perform a zone transfer (RFC1995)
@@ -107,7 +110,8 @@ module Dnsruby
     def do_transfer(zone, server) #:nodoc: all
       @transfer_type = Types.new(@transfer_type)
       @state = :InitialSoa
-      socket = TCPSocket.new(server, @port, @src_address)
+      socket = Socket.tcp(server, @port, @src_address, connect_timeout: @connect_timeout)
+      # socket = TCPSocket.new(server, @port, @src_address)
       begin
         #  Send an initial query
         msg = Message.new(zone, @transfer_type, @klass)

data/test/tc_dns.rb

@@ -248,5 +248,10 @@ class TestDNS < Minitest::Test
       # assert_equal(a[0].name.to_s, 'a.t.dnsruby.validation-test-servers.nominet.org.uk',"Correct name (with persistent socket and #{method})")
     end
 
+    def test_port
+      d = DNS.new({:port => 5353})
+      assert_true(d.to_s.include?"5353")
+    end
+
   end
 end

data/test/tc_resolver.rb

@@ -374,5 +374,31 @@ class TestRawQuery < Minitest::Test
     assert_equal KEY, options[:key]
     assert_equal ALGO, options[:algorithm]
   end
+  
+  def test_threads
+    resolver = Dnsruby::Resolver.new(nameserver: ["8.8.8.8", "8.8.4.4"])
+        resolver.query("google.com", "MX")
+         resolver.query("google.com", "MX")
+          resolver.query("google.com", "MX")
+          begin
+            resolver.query("googlöe.com", "MX") 
+          rescue Dnsruby::ResolvError => e
+            # fine
+          end
+          resolver.query("google.com", "MX")
+          resolver.query("google.com", "MX")
+          begin
+            resolver.query("googlöe.com", "MX")
+          rescue Dnsruby::ResolvError => e
+            # fine
+          end
+          begin
+            resolver.query("googlöe.com", "MX") 
+          rescue Dnsruby::ResolvError => e
+            # fine
+          end
+#          Dnsruby::Cache.delete("googlöe.com", "MX")
+          
+  end
 end
 

data/test/tc_rr.rb

@@ -285,6 +285,39 @@ class TestRR < Minitest::Test
     update.encode
   end
 
+  def test_uri
+    rrString = "_ftp._tcp.\t300\tIN\tURI\t10\ 1 \"ftp://ftp1.example.com/public\""
+    rr = RR.create(rrString)
+    assert(rrString.to_s == rr.to_s)
+    m = Dnsruby::Message.new
+    m.add_additional(rr)
+    m2 = Message.decode(m.encode)
+    rr2 = m2.additional()[0]
+    assert(rr == rr2)
+  end
+
+  def test_cds
+    rrString = "dskey.example.com.\t86400\tIN\tCDS\t60485 RSASHA1 1 ( 2BB183AF5F22588179A53B0A98631FAD1A292118 )"
+    rr = RR.create(rrString)
+    assert(rrString.to_s == rr.to_s)
+    m = Dnsruby::Message.new
+    m.add_additional(rr)
+    m2 = Message.decode(m.encode)
+    rr2 = m2.additional()[0]
+    assert(rr.to_s == rr2.to_s)
+  end
+
+  def test_cdnskey
+    rrString = "tjeb.nl.\t3600\tIN\tCDNSKEY\t256 3 RSASHA1-NSEC3-SHA1 ( AwEAAcglEOS7bECRK5fqTuGTMJycmDhTzmUu/EQbAhKJOYJxDb5SG/RYqsJgzG7wgtGy0W1aP7I4k6SPtHmwcqjLaZLVUwRNWCGr2adjb9JTFyBR7F99Ngi11lEGM6Uiw/eDRk66lhoSGzohjj/rmhRTV6gN2+0ADPnafv3MBkPgryA3 ) ; key_tag=53177"
+    rr = RR.create(rrString)
+    assert(rrString.to_s == rr.to_s)
+    m = Dnsruby::Message.new
+    m.add_additional(rr)
+    m2 = Message.decode(m.encode)
+    rr2 = m2.additional()[0]
+    assert(rr.to_s == rr2.to_s)
+  end
+
   def test_cert
     rr = RR.create("test.kht.se. 60 IN CERT PGP 0 0 mQGiBDnY2vERBAD3cOxqoAYHYzS+xttvuyN9wZS8CrgwLIlT8Ewo/CCFI11PEO+gJyNPvWPRQsyt1SE60reaIsie2bQTg3DYIg0PmH+ZOlNkpKesPULzdlw4Rx3dD/M3Lkrm977h4Y70ZKC+tbvoYKCCOIkUVevny1PVZ+mB94rb0mMgawSTrct03QCg/w6aHNJFQV7O9ZQ1Fir85M3RS8cEAOo4/1ASVudz3qKZQEhU2Z9O2ydXqpEanHfGirjWYi5RelVsQ9IfBSPFaPAWzQ24nvQ18NU7TgdDQhP4meZXiVXcLBR5Mee2kByf2KAnBUF9aah5s8wZbSrC6u8xEZLuiauvWmCUIWe0Ylc1/L37XeDjrBI2pT+k183X119d6Fr1BACGfZVGsot5rxBUEFPPSrBqYXG/0hRYv9Eq8a4rJAHK2IUWYfivZgL4DtrJnHlha+H5EPQVYkIAN3nGjXoHmosY+J3Sk+GyR+dCBHEwCkoHMKph3igczCEfxAWgqKeYd5mf+QQq2JKrkn2jceiIO7s3CrepeEFAjDSGuxhZjPJVm7QoRGFuaWVsIFAuIE1haG9uZXkgPGRhbm1AcHJpbWUuZ3VzaGkub3JnPohOBBARAgAOBQI52NrxBAsDAQICGQEACgkQ+75aMGJLskn6LgCbBXUD7UmGla5e1zyhuY667hP3F+UAoJIeDZJyRFkQAmb+u8KekRyLD1MLtDJEYW5pZWwgTWFob25leSAoU2Vjb25kYXJ5IEVtYWlsKSA8Z3VzaGlAZ3VzaGkub3JnPohgBBMRAgAgBQJF1J/XAhsjBgsJCAcDAgQVAggDBBYCAwECHgECF4AACgkQ+75aMGJLskkVhACggsivQ9qLhfdA1rGm6f8LRJBSC4wAoI930h+/hshClj6AkNwGRtHdf5XJuQINBDnY2vQQCAD2Qle3CH8IF3KiutapQvMF6PlTETlPtvFuuUs4INoBp1ajFOmPQFXz0AfGy0OplK33TGSGSfgMg71l6RfUodNQ+PVZX9x2Uk89PY3bzpnhV5JZzf24rnRPxfx2vIPFRzBhznzJZv8V+bv9kV7HAarTW56NoKVyOtQa8L9GAFgr5fSI/VhOSdvNILSd5JEHNmszbDgNRR0PfIizHHxbLY7288kjwEPwpVsYjY67VYy4XTjTNP18F1dDox0YbN4zISy1Kv884bEpQBgRjXyEpwpy1obEAxnIByl6ypUM2Zafq9AKUJsCRtMIPWakXUGfnHy9iUsiGSa6q6Jew1XpMgs7AAICB/9eGjzF2gDh6U7I72x/6bSdlExx2LvIF92OZKc0S55IOS4Lgzs7Hbfm1aOL4oJt7wBg94xkF4cerxz7y8R9J+k3GNl14KOjbYaMAh1rdxdAzikYMH1p1hS78GMtwxky6jE5en87BGGMmnbC84JlxwN+MD7diu8D0Gkgjj/pxOp32D5jEe02wBPVjFTpFLJjpFniLUY6AohRDEdSuZwWPuoKVWhpeWkasNn5qgwGyDREbXpyPsU02BkwE4JiGs+JMMdOn9KMh5dxiuwsMM9gHiQZS3mSNBBKPWI5ZXsdStVFvapjf2FUFDXLUbTROPv1Xhqf0u7YYORFnWeVtvzKIxVaiEYEGBECAAYFAjnY2vQACgkQ+75aMGJLsklBWgCeN7z9xk52y/aoaCuF6hYb0d+3k98AoMRxvHuXI1Nc2FXY/x65PwHiUbaY")
     rr = RR.create("all.rr.org.             IN      CERT            6 0 0 FFsAyW1dVK7hIGuvhN56r26UwJx/")

data/test/tc_soak.rb

@@ -76,6 +76,10 @@ class TestSingleResolverSoak < Minitest::Test
     end
   end
 
+  def teardown
+    Celluloid.shutdown
+  end
+
   SINGLE_RESOLVER_QUERY_TIMES = 63
 
   def setup

data/test/tc_tcp_pipelining.rb

@@ -63,6 +63,13 @@ class TestTCPPipelining < Minitest::Test
     end
   end
 
+  def teardown
+    if @initialized
+      Celluloid.shutdown
+      @initialized = false
+    end
+  end
+
   def setup
     self.class.init
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dnsruby
 version: !ruby/object:Gem::Version
-  version: 1.60.2
+  version: 1.61.1
 platform: ruby
 authors:
 - Alex Dalitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2018-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -128,6 +128,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 description: |-
   Dnsruby is a pure Ruby DNS client library which implements a
   stub resolver. It aims to comply with all DNS RFCs, including
@@ -194,6 +208,8 @@ files:
 - lib/dnsruby/resource/AFSDB.rb
 - lib/dnsruby/resource/APL.rb
 - lib/dnsruby/resource/CAA.rb
+- lib/dnsruby/resource/CDNSKEY.rb
+- lib/dnsruby/resource/CDS.rb
 - lib/dnsruby/resource/CERT.rb
 - lib/dnsruby/resource/DHCID.rb
 - lib/dnsruby/resource/DLV.rb
@@ -230,6 +246,7 @@ files:
 - lib/dnsruby/resource/TLSA.rb
 - lib/dnsruby/resource/TSIG.rb
 - lib/dnsruby/resource/TXT.rb
+- lib/dnsruby/resource/URI.rb
 - lib/dnsruby/resource/X25.rb
 - lib/dnsruby/resource/domain_name.rb
 - lib/dnsruby/resource/generic.rb