dnsruby 1.61.2 → 1.61.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8d3ce250a7bae010d93f3e4b364176a3beba389a
-  data.tar.gz: 4890c4e357d535500da2d0ca1e08ada1be6361d6
+SHA256:
+  metadata.gz: d267eba6aca51b53799b98294feea8a6394293e86d27b0054daf81f5da532f8e
+  data.tar.gz: 5ed7a4a3c9c91407c79e7a2470546430ab13df880a22a8ed0d002d4bafb3cc3b
 SHA512:
-  metadata.gz: ac49a57892a98ead8142743679af87aee1e7ff32c7ed396d33b645991d2b2b5ed7afc5a6dc5ebc1d80fc65b2ec2524ef836d14c5bdb443f6f1d7cf6bbdd7823a
-  data.tar.gz: f072918e90de725a7f062513eba3f0b06686a85ed1dc44efc550732e125482948b2725eead67e2e7f83e25f2454fd10a29b3f36dbda32d06437c231a673622cb
+  metadata.gz: 910c119b759313510f8fb2397ce48b9ac652a6d9c9e176d5eae93148a77664d7fe4b0b40a1c1c447beefcfe652807f6b1a7493314dd8dd71032e7ec2a56e7e99
+  data.tar.gz: 539eec74d5805ac121cb9b23d881ddb4bc98c755f90d88b07eedf864fef376ccceca076bf0d3c3bb8bdc858ff629133862253bad48a00ca205c6ad819b8cc97f

data/.github/workflows/ci.yml

@@ -0,0 +1,23 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.5', '2.6', '2.7', '3.0' ]
+    name: Ruby ${{ matrix.ruby }} tests
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Bundle install
+        run: |
+          gem install bundler
+          bundle install --jobs 4 --retry 3
+      - name: Run tests
+        run: bundle exec rake test

data/.yardopts

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

