dnsruby 1.70.0 → 1.72.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dc686d217ec8e77f7abacc6b43390f892920c36a99f88f30f10dd55945b262b
-  data.tar.gz: 4763e50a42d153c3921c40cdadd273259fa882007da3dbc43b2098d50d895be1
+  metadata.gz: 59e143e5c778c710c41fc8773f011abe1bdb6502604202d41d2dc953af051792
+  data.tar.gz: 6fd89c7fe716e10af20c5b494102a47d8d33e51a5258b48dd959099266e7e7c8
 SHA512:
-  metadata.gz: 0550b91ea605ae46381df4eb119b7457cef365f0981b90185479b5e490fede56fd72323b9c98b4e4f886bf16925fc6b268c6d0f753196d5cb6f1daaea05499e1
-  data.tar.gz: 3a16635ca644a6d4654bdaa9d83c7c5e0bba69289ffa59e2ad69994099b03b2e15bc2eeaf521200104d860e5127a1066bb41e39f5492c8ee010438a9c81c9a93
+  metadata.gz: 313f1b89fb446ce5c1f19d8910e1fe6ed21ef3f392b680e980bbedc9d98a7f5bb0844c52aa9422df6b525f0bcc4c249541c0e23b0cf3bcf8f139c8f98b4de913
+  data.tar.gz: 870efeeb297acf83b0a0c1b9cb5d832e138480e37bf8723986d74d43997998773195936bb4e5a035f579bb2c93806ce94a03bdc39d6c7e41fedb56fb303d1b80

data/.github/workflows/ci.yml

@@ -6,8 +6,14 @@ jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
-        ruby: [ '2.6', '2.7', '3.0', '3.1', '3.2' ] # , 'ruby-head' ]
+        ruby: [ '3.1', '3.2', '3.3' ] # , 'ruby-head' ]
+        rubyopt: ['']
+        include:
+          - ruby: '3.3'
+            rubyopt: "--enable-frozen-string-literal --debug-frozen-string-literal"
+
     name: Ruby ${{ matrix.ruby }} tests
     steps:
       - uses: actions/checkout@v2
@@ -15,9 +21,6 @@ jobs:
         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
+          bundler-cache: true
+      - name: Run tests ${{ matrix.rubyopt }}
+        run: bundle exec rake test RUBYOPT="${{ matrix.rubyopt }}"

data/RELEASE_NOTES.md

@@ -1,5 +1,17 @@
 # Release Notes
 
+## v.1.72.1
+
+* Add issuemail CAA record support - thanks Ryan Doherty!
+
+## v.1.72.0
+
+* Fix compatibility with the `--enable-string-literal` Ruby option - thanks Jean byroot Boussier!
+
+## v.1.71.0
+
+* Fix assigning public_key in ECDSA - thanks Jiří Kubíček!
+
 ## v.1.70.0
 
 * OpenSSL 3 support

data/Rakefile

@@ -27,6 +27,7 @@ def create_task(task_name, test_suite_filespec)
 end
 
 create_task(:test,         'test/ts_dnsruby.rb')
+create_task(:dnskey,         'test/tc_dnskey.rb')
 create_task(:test_offline, 'test/ts_offline.rb')
 create_task(:test_online,  'test/ts_online.rb')
 create_task(:soak,         'test/tc_soak.rb')

data/dnsruby.gemspec

@@ -38,7 +38,7 @@ DNSSEC NSEC3 support.'
   s.add_development_dependency 'rake', '>= 13.0.6'
   s.add_development_dependency 'minitest', '~> 5.18.0'
   s.add_development_dependency 'rubydns', '>= 2.0.2'
-  s.add_development_dependency 'nio4r', '>= 2.5.8'
+  s.add_development_dependency 'nio4r', '>= 2.7.0'
   s.add_development_dependency 'minitest-display', '>= 0.3.1'
   s.add_development_dependency('yard', '>= 0.9')
   # s.add_development_dependency('io-event', '>=1.1.7')

data/lib/dnsruby/bit_mapping.rb

@@ -15,7 +15,7 @@ module Dnsruby
 
     # Converts from a binary string to a number, e.g. "\x01\x00" => 256
     def binary_string_to_number(string)
