dnsruby 1.61.3 → 1.61.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efa9e31f0e7a6a2b4d9e9e58fc6c3bdefe20791a095e9237b52b4df3f5ea3960
-  data.tar.gz: 4622702939e985576f613073e3a8bcf8b245aaaf6afd3139427e756311755ff8
+  metadata.gz: 7f1d44662973a06d7ff5296b1c49530b10e58a08ca5df87c893bb25e06e4bf7c
+  data.tar.gz: b82b2920d6d24ff8907d2e9b776a53f7034c11610335626ea31ee1485ffb6dde
 SHA512:
-  metadata.gz: 56b5ff00ed1275be32309e5d2389f6f88954a36d94b70f205c9e637658ffb9a341466300306021d27e37daf839bf2e6f2e202ce5371be7cdbed00ed0697c3f87
-  data.tar.gz: 6586cc36e174de3f90ffbb03bdce009c594f532ac26ea05e587ff966fac8eef998f5e42573c191142e4289d8fddcd77a44938b617e682050057a576bdadaba55
+  metadata.gz: 02f7ac0626839e3faf33f72a2b98e620ca1ac9bb5d11c06299b403c79e0552c5b0160b40978ead7aba27d8801b2b339a1cdeb856772c0241883f06b68a42beb5
+  data.tar.gz: bdc9cf4c7e89b11fb67871b480957f3f28bd29e472438490e918041f9e1d2682fa434ce6d66dff283843e7c67fc2f002482175e2a7c6b6a05106785b6f7797cb

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', '3.1' ] # , 'ruby-head' ]
+    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,46 @@
 # Release Notes
 
-##v1.61.2
+## v.1.61.9
+
+* Remove unused net-ftp dependency
+
+## v.1.61.8
+
+* Fix compatability with Ruby 3.1 - thanks @byroot Jean Boussier
+* Get the digdlv demo to enable dnssec
+
+## 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

@@ -33,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/demo/digdlv.rb

@@ -53,6 +53,7 @@ unless (1..3).include?(ARGV.length)
 end
 
 resolver = Dnsruby::Recursor.new
+resolver.dnssec = true
 zone_transfer = Dnsruby::ZoneTransfer.new
 
 dlv_key = Dnsruby::RR.create("dlv.isc.org. IN DNSKEY 257 3 5 BEAAAAPHMu/5onzrEE7z1egmhg/WPO0+juoZrW3euWEn4MxDCE1+lLy2 brhQv5rN32RKtMzX6Mj70jdzeND4XknW58dnJNPCxn8+jAGl2FZLK8t+ 1uq4W+nnA3qO2+DL+k6BD4mewMLbIYFwe0PG73Te9fZ2kJb56dhgMde5 ymX4BI/oQ+cAK50/xvJv00Frf8kw6ucMTwFlgPe+jnGxPPEmHAte/URk Y62ZfkLoBAADLHQ9IrS2tryAe7mbBZVcOwIeU/Rw/mRx/vwwMCTgNboM QKtUdvNXDrYJDSHZws3xiRXF1Rf+al9UmZfSav/4NWLKjHzpT59k/VSt TDN0YUuWrBNh")

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 = \
@@ -25,21 +26,25 @@ DNSSEC NSEC3 support.'
   s.test_file = "test/ts_offline.rb"
   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.add_development_dependency 'rake', '~> 10', '>= 10.3.2'
-  s.add_development_dependency 'minitest', '~> 5.4'
+  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', '>= 13.0.6'
+  s.add_development_dependency 'minitest', '~> 5.14.4'
   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 'minitest-display', '>= 0.3.1'
+  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/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

@@ -85,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
@@ -207,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
@@ -303,7 +300,7 @@ module Dnsruby
             end
           rescue Exception => e
             Dnsruby.log.error{"Can't make sense of nameserver : #{server}, exception : #{e}"}
