resolv 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82cf1416dbd548bac4a243078cb8b93a0990f906169eff49752840d3145d0a0a
-  data.tar.gz: baf98405285dd3a553873a2f10e20d188e1e73cf066bf5f430b8d206c553978f
+  metadata.gz: 56680c64e918a60193f43e3ca4a7093db20bbe66f516da79a159d9a3c05860d8
+  data.tar.gz: f017a2c89fbcdf946b69ce57d41a67537b73f54ec6e99d18cc62865fd6ec1633
 SHA512:
-  metadata.gz: 646bccbb40a992224d079ddd8a586a231a69f67f628d424f79e1079dce4fcc346254ec0288d874ec356e199cfffb5c694b0cea8b51ed2435299a72ec29d88759
-  data.tar.gz: 28f34daddd2b5e3262e1b6b4381933c40683c8938129efad0914d495ae522f0c0b53bcbd6108073c1b3b1b4beb7f67d5e8af4b2af17387812c7275bed11c696d
+  metadata.gz: d57f866a30bc2b8da6dbcdb8c65d0a5db4630af4ec0244aa490e37370ba7b27c3031e153e76055e7f4f63114bd477944326b05dbb7319f97bf59478f8518d76a
+  data.tar.gz: f07e85287b3bb9973c90900c1fbdc272e193d91493e63b407e696cc9f52de29fc0716f2ec11aba56d37d89a12b6d3fec55d21bd8ce756f02d56577940c454b06

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'weekly'

data/.github/workflows/test.yml

@@ -0,0 +1,31 @@
+name: test
+
+on: [push, pull_request]
+
+jobs:
+  ruby-versions:
+    uses: ruby/actions/.github/workflows/ruby_versions.yml@master
+    with:
+      engine: cruby
+      min_version: 2.5
+
+  build:
+    needs: ruby-versions
+    name: build (${{ matrix.ruby }} / ${{ matrix.os }})
+    strategy:
+      matrix:
+        ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
+        os: [ ubuntu-latest, macos-latest, windows-latest ]
+        include:
+          - ruby: mswin
+            os: windows-latest
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - name: Run test
+      run: bundle exec rake test

data/.gitignore

@@ -0,0 +1,10 @@
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gemspec
+
+gem "rake"
+gem "test-unit"
+gem "test-unit-ruby-core"

data/Rakefile

@@ -0,0 +1,10 @@
+require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test/lib"
+  t.ruby_opts << "-rhelper"
+  t.test_files = FileList["test/**/test_*.rb"]
+end
+
+task :default => :test

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "resolv"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start(__FILE__)

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/resolv.rb

@@ -37,7 +37,7 @@ end
 
 class Resolv
 
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 
   ##
   # Looks up the first IP address for +name+.
