dnsruby 1.60.0 → 1.60.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9cbbb2842379ff348cbf0c96c37b83b6d1d083b
-  data.tar.gz: 8671561563ae35728ea271a47b8d83755f2a2922
+  metadata.gz: cfb5e0f9d0b657bba3a0ad8d8edde456e253d638
+  data.tar.gz: 4c80209c7c2e6823e1958e9c79c0665805c0f9a0
 SHA512:
-  metadata.gz: 5d1835489ddf5269acb69de004d0a5c699ab80b7189dcbe1479aa838785d8fe939b3f30bd83ed8e32d23c37f265fb991c31956026528a33524410bb2d4256f4b
-  data.tar.gz: bd9c08507b6ebeddb5b8b85be6434c2a7245f754c59aba459dc897960b385bee84db3cccc91ceb198f01c011afa1a81d35533de7ba120a9eaca7082393eb46a8
+  metadata.gz: 2f53ebb527626d922813c53b4c8cd8daa73ff22721a812ea55963c28201b44da43c7be779316fb9e3041a7183e0c7c3ef99faf73a69fb9fb9845b70ce428f31f
+  data.tar.gz: b93907dc484ddd07a0fcd2b8eaeebbc92d261c23bd2046ce7c6159c75a3fe350eae485977b6afcac44bcdf999501d2eb4255f92118f1e8f0e682193d74db9dfa

data/RELEASE_NOTES.md

@@ -1,5 +1,19 @@
 # Release Notes
 
+## v1.60.1
+
+* DNSSEC validation switched OFF by default (but can still be switched on)
+* Add APL RR support (thanks Manabu Sonoda)
+* Various test fixes (thanks Keith Bennett)
+* 'include' issues fixed (thanks Keith Bennett!)
+* Fixnum replacement (thanks Keith Bennett)
+* Zone transfer fixes (thanks Manabu Sonoda)
+* Name decoding fix
+* MX record passing error now raised
+* CAA RR support (thanks Richard Luther)
+* TLSA RR support (thanks Manabu Sonoda)
+
+
 ## v1.60.0
 
 * TCP multi-packet support fixed

data/lib/dnsruby/bit_mapping.rb

@@ -120,7 +120,7 @@ module Dnsruby
     def assert_non_negative(number)
       unless number.is_a?(Integer) && number >= 0
         raise ArgumentError.new(
-                  "Parameter must be a nonnegative Integer (Fixnum, Bignum) " +
+                  "Parameter must be a nonnegative Integer " +
                       "but is #{number.inspect} (a #{number.class})")
       end
     end

data/lib/dnsruby/code_mapper.rb

@@ -103,7 +103,7 @@ module Dnsruby
         else
           unknown_string(arg)
         end
-      elsif (arg.kind_of?Fixnum)
+      elsif arg.kind_of?(Integer)
         if (array.values[arg] != nil)
           @code = arg
           @string = array.values[@code]
@@ -146,7 +146,7 @@ module Dnsruby
     end
 
     def CodeMapper.to_code(arg)
-      if (arg.kind_of?Fixnum)
+      if arg.kind_of?(Integer)
         return arg
       else
         return @@arrays[self].stringsdown[arg.downcase]
@@ -154,7 +154,7 @@ module Dnsruby
     end
 
     def <=>(other)
-      if (other.class == Fixnum)
+      if other.is_a?(Integer)
         self.code <=> other
       else
         self.code <=> other.code

data/lib/dnsruby/code_mappers.rb

@@ -150,7 +150,7 @@ module Dnsruby
     CERT      = 37      # RFC 2538
     DNAME     = 39      # RFC 2672
     OPT       = 41      # RFC 2671
-    #     APL       = 42      # RFC 3123
+    APL       = 42      # RFC 3123
     DS        = 43      # RFC 4034
     SSHFP     = 44      # RFC 4255
     IPSECKEY  = 45      # RFC 4025
@@ -160,6 +160,7 @@ module Dnsruby
     DHCID     = 49      # RFC 4701
     NSEC3     = 50      # RFC still pending at time of writing
     NSEC3PARAM= 51      # RFC still pending at time of writing