data/Gemfile

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

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/alexdalitz/dnsruby.svg?branch=master)](https://travis-ci.org/alexdalitz/dnsruby)
+[![Build Status](https://github.com/alexdalitz/dnsruby/actions/workflows/ci.yml/badge.svg)]
 [![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" />
@@ -93,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,6 +1,37 @@
 # Release Notes
 
-##v1.61.2
+## v1.61.7
+
+* Fix namespace issue from v1.61.6
+
+## v1.61.6
+
+* RD bit not set on Recursor queries (thanks Sean Dilda!)
+* Handle quoted strings followed by unquoted strings in TXT records
+* do not worry about rogue repeated Ids - just log an error and get on with life
+* Clear Ruby warnings
+* Use GitHub Actions rather than Travis
+
+## v1.61.5
+
+* CAA record fixes - add contactphone and contactemail
+* Fix eprecation warnings
+
+## 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
 

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
 
@@ -32,3 +33,4 @@ create_task(:soak,         'test/tc_soak.rb')
 create_task(:message,      'test/tc_message.rb')
 create_task(:cache,         'test/tc_cache.rb')
 create_task(:pipe,          'test/tc_tcp_pipelining.rb')
+create_task(:resolv,       'test/tc_resolv.rb')

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,24 +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 'addressable', '~> 2.5'
+  s.add_runtime_dependency 'simpleidn', '~> 0.1'
 end
 

data/lib/dnsruby.rb

@@ -25,10 +25,6 @@ require 'dnsruby/DNS'
 require 'dnsruby/hosts'
 require 'dnsruby/update'
 require 'dnsruby/zone_transfer'
-require 'dnsruby/dnssec'
-require 'dnsruby/zone_reader'
-require 'dnsruby/resolv'
-
 
 # = Dnsruby library
 # Dnsruby is a thread-aware DNS stub resolver library written in Ruby.
@@ -239,3 +235,7 @@ module Dnsruby
   class ZoneSerialError < ResolvError
   end
 end
+
+require 'dnsruby/dnssec'
+require 'dnsruby/zone_reader'
+require 'dnsruby/resolv'

data/lib/dnsruby/DNS.rb

@@ -290,7 +290,7 @@ module Dnsruby
         msg.do_caching = do_caching
         @resolver.do_validation = false
         @resolver.send_async(msg, q)
-        id, ret, exception = q.pop
+        _id, ret, exception = q.pop
         if (exception == nil && ret && ret.rcode == RCode.NOERROR)
           return ret, ret.question[0].qname
         end

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 :
     # 
@@ -84,13 +85,10 @@ module Dnsruby
     def initialize()
       @mutex = Mutex.new
       @configured = false
-      #       parse_config
     end
     #  Reset the config to default values
     def Config.reset
-      c = Config.new
       @configured = false
-      #       c.parse_config
     end
 
     def parse_config(config_info=nil) #:nodoc: all
@@ -101,7 +99,7 @@ module Dnsruby
         dom=""
         nd = 1
         @ndots = 1
-        @port = 53
+        @port = DEFAULT_PORT
         @apply_search_list = true
         @apply_domain = true
         config_hash = Config.default_config_hash
@@ -165,7 +163,7 @@ module Dnsruby
     #  Set port
     def port=(p)
       @configured = true
-      @port=p
+      @port=p if p
       if !@port.kind_of?(Integer)
         raise ArgumentError.new("invalid port config: #{@port.inspect}")
       end
@@ -206,13 +204,13 @@ module Dnsruby
         if (String ===n)
           #  Make sure we can make a Name or an address from it
           begin
-            a = IPv4.create(n)
+            IPv4.create(n)
           rescue ArgumentError
             begin
-              a = IPv6.create(n)
+              IPv6.create(n)
             rescue ArgumentError
               begin
-                a = Name.create(n)
+                Name.create(n)
               rescue ArgumentError
                 raise ArgumentError.new("Can't interpret #{n} as IPv4, IPv6 or Name")
               end
@@ -315,14 +313,16 @@ module Dnsruby
       search = nil
       domain = nil
       ndots = 1
-      port = 53
+      port = DEFAULT_PORT
       open(filename) {|f|
         f.each {|line|
           line.sub!(/[#;].*/, '')
           keyword, *args = line.split(/\s+/)
-          args.each { |arg|
-            arg.untaint
-          }
+            if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.8")
+              args.each { |arg|
+                arg.untaint
+              }
+            end
           next unless keyword
           case keyword
           when 'port'
@@ -471,4 +471,4 @@ module Dnsruby
       return candidates
     end
   end
-end
+end

data/lib/dnsruby/dnssec.rb

@@ -128,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/hosts.rb

@@ -57,15 +57,19 @@ module Dnsruby
                 line.sub!(/#.*/, '')
                 addr, hostname, *aliases = line.split(/\s+/)
                 next unless addr
-                addr.untaint
-                hostname.untaint
+                if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.8")
+                  addr.untaint
+                  hostname.untaint
+                end
                 @addr2name[addr] = [] unless @addr2name.include? addr
                 @addr2name[addr] << hostname
                 @addr2name[addr] += aliases
                 @name2addr[hostname] = [] unless @name2addr.include? hostname
                 @name2addr[hostname] << addr
                 aliases.each {|n|
-                  n.untaint
+                  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.8")
+                    n.untaint
+                  end
                   @name2addr[n] = [] unless @name2addr.include? n
                   @name2addr[n] << addr
                 }
@@ -123,4 +127,4 @@ module Dnsruby
       end
     end
   end
-end
+end

data/lib/dnsruby/message/encoder.rb

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

data/lib/dnsruby/message/header.rb

@@ -31,9 +31,6 @@ class Header
   #  and is allowed to set the bit by policy.)
   attr_accessor :ad
 
-  #  The query response flag
-  attr_accessor :qr
-
   #  Recursion available flag
   attr_accessor :ra
 

data/lib/dnsruby/name.rb

@@ -27,7 +27,7 @@ module Dnsruby
   # * Name#subdomain_of?(other)
   # * Name#labels
   #
-  require 'addressable'
+  require 'simpleidn'
   class Name
     include Comparable
     MaxNameLength=255
@@ -63,20 +63,18 @@ 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
-          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
+      begin
+        return SimpleIDN.to_ascii(d)
+      rescue
+        return d
+      end
     end
 
     def self.split_escaped(arg) #:nodoc: all
@@ -261,7 +259,7 @@ module Dnsruby
     #  in: dName a string with a domain name in presentation format (1035
     #  sect 5.1)
     #  out: an array of labels in wire format.
-    def self.name2encodedlabels (dName) #:nodoc: all
+    def self.name2encodedlabels(dName) #:nodoc: all
       #  Check for "\" in the name  : If there, then decode properly - otherwise, cheat and split on "."
       if (dName.index("\\"))
         names=[]

data/lib/dnsruby/packet_sender.rb

@@ -204,26 +204,22 @@ module Dnsruby
       @tcp_pipelining_max_queries = :infinite
       @use_counts = {}
 
-      if (arg==nil)
-        #  Get default config
-        config = Config.new
-        #         @server = config.nameserver[0]
-      elsif (arg.kind_of? String)
-        @server=arg
-      elsif (arg.kind_of? Name)
-        @server=arg
-      elsif (arg.kind_of? Hash)
+      if arg.nil?
+      elsif arg.kind_of? String
+        @server = arg
+      elsif arg.kind_of? Name
+        @server = arg
+      elsif arg.kind_of? Hash
         arg.keys.each do |attr|
           begin
-            if (((attr.to_s == "src_address")||(attr.to_s == "src_address6")) &&
-                ((arg[attr] == nil) || (arg[attr] == "")))
+            if ((attr.to_s == "src_address" || attr.to_s == "src_address6") &&
+                (arg[attr] == nil || arg[attr] == ""))
             else
-              send(attr.to_s+"=", arg[attr])
+              send(attr.to_s + "=", arg[attr])
             end
           rescue Exception => e
             Dnsruby.log.error { "PacketSender : Argument #{attr}, #{arg[attr]} not valid : #{e}\n" }
           end
-          #         end
         end
       end
       # Check server is IP
@@ -235,12 +231,12 @@ module Dnsruby
 
     def check_ipv6
       begin
-        i = IPv4.create(@server)
+        IPv4.create(@server)
         #         @src_address = '0.0.0.0'
         @ipv6=false
       rescue Exception
         begin
-          i = IPv6.create(@server)
+          IPv6.create(@server)
           #           @src_address6 = '::'
           @ipv6=true
         rescue Exception
@@ -456,7 +452,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