dnsruby 1.60.1 → 1.61.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cfb5e0f9d0b657bba3a0ad8d8edde456e253d638
-  data.tar.gz: 4c80209c7c2e6823e1958e9c79c0665805c0f9a0
+SHA256:
+  metadata.gz: 0af7c6de9311c48936130f68339d222dc18675d7ad52db92eec7474bae5ee05c
+  data.tar.gz: cc926e5123a7e691b88261d93891b7f28efbc54d01ca549e1fdabc6d9ee62f1a
 SHA512:
-  metadata.gz: 2f53ebb527626d922813c53b4c8cd8daa73ff22721a812ea55963c28201b44da43c7be779316fb9e3041a7183e0c7c3ef99faf73a69fb9fb9845b70ce428f31f
-  data.tar.gz: b93907dc484ddd07a0fcd2b8eaeebbc92d261c23bd2046ce7c6159c75a3fe350eae485977b6afcac44bcdf999501d2eb4255f92118f1e8f0e682193d74db9dfa
+  metadata.gz: c09d09948564591075f2caccc23d0592ec04644d592815400cc78e1664354af47e9185276fce7c64fb81a18ef4fbbfd53520314419e5085a879dd8df0565527f
+  data.tar.gz: 535c00b339938ffe3e1479286477889398dc1154f43a2eae4defcb7e08a0a04d23033b501163f3815e2793af67d9445448170bfbd516d34702a5df93f4a22b4d

data/.travis.yml

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

data/.yardopts

@@ -0,0 +1,7 @@
+-
+--main README.md
+LICENSE
+DNSSEC
+EXAMPLES
+EVENTMACHINE
+RELEASE_NOTES.md

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)
 
@@ -91,3 +93,4 @@ Contact/Links
 | Github | https://github.com/alexdalitz/dnsruby |
 | Google Group | https://groups.google.com/forum/#!forum/dnsruby |
 | Rubygems | http://rubygems.org/gems/dnsruby/ |
+| Documentation | https://www.rubydoc.info/gems/dnsruby/ |

data/RELEASE_NOTES.md

@@ -1,5 +1,51 @@
 # Release Notes
 
+## v1.61.4
+
+* Dnsruby::Name : document .punycode
+* gemspec enhancement
+* add yard build file
+* fix create name include url special characters
+* Fix uninitialized constant error when using via Rails
+* Implement ECDSAP256SHA256 (13) / ECDSAP384SHA384 (14) algorithms for DNSKEY
+* Reinitialize all IANA TAR keys with Dnssec.reset
+
+## v1.61.3
+
+* TCP timeout and port changes
+
+## v1.61.2
+
+* Add new root key
+
+## 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)
+* Fix use of non-default ports in Dnsruby::Resolver (thanks Thomas Morgan)
+* Fix NAPTR encoding for null rdata dynamic update packets
+* Fix CAA resource record encoding
+* Avoid changing ruby global thread abort behavior (thanks Brent Cook)
+
 ## v1.60.1
 
 * DNSSEC validation switched OFF by default (but can still be switched on)

data/Rakefile

@@ -22,6 +22,7 @@ def create_task(task_name, test_suite_filespec)
     t.name = task_name
     t.test_files = FileList[test_suite_filespec]
     t.verbose = true
+    t.warning = false
   end
 end
 

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

@@ -15,6 +15,7 @@ SPEC = Gem::Specification.new do |s|
 stub resolver. It aims to comply with all DNS RFCs, including
 DNSSEC NSEC3 support.'
   s.license = "Apache License, Version 2.0"
+  
   s.files = `git ls-files -z`.split("\x0")
 
   s.post_install_message = \
@@ -23,22 +24,28 @@ DNSSEC NSEC3 support.'
   For general discussion (please tell us how you use dnsruby): https://groups.google.com/forum/#!forum/dnsruby"
 
   s.test_file = "test/ts_offline.rb"
-  s.has_rdoc = true
   s.extra_rdoc_files = ["DNSSEC", "EXAMPLES", "README.md", "EVENTMACHINE"]
 
-  unless /java/ === RUBY_PLATFORM
-    s.add_development_dependency 'pry', '~> 0.10'
-    s.add_development_dependency 'pry-byebug', '~> 2.0' if RUBY_VERSION >= '2'
-  end
+  s.metadata = {
+    'yard.run'          => 'yard',
+    'bug_tracker_uri'   => 'https://github.com/alexdalitz/dnsruby/issues',
+    'changelog_uri'     => 'https://github.com/alexdalitz/dnsruby/blob/master/RELEASE_NOTES.md',
+    'documentation_uri' => 'https://www.rubydoc.info/gems/dnsruby/',
+    'homepage_uri'      => 'https://github.com/alexdalitz/dnsruby',
+    'source_code_uri'   => 'https://github.com/alexdalitz/dnsruby',
+  }
 