+    TLSA      = 52      # RFC 6698
     HIP       = 55      # RFC 5205
     SPF       = 99      # RFC 4408
     UINFO     = 100     # non-standard
@@ -173,6 +174,7 @@ module Dnsruby
     MAILB     = 253     # RFC 1035 (MB, MG, MR)
     MAILA     = 254     # RFC 1035 (obsolete - see MX)
     ANY       = 255     # RFC 1035
+    CAA       = 257     # RFC 6844
     DLV       = 32769   # RFC 4431 (informational)
     update()
 
@@ -292,4 +294,4 @@ module Dnsruby
     add_pair("SHA-1", 1)
   end
 
-end
+end

data/lib/dnsruby/config.rb

@@ -73,7 +73,7 @@ module Dnsruby
     #         nameserver (String)
     #         domain (String)
     #         search (String)
-    #         ndots (Fixnum)
+    #         ndots (Integer)
     # 
     #  This method should not normally be called by client code.
     def set_config_info(config_info)

data/lib/dnsruby/dnssec.rb

@@ -261,7 +261,7 @@ module Dnsruby
     def self.try_validation(last_level, last_error, last_error_level, proc, msg, query)   # :nodoc:
       begin
         proc.call(msg, query)
-        last_level = Message::SecurityLevel.new([msg.security_level.code, last_level].max)
+        last_level = Message::SecurityLevel.new([msg.security_level.code, last_level.code].max)
       rescue VerifyError => e
         if (last_error_level < last_level)
           last_error = e.to_s

data/lib/dnsruby/packet_sender.rb

@@ -16,9 +16,12 @@
 require 'dnsruby/select_thread'
 require 'ipaddr'
 # require 'dnsruby/iana_ports'
-include Socket::Constants
 module Dnsruby
+
   class PacketSender # :nodoc: all
+
+    include Socket::Constants
+
     @@authoritative_cache = Cache.new
     @@recursive_cache = Cache.new
 
@@ -402,7 +405,7 @@ module Dnsruby
         @tcp_pipeline_local_port = src_port
         src_address = @ipv6 ? @src_address6 : @src_address
         begin
-          @pipeline_socket = Socket.new(AF_INET, SOCK_STREAM, 0)
+          @pipeline_socket = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0)
           @pipeline_socket.bind(Addrinfo.tcp(src_address, src_port))
           @pipeline_socket.connect(sockaddr)
           Dnsruby.log.debug("Creating socket #{src_address}:#{src_port}")
@@ -541,7 +544,7 @@ module Dnsruby
     end
 
     #  The source port to send queries from
-    #  Returns either a single Fixnum or an Array
+    #  Returns either a single Integer or an Array
     #  e.g. "0", or "[60001, 60002, 60007]"
     # 
     #  Defaults to 0 - random port
@@ -552,7 +555,7 @@ module Dnsruby
       return @src_port
     end
 
-    #  Can be a single Fixnum or a Range or an Array
+    #  Can be a single Integer or a Range or an Array
     #  If an invalid port is selected (one reserved by
     #  IANA), then an ArgumentError will be raised.
     # 
@@ -565,7 +568,7 @@ module Dnsruby
       add_src_port(p)
     end
 
-    #  Can be a single Fixnum or a Range or an Array
+    #  Can be a single Integer or a Range or an Array
     #  If an invalid port is selected (one reserved by
     #  IANA), then an ArgumentError will be raised.
     #  "0" means "any valid port" - this is only a viable

data/lib/dnsruby/resolver.rb

@@ -77,7 +77,7 @@ module Dnsruby
     DefaultRetryDelay = 5
     DefaultPipeLiningMaxQueries = 5
     DefaultPort = 53
-    DefaultDnssec = true
+    DefaultDnssec = false
     AbsoluteMinDnssecUdpSize = 1220
     MinDnssecUdpSize = 4096
     DefaultUDPSize = MinDnssecUdpSize
@@ -603,7 +603,7 @@ module Dnsruby
     end
 
     #  The source port to send queries from
-    #  Returns either a single Fixnum or an Array
+    #  Returns either a single Integer or an Array
     #  e.g. '0', or '[60001, 60002, 60007]'
     #
     #  Defaults to 0 - random port