-                         raise ArgumentError.new("Can't make sense of nameserver : #{server}, exception : #{e}")
+            raise ArgumentError.new("Can't make sense of nameserver : #{server}, exception : #{e}")
             return nil
           end
         end
@@ -321,9 +318,11 @@ module Dnsruby
         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'
@@ -472,4 +471,4 @@ module Dnsruby
       return candidates
     end
   end
-end
+end

data/lib/dnsruby/dnssec.rb

@@ -14,7 +14,6 @@
 # limitations under the License.
 # ++
 require 'digest/sha2'
-require 'net/ftp'
 require 'dnsruby/key_cache'
 require 'dnsruby/single_verifier'
 module Dnsruby
@@ -128,6 +127,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

data/lib/dnsruby/recursor.rb

@@ -227,7 +227,7 @@ module Dnsruby
       #  Nice idea.
 
       #       if (!@@hints || @@hints.length == 0)
-      resolver.recurse=(1)
+      resolver.recurse = true
       packet=resolver.query_no_validation_or_recursion(".", "NS", "IN")
       hints = Hash.new
       if (packet)
@@ -264,7 +264,7 @@ module Dnsruby
               }
             }
             (hints.length * 2).times {
-              id, result, error = q.pop
+              _id, result, _error = q.pop
               if (result)
                 result.answer.each {|rr|
                   TheLog.debug(";; NS address: " + rr.inspect+"\n")
@@ -303,7 +303,7 @@ module Dnsruby
       end
 
       #  Disable recursion flag.
-      resolver.recurse=(0)
+      resolver.recurse = false
       #       end
 
       #   return $self->nameservers( map { @{ $_ } } values %{ $self->{'hints'} } );
@@ -406,7 +406,7 @@ module Dnsruby
       @@mutex.synchronize {
         self.hints=(Hash.new) unless @@hints
       }
-      @resolver.recurse=(0)
+      @resolver.recurse = false
       #  Make sure the authority cache is clean.
       #  It is only used to store A and AAAA records of
       #  the suposedly authoritative name servers.
@@ -622,6 +622,7 @@ module Dnsruby
       end
       resolver = Resolver.new({:nameserver=>nameservers})
       resolver.dnssec = @dnssec
+      resolver.recurse = false
       servers = []
       resolver.single_resolvers.each {|s|
         servers.push(s.server)
@@ -638,7 +639,7 @@ module Dnsruby
         packet = resolver.send_message(query)
         #  @TODO@ Now prune unrelated RRSets (RFC 5452 section 6)
         prune_rrsets_to_rfc5452(packet, known_zone)
-      rescue ResolvTimeout, IOError => e
+      rescue ResolvTimeout, IOError
         #             TheLog.debug(";; nameserver #{levelns.to_s} didn't respond")
         #             next
         TheLog.debug("No response!")

data/lib/dnsruby/resolver.rb

@@ -128,7 +128,9 @@ module Dnsruby
     #  The current Config
     attr_reader :config
 
-    #  Does this Resolver cache answers, and attempt to retrieve answer from the cache?
+    #  Defines whether we will cache responses, or pass every request to the
+    #  upstream resolver.  This is only really useful when querying authoritative
+    #  servers (as the upstream recursive resolver is likely to cache)
     attr_reader :do_caching
 
     #  The array of SingleResolvers used for sending query messages
@@ -171,11 +173,6 @@ module Dnsruby
     #  requirements.
     attr_accessor :do_validation
 
-    #  Defines whether we will cache responses, or pass every request to the
-    #  upstream resolver.  This is only really useful when querying authoritative
-    #  servers (as the upstream recursive resolver is likely to cache)
-    attr_accessor :do_caching
-
     #  --
     #  @TODO@ add load_balance? i.e. Target nameservers in a random, rather than pre-determined, order?
     #  This is best done when configuring the Resolver, as it will re-order servers based on their response times.
@@ -568,7 +565,7 @@ module Dnsruby
     def add_server(server)# :nodoc:
       @configured = true
       res = PacketSender.new(server)
-      log_and_raise("Can't create server #{server}", ArgumentError) unless res
+      Dnsruby.log_and_raise("Can't create server #{server}", ArgumentError) unless res
       update_internal_res(res)
       @single_res_mutex.synchronize { @single_resolvers.push(res) }
     end
@@ -644,7 +641,7 @@ module Dnsruby
         a = Resolver.get_ports_from(p)
         a.each do |x|
           if (@src_port.length > 0) && (x == 0)
-            log_and_raise("src_port of 0 only allowed as only src_port value (currently #{@src_port.length} values",
+            Dnsruby.log_and_raise("src_port of 0 only allowed as only src_port value (currently #{@src_port.length} values",
                 ArgumentError)
           end
           @src_port.push(x)
@@ -668,7 +665,7 @@ module Dnsruby
         return ! ((p == 0) && (src_port.length > 0))
       else
         Dnsruby.log.error("Illegal port (#{p})")
-        log_and_raise("Illegal port #{p}", ArgumentError)
+        Dnsruby.log_and_raise("Illegal port #{p}", ArgumentError)
       end
     end
 
@@ -837,7 +834,7 @@ module Dnsruby
             timeouts[base + offset]=[res, retry_count]
           else
             if timeouts.has_key?(base + retry_delay + offset)
-              log_and_raise('Duplicate timeout key!')
+              Dnsruby.log_and_raise('Duplicate timeout key!')
             end
             timeouts[base + retry_delay + offset]=[res, retry_count]
           end
@@ -878,7 +875,7 @@ module Dnsruby
       end
 
       unless client_queue.kind_of?(Queue)
-        log_and_raise('Wrong type for client_queue in Resolver# send_async')
+        Dnsruby.log_and_raise('Wrong type for client_queue in Resolver# send_async')
         #  @TODO@ Handle different queue tuples - push this to generic send_error method
         client_queue.push([client_query_id, ArgumentError.new('Wrong type of client_queue passed to Dnsruby::Resolver# send_async - should have been Queue, was #{client_queue.class}')])
         return
@@ -1059,13 +1056,13 @@ module Dnsruby
       #  @TODO@ Also, should have option to speak only to configured resolvers (not follow authoritative chain)
       #
       if queue.empty?
-        log_and_raise('Severe internal error - Queue empty in handle_queue_event')
+        Dnsruby.log_and_raise('Severe internal error - Queue empty in handle_queue_event')
       end
       event_id, event_type, response, error = queue.pop
       #  We should remove this packet from the list of outstanding packets for this query
       _resolver, _msg, client_query_id, _retry_count = id
       if id != event_id
-        log_and_raise("Serious internal error!! #{id} expected, #{event_id} received")
+        Dnsruby.log_and_raise("Serious internal error!! #{id} expected, #{event_id} received")
       end
       #       @mutex.synchronize{
       @parent.single_res_mutex.synchronize {
@@ -1078,7 +1075,7 @@ module Dnsruby
         if event_type == Resolver::EventType::RECEIVED ||
               event_type == Resolver::EventType::ERROR
           unless outstanding.include?(id)
-            log_and_raise("Query id not on outstanding list! #{outstanding.length} items. #{id} not on #{outstanding}")
+            Dnsruby.log.error("Query id not on outstanding list! #{outstanding.length} items. #{id} not on #{outstanding}")
           end
           outstanding.delete(id)
         end
@@ -1208,7 +1205,7 @@ module Dnsruby
       #       @mutex.synchronize{
       _query, _client_queue, s_queue, _outstanding = @query_list[client_query_id]
       if s_queue != select_queue
-        log_and_raise("Serious internal error : expected select queue #{s_queue}, got #{select_queue}")
+        Dnsruby.log_and_raise("Serious internal error : expected select queue #{s_queue}, got #{select_queue}")
       end
       stop_querying(client_query_id)
       #  @TODO@ Does the client want notified at this point?
@@ -1221,7 +1218,7 @@ module Dnsruby
       #       @mutex.synchronize {
       _query, client_queue, s_queue, _outstanding = @query_list[client_query_id]
       if s_queue != select_queue
-        log_and_raise("Serious internal error : expected select queue #{s_queue}, got #{select_queue}")
+        Dnsruby.log_and_raise("Serious internal error : expected select queue #{s_queue}, got #{select_queue}")
       end
       if response.rcode == RCode.NXDOMAIN
         send_result(client_queue, client_query_id, select_queue, response, NXDomain.new)
@@ -1237,7 +1234,7 @@ module Dnsruby
       _resolver, _msg, client_query_id, _retry_count = query_id
       _query, client_queue, s_queue, _outstanding = @query_list[client_query_id]
       if s_queue != select_queue
-        log_and_raise("Serious internal error : expected select queue #{s_queue}, got #{select_queue}")
+        Dnsruby.log_and_raise("Serious internal error : expected select queue #{s_queue}, got #{select_queue}")
       end
       #       For some errors, we immediately send result. For others, should we retry?
       #       Either :

data/lib/dnsruby/resource/CAA.rb

@@ -26,7 +26,7 @@ module Dnsruby
       # The value for the property_tag
       attr_accessor :property_value
       # The value for the flag
-      attr_accessor :flag
+      attr_writer :flag
 
       def from_hash(hash) #:nodoc: all
         @property_tag = hash[:property_tag]
@@ -43,7 +43,7 @@ module Dnsruby
       end
 
       def from_string(input) #:nodoc: all
-        matches = (/(\d+) (issuewild|issue|iodef) "(.+)"$/).match(input)
+        matches = (/(\d+) (issuewild|issue|iodef|contactemail|contactphone) "(.+)"$/).match(input)
         @flag = matches[1]
         @property_tag = matches[2]
         @property_value = matches[3]

data/lib/dnsruby/resource/DNSKEY.rb

@@ -313,6 +313,8 @@ module Dnsruby
           elsif [Algorithms.DSA,
               Algorithms.DSA_NSEC3_SHA1].include?(@algorithm)
             @public_key = dsa_key
+          elsif [Algorithms.ECDSAP256SHA256, Algorithms.ECDSAP384SHA384].include?(@algorithm)
+            @public_key = ec_key(Algorithms.ECDSAP256SHA256 == @algorithm ? 'prime256v1' : 'secp384r1')
           end
         end
         #  @TODO@ Support other key encodings!
@@ -377,6 +379,22 @@ module Dnsruby
 
         pkey
       end
+
+      # RFC6605, section 4
+      # ECDSA public keys consist of a single value, called "Q" in FIPS
+      # 186-3.  In DNSSEC keys, Q is a simple bit string that represents the
+      # uncompressed form of a curve point, "x | y".
+      def ec_key(curve = 'prime256v1')
+        group = OpenSSL::PKey::EC::Group.new(curve)
+        pkey = OpenSSL::PKey::EC.new(group)
+
+        # DNSSEC pub does not have first octet that determines whether it's uncompressed
+        # or compressed form, but it's required by OpenSSL to parse EC point correctly
+        point_from_pub = "\x04" + @key.to_s # octet string, \x04 prefix determines uncompressed
+        pkey.public_key = OpenSSL::PKey::EC::Point.new(group, point_from_pub)
+
+        pkey
+      end
     end
   end
 end

data/lib/dnsruby/resource/NSEC3PARAM.rb

@@ -85,7 +85,7 @@ module Dnsruby
       #       end
       # 
       def from_data(data) #:nodoc: all
-        hash_alg, flags, iterations, salt_length, salt = data
+        hash_alg, flags, iterations, _salt_length, salt = data
         self.hash_alg=(hash_alg)
         self.flags=(flags)
         self.iterations=(iterations)