-  s.add_development_dependency 'rake', '~> 10', '>= 10.3.2'
+  s.add_development_dependency 'rake', '>= 12.3.3'
   s.add_development_dependency 'minitest', '~> 5.4'
-  s.add_development_dependency 'rubydns', '~> 1.0'
-  s.add_development_dependency 'nio4r', '~> 1.1'
+  s.add_development_dependency 'rubydns', '~> 2.0.1'
+  s.add_development_dependency 'nio4r', '~> 2.0'
   s.add_development_dependency 'minitest-display', '>= 0.3.0'
+  s.add_development_dependency('yard', '~> 0.9')
 
   if RUBY_VERSION >= "1.9.3"
     s.add_development_dependency 'coveralls', '~> 0.7'
   end
+
+  s.add_runtime_dependency 'simpleidn', '~> 0.1'
 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

@@ -38,6 +38,7 @@ module Dnsruby
   #  a query is performed (or a config parameter requested on) a Resolver which has
   #  not yet been configured.
   class Config
+    DEFAULT_PORT = 53
     # --
     # @TODO@ Switches for :
     # 
@@ -101,6 +102,7 @@ module Dnsruby
         dom=""
         nd = 1
         @ndots = 1
+        @port = DEFAULT_PORT
         @apply_search_list = true
         @apply_domain = true
         config_hash = Config.default_config_hash
@@ -122,6 +124,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 +135,7 @@ module Dnsruby
         @configured = true
         send("search=",s)
         send("ndots=",nd)
+        send("port=",p)
         send("domain=",dom)
       }
       Dnsruby.log.info{to_s}
@@ -159,6 +163,15 @@ module Dnsruby
       end
     end
 
+    #  Set port
+    def port=(p)
+      @configured = true
+      @port=p if 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 +316,7 @@ module Dnsruby
       search = nil
       domain = nil
       ndots = 1
+      port = DEFAULT_PORT
       open(filename) {|f|
         f.each {|line|
           line.sub!(/[#;].*/, '')
@@ -312,6 +326,8 @@ module Dnsruby
           }
           next unless keyword
           case keyword
+          when 'port'
+            port = args[0].to_i
           when 'nameserver'
             nameserver += args
           when 'domain'
@@ -337,7 +353,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 +373,7 @@ module Dnsruby
       ret += " domain : #{domain_string}, search : "
       search.each {|s| ret += s + ", " }
       ret += " ndots : #{@ndots}"
+      ret += " port : #{@port}"
       return ret
     end
 
@@ -423,18 +440,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/dnssec.rb

@@ -82,6 +82,9 @@ module Dnsruby
     @@root_key = RR.create(". IN DS 19036 8 2 49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5")
     @@root_verifier.add_root_ds(@@root_key)
 
+    @@root_key_new = RR.create(". IN DS 20326 8 2 E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D")
+    @@root_verifier.add_root_ds(@@root_key_new)
+
     @@dlv_verifier = SingleVerifier.new(SingleVerifier::VerifierType::DLV)
 
     #  @TODO@ Could add a new one of these for each anchor.
@@ -125,6 +128,7 @@ module Dnsruby
       @@validation_policy = ValidationPolicy::LOCAL_ANCHORS_THEN_ROOT
       @@root_verifier = SingleVerifier.new(SingleVerifier::VerifierType::ROOT)
       @@root_verifier.add_root_ds(@@root_key)
+      @@root_verifier.add_root_ds(@@root_key_new)
 
       @@dlv_verifier = SingleVerifier.new(SingleVerifier::VerifierType::DLV)
 

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 'simpleidn'
   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,20 @@ module Dnsruby
       end
     end
 
+    # Convert IDN domain from Unicode UTF-8 to ASCII punycode
+    # @param [Object|String] d Unicode domain with emoji inside
+    # @return [String] ASCII punycode domain
+    # @example
+    #   Dnsruby::Name.punycode('🏳.cf')
+    #   => "xn--en8h.cf"
+    def self.punycode(d)
+      begin
+        return SimpleIDN.to_ascii(d)
+      rescue
+        return d
+      end
+    end
+
     def self.split_escaped(arg) #:nodoc: all
       encodedlabels = name2encodedlabels(arg)
       return encodedlabels
@@ -317,7 +333,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!!
@@ -449,7 +456,7 @@ module Dnsruby
                 socket, new_socket = tcp_pipeline_socket(src_port)
                 src_port = @tcp_pipeline_local_port
               else
-                socket = TCPSocket.new(@server, @port, src_address, src_port)
+                socket = Socket.tcp(@server, @port, src_address, src_port, connect_timeout: @packet_timeout)
                 new_socket = true
               end
             rescue Errno::EBADF, Errno::ENETUNREACH => e
@@ -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)