@@ -611,7 +611,7 @@ module Dnsruby
       @src_port.length == 1 ? @src_port[0] : @src_port
     end
 
-    #  Can be a single Fixnum or a Range or an Array
+    #  Can be a single Integer or a Range or an Array
     #  If an invalid port is selected (one reserved by
     #  IANA), then an ArgumentError will be raised.
     #
@@ -626,7 +626,7 @@ module Dnsruby
       end
     end
 
-    #  Can be a single Fixnum or a Range or an Array
+    #  Can be a single Integer or a Range or an Array
     #  If an invalid port is selected (one reserved by
     #  IANA), then an ArgumentError will be raised.
     #  "0" means "any valid port" - this is only a viable
@@ -653,7 +653,7 @@ module Dnsruby
     end
 
     def Resolver.check_port(p, src_port=[])
-      if p.class != Fixnum
+      unless p.is_a?(Integer)
         tmp_src_ports = Array.new(src_port)
         p.each do |x|
           unless Resolver.check_port(x, tmp_src_ports)
@@ -677,7 +677,7 @@ module Dnsruby
 
     def Resolver.get_ports_from(p)
       a = []
-      if p.class == Fixnum
+      if p.is_a?(Integer)
         a = [p]
       else
         p.each do |x|

data/lib/dnsruby/resource/APL.rb

@@ -0,0 +1,146 @@
+module Dnsruby
+  class Prefix
+    Regex = %r{\A([!])?([12]):(.*)/(\d+)\z}
+    attr_reader :af, :prefix_length, :negative, :address_lenght, :address
+    class << self
+      def create(prefix) #:nodoc:
+        unless md = Regex.match(prefix)
+          raise ArgumentError.new('APL format error')
+        end
+        negative=md[1]
+        af = md[2].to_i
+        prefix_length = md[4].to_i
+        case af
+        when 1
+          if prefix_length > 32 ||
+             prefix_length < 0
+            raise ArgumentError.new('APL IPv4 prefix format error')
+          end
+          address = IPv4.create(md[3])
+        when 2
+          if prefix_length > 128 ||
+             prefix_length < 0
+            raise ArgumentError.new('APL IPv6 prefix format error')
+          end
+          address = IPv6.create(md[3])
+        else
+          raise ArgumentError.new('APL address family error')
+        end
+        address_length = (prefix_length / 8.0).ceil
+
+        Prefix.new(af, prefix_length, negative, address_length, address)
+      end
+    end
+    def initialize(af, prefix_length, negative, address_length, address)
+      @af = af
+      @prefix_length = prefix_length
+      @negative = negative
+      @address_length = address_length
+      @address = address
+      @flag = address_length
+      @flag |= 0x80 if @negative
+    end
+
+    def to_s
+      "#{@negative}#{@af}:#{@address}/#{@prefix_length}"
+    end
+
+    def put_msg(msg) #:nodoc: all
+      msg.put_pack('nCC',@af,@prefix_length,@flag)
+      msg.put_bytes(@address.address[0,@address_length])
+    end
+  end
+  class Prefixes
+    attr_accessor :prefixes
+    class << self
+        def create(arg)
+          case arg
+          when Prefixes
+            return arg
+          when String
+            prefixes = arg.split(/\s/).map { |prefix| Prefix.create(prefix) }
+          when Array
+            prefixes = arg.map { |prefix| Prefix.create(prefix) }
+          else
+            raise ArgumentError.new("APL format erro #{arg}")
+          end
+          Prefixes.new(prefixes)
+        end
+        def create_from_message(msg)
+          prefixes = []
+          while(msg.has_remaining?) do
+            negative = nil
+            af,prefix_length,flag = msg.get_unpack('nCC')
+            negative = '!' if 0x80 & flag == 0x80
+            address_length = flag & 0x7f
+
+            case(af)
+            when 1
+              addr = msg.get_bytes(address_length) + "\0" * (4 - address_length)
+              address = IPv4.new(addr)
+            when 2
+              addr = msg.get_bytes(address_length) + "\0" * (16 - address_length)
+              address = IPv6.new(addr)
+            else
+              raise ArgumentError.new("APL format error")
+            end
+            prefixes.push(Prefix.new(af, prefix_length, negative, address_length, address))
+          end
+
+          Prefixes.new(prefixes)
+        end
+    end
+    def initialize(prefixes)
+      @prefixes = prefixes
+    end
+
+    def to_s
+      @prefixes.map(&:to_s).join(' ')
+    end
+
+    def encode_rdata(msg, _canonical = false) #:nodoc: all
+      @prefixes.each do |prefix|
+        prefix.put_msg(msg)
+      end
+    end
+  end
+  class RR
+    module IN
+      # Class for DNS Address (A) resource records.
+      #
+      # RFC 1035 Section 3.4.1
+      class APL < RR
+        ClassHash[[TypeValue = Types::APL, ClassValue = ClassValue]] = self #:nodoc: all
+
+        # The RR's (Resolv::IPv4) address field
+        attr_accessor :prefixes
+
+        def from_data(data) #:nodoc: all
+          @prefixes = Prefixes.create(data)
+        end
+
+        # Create the RR from a hash
+        def from_hash(hash)
+          @prefixes = Prefixes.create(hash[:prefixes])
+        end
+
+        #  Create the RR from a standard string
+        def from_string(input)
+          @prefixes = Prefixes.create(input)
+        end
+
+        def rdata_to_string
+          @prefixes.to_s
+        end
+
+        def encode_rdata(msg, canonical = false) #:nodoc: all
+          @prefixes.encode_rdata(msg,canonical)
+        end
+
+        def self.decode_rdata(msg) #:nodoc: all
+          new(Prefixes.create_from_message(msg))
+        end
+      end
+    end
+  end
+end