@@ -194,17 +194,10 @@ class Resolv
           File.open(@filename, 'rb') {|f|
             f.each {|line|
               line.sub!(/#.*/, '')
-              addr, hostname, *aliases = line.split(/\s+/)
+              addr, *hostnames = line.split(/\s+/)
               next unless addr
-              @addr2name[addr] = [] unless @addr2name.include? addr
-              @addr2name[addr] << hostname
-              @addr2name[addr].concat(aliases)
-              @name2addr[hostname] = [] unless @name2addr.include? hostname
-              @name2addr[hostname] << addr
-              aliases.each {|n|
-                @name2addr[n] = [] unless @name2addr.include? n
-                @name2addr[n] << addr
-              }
+              (@addr2name[addr] ||= []).concat(hostnames)
+              hostnames.each {|hostname| (@name2addr[hostname] ||= []) << addr}
             }
           }
           @name2addr.each {|name, arr| arr.reverse!}
@@ -1219,13 +1212,6 @@ class Resolv
 
       class Str # :nodoc:
         def initialize(string)
-          # A label is limited to 63 octets. [RFC 1035 2.3.4] Checking it here
-          # makes it an invariant of the object: every label, however it was
-          # built, fits in its length octet and cannot wrap it. Callers turn
-          # this into the error their own contract promises.
-          if string.bytesize > 63
-            raise ArgumentError, "DNS label is too long (#{string.bytesize} bytes, max 63): #{string.inspect}"
-          end
           @string = string
           # case insensivity of DNS labels doesn't apply non-ASCII characters. [RFC 4343]
           # This assumes @string is given in ASCII compatible encoding.
@@ -1271,26 +1257,7 @@ class Resolv
         when Name
           return arg
         when String
-          # A hostname is runtime data rather than a programming mistake, so
-          # both size limits surface as ResolvError to stay rescuable alongside
-          # the rest of name resolution. The type check below is a caller
-          # mistake and keeps raising ArgumentError.
-          begin
-            labels = Label.split(arg)
-          rescue ArgumentError => e
-            raise ResolvError.new(e.message)
-          end
-          # Label::Str enforces the per-label limit. Only the total is knowable
-          # here, and it counts the encoded form, so size starts at 1 for the
-          # root label's terminating zero octet. [RFC 1035 2.3.4, 3.1]
-          size = 1
-          labels.each do |label|
-            size += 1 + label.string.bytesize
-            if size > 255
-              raise ResolvError.new("DNS name is too long (#{size} octets, max 255): #{arg.inspect}")
-            end
-          end
-          return Name.new(labels, /\.\z/ =~ arg ? true : false)
+          return Name.new(Label.split(arg), /\.\z/ =~ arg ? true : false)
         else
           raise ArgumentError.new("cannot interpret as DNS name: #{arg.inspect}")
         end
@@ -1412,24 +1379,12 @@ class Resolv
                @rd == other.rd &&
                @ra == other.ra &&
                @rcode == other.rcode &&
-               question_equal?(other.question) &&
+               @question == other.question &&
                @answer == other.answer &&
                @authority == other.authority &&
                @additional == other.additional
       end
 
-      # A question holds the resource class itself, and decoding creates a fresh
-      # class for each unknown type, so the classes cannot be compared by
-      # identity alone.
-      private def question_equal?(other_question) # :nodoc:
-        return false unless @question.length == other_question.length
-        @question.zip(other_question) {|(name, typeclass), (o_name, o_typeclass)|
-          return false unless name == o_name &&
-                              Resource::Generic.type_class_equal?(typeclass, o_typeclass)
-        }
-        return true
-      end
-
       def add_question(name, typeclass)
         @question << [Name.create(name), typeclass]
       end
@@ -1536,15 +1491,8 @@ class Resolv
         end
 
         def put_string(d)
-          s = d.to_s
-          # A character-string is prefixed by a single length octet, so it can
-          # hold at most 255 octets. [RFC 1035 3.3] Reject anything longer to
-          # avoid silently truncating the length to its low 8 bits (mod 256).
-          if s.bytesize > 255
-            raise ArgumentError, "character-string is too long (#{s.bytesize} bytes, max 255): #{s.inspect}"
-          end
-          self.put_pack("C", s.bytesize)
-          @data << s
+          self.put_pack("C", d.length)
+          @data << d
         end
 
         def put_string_list(ds)
@@ -1574,17 +1522,7 @@ class Resolv
         end
 
         def put_label(d)
-          s = d.to_s
-          # Label::Str applies this limit when a label is built, so what is left
-          # for here is a raw string handed straight to put_labels. The two ways
-          # an over-long label goes wrong differ: 64 to 255 octets write a length
-          # octet in the reserved or compression pointer range, and 256 or more
-          # wrap it mod 256. Either way the encoded name stops being the name the
-          # caller asked for. [RFC 1035 2.3.4, 4.1.4]
-          if s.bytesize > 63
-            raise ArgumentError, "DNS label is too long (#{s.bytesize} bytes, max 63): #{s.inspect}"
-          end
-          self.put_string(s)
+          self.put_string(d.to_s)
         end
       end
 
@@ -1710,9 +1648,6 @@ class Resolv
           prev_index = @index
           save_index = nil
           d = []
-          # size counts the encoded form, so it starts at 1 for the root
-          # label's terminating zero octet. [RFC 1035 3.1]
-          size = 1
           while true
             raise DecodeError.new("limit exceeded") if @limit <= @index
             case @data.getbyte(@index)
@@ -1733,21 +1668,13 @@ class Resolv
               end
               @index = idx
             else
-              l = self.get_label
-              d << l
-              size += 1 + l.string.bytesize
-              raise DecodeError.new("name label data exceed 255 octets") if size > 255
+              d << self.get_label
             end
           end
         end
 
         def get_label
           return Label::Str.new(self.get_string)
-        rescue ArgumentError => e
-          # A length octet of 64..191 is reserved rather than a label length,
-          # but this decoder used to read it as one. [RFC 1035 4.1.4] Report it
-          # the way the rest of a malformed message is reported.
-          raise DecodeError.new(e.message)
         end
 
         def get_question
@@ -1936,9 +1863,8 @@ class Resolv
           key_name = :"key#{key_number}"
           c.const_set(:KeyName, key_name)
           c.const_set(:KeyNumber, key_number)
-          # Not registered in a constant or in ClassHash. ClassHash creates a
-          # class for every unknown SvcParamKey, so registering them
-          # permanently would let a malicious response exhaust memory.
+          self.const_set(:"Key#{key_number}", c)
+          ClassHash[key_name] = ClassHash[key_number] = c
           return c
         end
       end
@@ -2236,28 +2162,12 @@ class Resolv
           return self.new(msg.get_bytes)
         end
 
-        # create makes a fresh class for each decoded resource, so the type and
-        # class values have to be compared instead of the class itself.
-        def self.type_class_equal?(klass, other) # :nodoc:
-          return true if klass.equal?(other)
-          Generic > klass && Generic > other &&
-            klass::TypeValue == other::TypeValue &&
-            klass::ClassValue == other::ClassValue
-        end
-
-        def ==(other) # :nodoc:
-          return other.is_a?(Generic) &&
-                 Generic.type_class_equal?(self.class, other.class) &&
-                 @data == other.data
-        end
-
         def self.create(type_value, class_value) # :nodoc:
           c = Class.new(Generic)
           c.const_set(:TypeValue, type_value)
           c.const_set(:ClassValue, class_value)
-          # Not registered in a constant or in ClassHash. get_class creates a
-          # class for every unknown (type, class) pair, so registering them
-          # permanently would let a malicious response exhaust memory.
+          Generic.const_set("Type#{type_value}_Class#{class_value}", c)
+          ClassHash[[type_value, class_value]] = c
           return c
         end
       end
@@ -2627,8 +2537,70 @@ class Resolv
         TypeValue = 255 # :nodoc:
       end
 
+      ##
+      # CAA resource record defined in RFC 8659
+      #
+      # These records identify certificate authority allowed to issue
+      # certificates for the given domain.
+
+      class CAA < Resource
+        TypeValue = 257
+
+        ##
+        # Creates a new CAA for +flags+, +tag+ and +value+.
+
+        def initialize(flags, tag, value)
+          unless (0..255) === flags
+            raise ArgumentError.new('flags must be an Integer between 0 and 255')
+          end
+          unless (1..15) === tag.bytesize
+            raise ArgumentError.new('length of tag must be between 1 and 15')
+          end
+
+          @flags = flags
+          @tag = tag
+          @value = value
+        end
+
+        ##
+        # Flags for this proprty:
+        # - Bit 0 : 0 = not critical, 1 = critical
+
+        attr_reader :flags
+
+        ##
+        # Property tag ("issue", "issuewild", "iodef"...).
+
+        attr_reader :tag
+
+        ##
+        # Property value.
+
+        attr_reader :value
+
+        ##
+        # Whether the critical flag is set on this property.
+
+        def critical?
+          flags & 0x80 != 0
+        end
+
+        def encode_rdata(msg) # :nodoc:
+          msg.put_pack('C', @flags)
+          msg.put_string(@tag)
+          msg.put_bytes(@value)
+        end
+
+        def self.decode_rdata(msg) # :nodoc:
+          flags, = msg.get_unpack('C')
+          tag = msg.get_string
+          value = msg.get_bytes
+          self.new flags, tag, value
+        end
+      end
+
       ClassInsensitiveTypes = [ # :nodoc:
-        NS, CNAME, SOA, PTR, HINFO, MINFO, MX, TXT, LOC, ANY
+        NS, CNAME, SOA, PTR, HINFO, MINFO, MX, TXT, LOC, ANY, CAA
       ]
 
       ##
@@ -2854,7 +2826,7 @@ class Resolv
           attr_reader :target
 
           ##
-          # The service paramters for the target host.
+          # The service parameters for the target host.
 
           attr_reader :params
 

data/resolv.gemspec

@@ -0,0 +1,29 @@
+name = File.basename(__FILE__, ".gemspec")
+version = ["lib", Array.new(name.count("-")+1).join("/")].find do |dir|
+  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
+    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
+  end rescue nil
+end
+
+Gem::Specification.new do |spec|
+  spec.name          = name
+  spec.version       = version
+  spec.authors       = ["Tanaka Akira"]
+  spec.email         = ["akr@fsij.org"]
+
+  spec.summary       = %q{Thread-aware DNS resolver library in Ruby.}
+  spec.description   = %q{Thread-aware DNS resolver library in Ruby.}
+  spec.homepage      = "https://github.com/ruby/resolv"
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
+  spec.licenses      = ["Ruby", "BSD-2-Clause"]
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+
+  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  end
+  spec.bindir        = "exe"
+  spec.executables   = []
+  spec.require_paths = ["lib"]
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: resolv
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Tanaka Akira
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2024-03-19 00:00:00.000000000 Z
 dependencies: []
 description: Thread-aware DNS resolver library in Ruby.
 email:
@@ -16,9 +16,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
+- ".github/workflows/test.yml"
+- ".gitignore"
+- Gemfile
 - LICENSE.txt
 - README.md
+- Rakefile
+- bin/console
+- bin/setup
 - lib/resolv.rb
+- resolv.gemspec
 homepage: https://github.com/ruby/resolv
 licenses:
 - Ruby
@@ -40,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.6.0.dev
 specification_version: 4
 summary: Thread-aware DNS resolver library in Ruby.
 test_files: []