-      string = string.clone.force_encoding(Encoding::ASCII_8BIT)
+      string = string.b
       string.bytes.inject(0) do |number, byte|
         number * 256 + byte.ord
       end
@@ -25,7 +25,7 @@ module Dnsruby
     # Converts a number to a binary encoded string, e.g. 256 => "\x01\x00"
     def number_to_binary_string(number, min_length = 0)
       assert_non_negative(number)
-      binary_string = ''.force_encoding(Encoding::ASCII_8BIT)
+      binary_string = ''.b
 
       while number > 0
         byte_value = number & 0xFF

data/lib/dnsruby/code_mappers.rb

@@ -70,7 +70,8 @@ module Dnsruby
     #  (RFC3597)
     #  See typesbyval and typesbyname, these beasts have the same functionality
     def Classes.classesbyname(name) #:nodoc: all
-      name.upcase!;
+      name = name.upcase
+
       if to_code(name)
         return to_code(name)
       end
@@ -202,7 +203,7 @@ module Dnsruby
     #  mnemonic. If the TYPE mapping is not specified the generic mnemonic
     #  TYPE### is returned.
     def Types.typesbyname(name)  #:nodoc: all
-      name.upcase!
+      name = name.upcase
 
       if to_code(name)
         return to_code(name)

data/lib/dnsruby/ipv6.rb

@@ -57,14 +57,14 @@ module Dnsruby
       when IPv6
         return arg
       when String
-        address = ''
+        address = +''
         if Regex_8Hex =~ arg
           arg.scan(/[0-9A-Fa-f]+/) {|hex| address << [hex.hex].pack('n')}
         elsif Regex_CompressedHex =~ arg
           prefix = $1
           suffix = $2
-          a1 = ''
-          a2 = ''
+          a1 = +''
+          a2 = +''
           prefix.scan(/[0-9A-Fa-f]+/) {|hex| a1 << [hex.hex].pack('n')}
           suffix.scan(/[0-9A-Fa-f]+/) {|hex| a2 << [hex.hex].pack('n')}
           omitlen = 16 - a1.length - a2.length
@@ -80,8 +80,8 @@ module Dnsruby
         elsif Regex_CompressedHex4Dec =~ arg
           prefix, suffix, a, b, c, d = $1, $2, $3.to_i, $4.to_i, $5.to_i, $6.to_i
           if (0..255) === a && (0..255) === b && (0..255) === c && (0..255) === d
-            a1 = ''
-            a2 = ''
+            a1 = +''
+            a2 = +''
             prefix.scan(/[0-9A-Fa-f]+/) {|hex| a1 << [hex.hex].pack('n')}
             suffix.scan(/[0-9A-Fa-f]+/) {|hex| a2 << [hex.hex].pack('n')}
             omitlen = 12 - a1.length - a2.length

data/lib/dnsruby/message/encoder.rb

@@ -1,7 +1,7 @@
 module Dnsruby
 class MessageEncoder #:nodoc: all
   def initialize
-    @data = ''
+    @data = +''
     @names = {}
     yield self if block_given?
   end

data/lib/dnsruby/message/message.rb

@@ -408,7 +408,7 @@ module Dnsruby
     end
 
     def to_s
-      s = ''  # the output string to return
+      s = +''  # the output string to return
 
       if @answerfrom && (! @answerfrom.empty?)
         s << ";; Answer received from #{@answerfrom} (#{@answersize} bytes)\n;;\n"
@@ -457,7 +457,7 @@ module Dnsruby
 
 
     def old_to_s
-      retval = ''
+      retval = +''
 
       if (@answerfrom != nil && @answerfrom != '')
         retval = retval + ";; Answer received from #{@answerfrom} (#{@answersize} bytes)\n;;\n"

data/lib/dnsruby/recursor.rb

@@ -500,7 +500,7 @@ module Dnsruby
         return nil
       end
 