data/lib/dnsruby/resource/CAA.rb

@@ -0,0 +1,70 @@
+# --
+# Copyright 2007 Nominet UK
+# 
+# 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
+    # Class for CAA resource records.
+    # RFC 6844
+    class CAA < RR
+      ClassValue = nil #:nodoc: all
+      TypeValue= Types::CAA #:nodoc: all
+
+      # The property tag for the record (issue|issuewild|iodef)
+      attr_accessor :property_tag
+      # The value for the property_tag
+      attr_accessor :property_value
+      # The value for the flag
+      attr_accessor :flag
+
+      def from_hash(hash) #:nodoc: all
+        @property_tag = hash[:property_tag]
+        @property_value = hash[:property_value]
+        @flag = hash[:flag]
+      end
+
+      def from_data(data) #:nodoc: all
+        @flag, @property_tag, @property_value = data
+      end
+
+      def flag
+        @flag.to_i
+      end
+
+      def from_string(input) #:nodoc: all
+        matches = (/(\d+) (issuewild|issue|iodef) "(.+)"$/).match(input)
+        @flag = matches[1]
+        @property_tag = matches[2]
+        @property_value = matches[3]
+      end
+
+      def rdata_to_string #:nodoc: all
+        "#{flag} #{@property_tag} \"#{@property_value}\""
+      end
+
+      def encode_rdata(msg, canonical=false) #:nodoc: all
+        msg.put_pack('n', flag)
+        msg.put_string(@property_tag)
+        msg.put_string(@property_value)
+      end
+
+      def self.decode_rdata(msg) #:nodoc: all
+        flag, = msg.get_unpack('n')
+        property_tag = msg.get_string
+        property_value = msg.get_string
+        return self.new("#{flag} #{property_tag} \"#{property_value}\"")
+      end
+    end
+  end
+end

data/lib/dnsruby/resource/IN.rb

@@ -54,7 +54,8 @@ module Dnsruby
       Types::HIP => HIP,
       Types::DHCID => DHCID,
       Types::GPOS => GPOS,
-      Types::NXT => NXT
+      Types::NXT => NXT,
+      Types::CAA => CAA,
     } #:nodoc: all
 
     #  module IN contains ARPA Internet specific RRs
@@ -103,3 +104,5 @@ require 'dnsruby/resource/AAAA'
 require 'dnsruby/resource/AFSDB'
 require 'dnsruby/resource/PX'
 require 'dnsruby/resource/SRV'
+require 'dnsruby/resource/APL'
+require 'dnsruby/resource/TLSA'