-      known_zone.sub!(/\.*$/, ".")
+      known_zone = known_zone.sub(/\.*$/, ".")
 
       ns = [] # Array of AddressCaches (was array of array of addresses)
       @@mutex.synchronize{

data/lib/dnsruby/resource/CAA.rb

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

data/lib/dnsruby/resource/DNSKEY.rb

@@ -392,15 +392,22 @@ module Dnsruby
       # 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
-        public_key_with_prefix = "\x04" + @key.to_s
-        pkey = OpenSSL::PKey::EC.new(group, public_key_with_prefix)
-
-        pkey
-
+        dnskey_bn = OpenSSL::BN.new("\x04" + @key, 2)
+        key_point = OpenSSL::PKey::EC::Point.new(group, dnskey_bn)
+        
+        asn1 = OpenSSL::ASN1::Sequence.new(
+          [
+            OpenSSL::ASN1::Sequence.new([
+              OpenSSL::ASN1::ObjectId.new("id-ecPublicKey"),
+              OpenSSL::ASN1::ObjectId.new(group.curve_name)
+            ]),
+            OpenSSL::ASN1::BitString.new(key_point.to_octet_string(:uncompressed))
+          ]
+        )
+        OpenSSL::PKey::EC.new(asn1.to_der)
       end
     end
   end
-end
+end

data/lib/dnsruby/resource/GPOS.rb

@@ -104,7 +104,7 @@ module Dnsruby
       end
 
       def self.build_rdata(longitude, latitude, altitude)
-        binary_string = ''.force_encoding('ASCII-8BIT')
+        binary_string = ''.b
 
         binary_string << longitude.length.chr
         binary_string << longitude

data/lib/dnsruby/resource/NSEC.rb

@@ -152,7 +152,7 @@ module Dnsruby
       end
 
       def self.encode_types(nsec)
-        output = ''
+        output = +''
         # types represents all 65536 possible RR types.
         # Split up types into sets of 256 different types.
         type_codes = []
@@ -171,7 +171,7 @@ module Dnsruby
 
           unless types_to_go.empty?
             #  Then create the bitmap for them
-            bitmap = ''
+            bitmap = +''
             #  keep on adding them until there's none left
             pos = 0
             bitmap_pos = 0

data/lib/dnsruby/resource/NXT.rb

@@ -95,7 +95,7 @@ class NXT < RR
     next_domain = Name.create(next_domain) if next_domain.is_a?(String)
     types = TypeBitmap.from_type_codes(types) if types.is_a?(Array)
 
-    binary_string = ''.force_encoding('ASCII-8BIT')
+    binary_string = ''.b
     binary_string << next_domain.canonical
     binary_string << BitMapping.reverse_binary_string_bits(types.to_binary_string)
     binary_string

data/lib/dnsruby/resource/TSIG.rb

@@ -234,7 +234,7 @@ module Dnsruby
       def verify_common(response)#:nodoc: all
         tsig_rr = response.tsig
 
-	if (!tsig_rr)
+	      if (!tsig_rr)
           response.tsigerror = RCode.FORMERR
           response.tsigstate = :Failed
           return false

data/lib/dnsruby/resource/TXT.rb

@@ -63,7 +63,7 @@ module Dnsruby
         unquoted = false
         seen_strings = false
         pos = 0
-        input.sub!(/^\s*\(\s*/, "")
+        input = input.sub(/^\s*\(\s*/, "")
         input.sub!(/\s*\)\s*$/, "")
         input.each_char {|c|
           if (((c == "'") || (c == '"')) && (!in_escaped) && (!unquoted))

data/lib/dnsruby/select_thread.rb

@@ -414,12 +414,12 @@ module Dnsruby
       #  Keep buffer for all TCP sockets, and return
       #  to select after reading available data. Once all data has been received,
       #  then process message.
-      buf=""
+      buf = +""
       expected_length = 0
       @@mutex.synchronize {
         buf, expected_length = @@tcp_buffers[socket]
         if (!buf)
-          buf = ""
+          buf = +""
           expected_length = 2
           @@tcp_buffers[socket]=[buf, expected_length]
         end
@@ -443,7 +443,7 @@ module Dnsruby
 
             return false
           end
-          buf << input
+          buf << input if input
         rescue
           #  Oh well - better luck next time!
           return false
@@ -455,7 +455,7 @@ module Dnsruby
           #  We just read the data_length field. Now we need to start reading that many bytes.
           @@mutex.synchronize {
             answersize = buf.unpack('n')[0]
-            @@tcp_buffers[socket] = ["", answersize]
+            @@tcp_buffers[socket] = [+"", answersize]
           }
           return tcp_read(socket)
         else

data/lib/dnsruby/single_verifier.rb

@@ -773,7 +773,7 @@ module Dnsruby
         }.to_s # @TODO@ worry about wildcards here?
         rec.ttl = old_ttl
         if (RUBY_VERSION >= "1.9")
-          data.force_encoding("ASCII-8BIT")
+          data.force_encoding(Encoding::BINARY)
         end
         sig_data += data
       end

data/lib/dnsruby/version.rb

@@ -1,3 +1,3 @@
 module Dnsruby
-  VERSION = '1.70.0'
+  VERSION = '1.72.1'
 end

data/lib/dnsruby/zone_transfer.rb

@@ -138,7 +138,7 @@ module Dnsruby
                 send_message(socket, msg)
                 next
               end
-              raise ResolvError.new(rcode.string);
+              raise ResolvError.new(rcode.string)
             end
 
             if (response.question[0].qtype != @transfer_type)

data/test/spec_helper.rb

@@ -5,8 +5,12 @@ if Warning.respond_to?(:[]=)
 end
 
 if ENV['RUN_EXTRA_TASK'] == 'TRUE'
-  require 'coveralls'
-  Coveralls.wear!
+  unless "test".frozen?
+    # Coverall setup term-ansi-color which isn't yet frozen string literal compatible
+    # Ref: https://github.com/flori/term-ansicolor/pull/38
+    require 'coveralls'
+    Coveralls.wear!
+  end
 
   require 'simplecov'
 

data/test/tc_caa.rb

@@ -25,6 +25,7 @@ class TestCAA < Minitest::Test
     {'foo.com. IN CAA 0 issue "ca.example.net"' => [0, 'issue', 'ca.example.net'],
      'foo.com. IN CAA 1 issue "ca.example.net"' => [1, 'issue', 'ca.example.net'],
      'foo.com. IN CAA 0 issuewild "ca.example.net"' => [0, 'issuewild', 'ca.example.net'],
+     'foo.com. IN CAA 0 issuemail "ca.example.net"' => [0, 'issuemail', 'ca.example.net'],
      'foo.com. IN CAA 0 iodef "mailto:security@example.com"' => [0, 'iodef', 'mailto:security@example.com'],
      'foo.com. IN CAA 0 issue "ca.example.net; account=230123"' => [0, 'issue', 'ca.example.net; account=230123']
     }.each do |text, data|

data/test/tc_dns.rb

@@ -25,7 +25,7 @@ class TestDNS < Minitest::Test
   end
 
   def test_ipv4_address
-    Dnsruby::DNS.open { |dns| dns.getnames(Dnsruby::IPv4.create("221.186.184.68")) }
+    Dnsruby::DNS.open { |dns| dns.getnames(Dnsruby::IPv4.create("8.8.8.8")) }
   end
 
   # def test_resolv_rb_api

data/test/tc_ecdsa.rb

@@ -0,0 +1,27 @@
+require_relative 'spec_helper'
+
+Dnsruby::TheLog.level = Logger::DEBUG
+
+class VerifierTest < Minitest::Test
+
+  def test_ecdsa
+    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
+
+    name = 'carlgo11.com'
+    type = 'A'
+    klass = 'IN'
+
+    begin
+      answer = resolver.query(name, type, klass)
+      print answer
+    rescue Exception => e
+      fatal_error("query failed: #{e}")
+    end
+  end
+end

data/test/tc_gpos.rb

@@ -93,7 +93,7 @@ class TestGPOS < Minitest::Test
     response_binary = "E0\x84\x80\x00\x01\x00\x01\x00\x01\x00\x01\x01a\adnsruby\x03com\x00\x00\e\x00\x01\xC0\f\x00\e\x00\x01\x00\x00*0\x00\x0F\x0410.0\x0420.0\x0430.0\xC0\x0E\x00\x02\x00\x01\x00\x00*0\x00\x06\x03ns1\xC0\x0E\xC0F\x00\x01\x00\x01\x00\x00*0\x00\x04\x7F\x00\x00\x01"
     message_object = Message.decode(response_binary)
     reconstructed_binary = message_object.encode
-    assert_equal response_binary.force_encoding('ASCII-8BIT'), reconstructed_binary
+    assert_equal response_binary.b, reconstructed_binary
   end
 end
 

data/test/tc_message.rb

@@ -86,7 +86,7 @@ class TestMessage < Minitest::Test
   end
 
   def test_equals
-    response_as_string = "\x10\a\x81\x90\x00\x01\x00\x04\x00\x00\x00\x06\x03cnn\x03com\x00\x00\x02\x00\x01\xC0\f\x00\x02\x00\x01\x00\x01QC\x00\x14\x03ns3\ntimewarner\x03net\x00\xC0\f\x00\x02\x00\x01\x00\x01QC\x00\x11\x03ns2\x03p42\x06dynect\xC04\xC0\f\x00\x02\x00\x01\x00\x01QC\x00\x06\x03ns1\xC0)\xC0\f\x00\x02\x00\x01\x00\x01QC\x00\x06\x03ns1\xC0I\xC0%\x00\x01\x00\x01\x00\x001\xA2\x00\x04\xC7\aD\xEE\xC0E\x00\x01\x00\x01\x00\x00\xB1\x0E\x00\x04\xCC\r\xFA*\xC0b\x00\x01\x00\x01\x00\x009`\x00\x04\xCCJl\xEE\xC0t\x00\x01\x00\x01\x00\x00\xBDg\x00\x04\xD0NF*\xC0t\x00\x1C\x00\x01\x00\x00\x00\xBB\x00\x10 \x01\x05\x00\x00\x90\x00\x01\x00\x00\x00\x00\x00\x00\x00B\x00\x00)\x0F\xA0\x00\x00\x80\x00\x00\x00".force_encoding("ASCII-8BIT")
+    response_as_string = "\x10\a\x81\x90\x00\x01\x00\x04\x00\x00\x00\x06\x03cnn\x03com\x00\x00\x02\x00\x01\xC0\f\x00\x02\x00\x01\x00\x01QC\x00\x14\x03ns3\ntimewarner\x03net\x00\xC0\f\x00\x02\x00\x01\x00\x01QC\x00\x11\x03ns2\x03p42\x06dynect\xC04\xC0\f\x00\x02\x00\x01\x00\x01QC\x00\x06\x03ns1\xC0)\xC0\f\x00\x02\x00\x01\x00\x01QC\x00\x06\x03ns1\xC0I\xC0%\x00\x01\x00\x01\x00\x001\xA2\x00\x04\xC7\aD\xEE\xC0E\x00\x01\x00\x01\x00\x00\xB1\x0E\x00\x04\xCC\r\xFA*\xC0b\x00\x01\x00\x01\x00\x009`\x00\x04\xCCJl\xEE\xC0t\x00\x01\x00\x01\x00\x00\xBDg\x00\x04\xD0NF*\xC0t\x00\x1C\x00\x01\x00\x00\x00\xBB\x00\x10 \x01\x05\x00\x00\x90\x00\x01\x00\x00\x00\x00\x00\x00\x00B\x00\x00)\x0F\xA0\x00\x00\x80\x00\x00\x00".b
     message = Message.decode(response_as_string)
     assert(message == message, message.to_s)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dnsruby
 version: !ruby/object:Gem::Version
-  version: 1.70.0
+  version: 1.72.1
 platform: ruby
 authors:
 - Alex Dalitz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-11 00:00:00.000000000 Z
+date: 2024-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.8
+        version: 2.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.8
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: minitest-display
   requirement: !ruby/object:Gem::Requirement
@@ -254,6 +254,7 @@ files:
 - test/tc_dns.rb
 - test/tc_dnskey.rb
 - test/tc_ds.rb
+- test/tc_ecdsa.rb
 - test/tc_encoding.rb
 - test/tc_escapedchars.rb
 - test/tc_gpos.rb
@@ -335,7 +336,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.2.30
 signing_key:
 specification_version: 4
 summary: Ruby DNS(SEC) implementation