resolv 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3c2610a9201afa7c69fdadb89357cfe4c44e0bec4f52c430ef6328897ebda0a
-  data.tar.gz: 06f9f301afe24165dd53683dd11c503a69cb367cc76f5885709552bab7444d61
+  metadata.gz: f0831b1c59e6ce967c8d36a7a5ddc962985c81ace17de45165dd7fb420398725
+  data.tar.gz: fab3f3c3175d01df8e15383cd83e0b4526e35e21da55fa373bc62419555c66f4
 SHA512:
-  metadata.gz: 15dafa5ebe1d4ba98fb40a1bec5d700beee853090230b08fcfc0a8c4ebd6cebf2657e4618c6de664a17a1b0ae0c8fa183c27dd0739957389140a5d001fc2d92a
-  data.tar.gz: e930fb5af7be91b0342d855486979f070aaf04c02ca054dd8a6dfb70313dcc2fe8037f52e0d9e61b31df21a7452c841e5c3f48889c85532155285ad7100948eb
+  metadata.gz: cd0445cd68e2cf4cab80734796084377eb151969df16b29a86865602604852c0830ce7cdb28bbaac8aa7f2ce3abb6c55d1fee8145799965aa385b5b522fdbbf6
+  data.tar.gz: 4ea52516c3cad7419b6234c6aac594894f7a723fa1e9dacffeb3ccc6d935811a7a27ecbf5db898a467cc4a19acf67866cbe0a17270dd30b830eb28bd6d3820a2

data/.github/workflows/push_gem.yml

@@ -23,24 +23,24 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
         with:
           egress-policy: audit
 
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Set up Ruby
-        uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.0
+        uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0
         with:
           bundler-cache: true
           ruby-version: ruby
 
       - name: Publish to RubyGems
-        uses: rubygems/release-gem@612653d273a73bdae1df8453e090060bb4db5f31 # v1
+        uses: rubygems/release-gem@a25424ba2ba8b387abc8ef40807c2c85b96cbe32 # v1.1.1
 
       - name: Create GitHub release
         run: |
           tag_name="$(git describe --tags --abbrev=0)"
           gh release create "${tag_name}" --verify-tag --generate-notes
         env:
-          GITHUB_TOKEN: ${{ secrets.MATZBOT_GITHUB_WORKFLOW_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

data/.github/workflows/test.yml

@@ -6,7 +6,7 @@ jobs:
   ruby-versions:
     uses: ruby/actions/.github/workflows/ruby_versions.yml@master
     with:
-      engine: cruby
+      engine: cruby-jruby
       min_version: 2.5
 
   build:
@@ -32,3 +32,21 @@ jobs:
         bundler-cache: true
     - name: Run test
       run: bundle exec rake test
+      timeout-minutes: 3
+      continue-on-error: ${{ startsWith(matrix.ruby, 'jruby') }}
+    - name: Build package
+      id: build
+      shell: bash
+      run: |
+        if ruby -e 'exit RUBY_VERSION>="3.0."'; then
+          bundle exec rake build
+          set pkg/*.gem
+          echo pkg=$1 >> $GITHUB_OUTPUT
+        fi
+    - name: Install gem
+      run: |
+        gem install ${{ steps.build.outputs.pkg }}
+        ruby -rresolv -e 'puts $LOADED_FEATURES.grep(/resolv/)'
+        ruby -rresolv -e 'puts Resolv::VERSION'
+      if: ${{ steps.build.outputs.pkg }}
+      continue-on-error: ${{ startsWith(matrix.ruby, 'jruby') }}

data/.gitignore

@@ -1,3 +1,4 @@
+/.build/
 /.bundle/
 /.yardoc
 /_yardoc/

data/Gemfile

@@ -5,3 +5,4 @@ gemspec
 gem "rake"
 gem "test-unit"
 gem "test-unit-ruby-core"
+gem "ruby-core-tasks", github: "ruby/ruby-core-tasks"

data/README.md

@@ -14,15 +14,18 @@ gem 'resolv'
 
 And then execute:
 
-    $ bundle install
+```bash
+bundle install
+```
 
 Or install it yourself as:
 
-    $ gem install resolv
+```bash
+gem install resolv
+```
 
 ## Usage
 
-
 ```ruby
 p Resolv.getaddress "www.ruby-lang.org"
 p Resolv.getname "210.251.121.214"
@@ -44,4 +47,3 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/ruby/resolv.
-

data/Rakefile

@@ -1,7 +1,15 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
 
+if RUBY_ENGINE == "ruby"
+  require "ruby-core/extensiontask"
+  helper = Bundler::GemHelper.instance
+  extask = RubyCore::ExtensionTask.new(helper.gemspec)
+  task :test => :compile
+end
+
 Rake::TestTask.new(:test) do |t|
+  t.libs.unshift(*extask.libs) if extask
   t.libs << "test/lib"
   t.ruby_opts << "-rhelper"
   t.test_files = FileList["test/**/test_*.rb"]

data/ext/win32/resolv/extconf.rb

@@ -1,5 +1,5 @@
 require 'mkmf'
-if have_library('iphlpapi', 'GetNetworkParams')
+if RUBY_ENGINE == "ruby" and have_library('iphlpapi', 'GetNetworkParams')
   create_makefile('win32/resolv')
 else
   File.write('Makefile', "all clean install:\n\t@echo Done: $(@)\n")

data/ext/win32/resolv/lib/resolv.rb

@@ -0,0 +1,144 @@
+# frozen_string_literal: false
+=begin
+= Win32 DNS and DHCP I/F
+
+=end
+
+module Win32
+  module Resolv
+    def self.get_hosts_path
+      path = get_hosts_dir
+      path = File.expand_path('hosts', path)
+      File.exist?(path) ? path : nil
+    end
+
+    def self.get_resolv_info
+      search, nameserver = get_info
+      if search.empty?
+        search = nil
+      else
+        search.delete("")
+        search.uniq!
+      end
+      if nameserver.empty?
+        nameserver = nil
+      else
+        nameserver.delete("")
+        nameserver.delete("0.0.0.0")
+        nameserver.uniq!
+      end
+      [ search, nameserver ]
+    end
+  end
+end
+
+begin
+  require 'win32/resolv.so'
+rescue LoadError
+end
+
+module Win32
+#====================================================================
+# Windows NT
+#====================================================================
+  module Resolv
+    begin
+      require 'win32/registry'
+      module SZ
+        refine Registry do
+          # ad hoc workaround for broken registry
+          def read_s(key)
+            type, str = read(key)
+            unless type == Registry::REG_SZ
+              warn "Broken registry, #{name}\\#{key} was #{Registry.type2name(type)}, ignored"
+              return String.new
+            end
+            str
+          end
+        end
+      end
+      using SZ
+    rescue LoadError
+      require "open3"
+    end
+
+    TCPIP_NT = 'SYSTEM\CurrentControlSet\Services\Tcpip\Parameters'
+
+    class << self
+      private
+      def get_hosts_dir
+        get_item_property(TCPIP_NT, 'DataBasePath', expand: true)
+      end
+
+      def get_info
+        search = nil
+        nameserver = get_dns_server_list
+
+        slist = get_item_property(TCPIP_NT, 'SearchList')
+        search = slist.split(/,\s*/) unless slist.empty?
+
+        if add_search = search.nil?
+          search = []
+          nvdom = get_item_property(TCPIP_NT, 'NV Domain')
+
+          unless nvdom.empty?
+            @search = [ nvdom ]
+            udmnd = get_item_property(TCPIP_NT, 'UseDomainNameDevolution').to_i
+            if udmnd != 0
+              if /^\w+\./ =~ nvdom
+                devo = $'
+              end
+            end
+          end
+        end
+
+        ifs = if defined?(Win32::Registry)
+                Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT + '\Interfaces') do |reg|
+                  reg.keys
+                rescue Registry::Error
+                  []
+                end
+              else
+                cmd = "Get-ChildItem 'HKLM:\\#{TCPIP_NT}\\Interfaces' | ForEach-Object { $_.PSChildName }"
+                output, _ = Open3.capture2('powershell', '-Command', cmd)
+                output.split(/\n+/)
+              end
+
+        ifs.each do |iface|
+          next unless ns = %w[NameServer DhcpNameServer].find do |key|
+            ns = get_item_property(TCPIP_NT + '\Interfaces' + "\\#{iface}", key)
+            break ns.split(/[,\s]\s*/) unless ns.empty?
+          end
+
+          next if (nameserver & ns).empty?
+
+          if add_search
+            [ 'Domain', 'DhcpDomain' ].each do |key|
+              dom = get_item_property(TCPIP_NT + '\Interfaces' + "\\#{iface}", key)
+              unless dom.empty?
+                search.concat(dom.split(/,\s*/))
+                break
+              end
+            end
+          end
+        end
+        search << devo if add_search and devo
+        [ search.uniq, nameserver.uniq ]
+      end
+
+      def get_item_property(path, name, expand: false)
+        if defined?(Win32::Registry)
+          Registry::HKEY_LOCAL_MACHINE.open(path) do |reg|
+            expand ? reg.read_s_expand(name) : reg.read_s(name)
+          rescue Registry::Error
+            ""
+          end
+        else
+          cmd = "Get-ItemProperty -Path 'HKLM:\\#{path}' -Name '#{name}' -ErrorAction SilentlyContinue | Select-Object -ExpandProperty '#{name}'"
+          output, _ = Open3.capture2('powershell', '-Command', cmd)
+          output.strip
+        end
+      end
+    end
+  end
+end

data/ext/win32/resolv/resolv.c

@@ -13,6 +13,8 @@ w32error_make_error(DWORD e)
     return rb_class_new_instance(1, &code, rb_path2class("Win32::Resolv::Error"));
 }
 
+NORETURN(static void w32error_raise(DWORD e));
+
 static void
 w32error_raise(DWORD e)
 {

data/lib/resolv.rb

@@ -3,11 +3,7 @@
 require 'socket'
 require 'timeout'
 require 'io/wait'
-
-begin
-  require 'securerandom'
-rescue LoadError
-end
+require 'securerandom'
 
 # Resolv is a thread-aware DNS resolver library written in Ruby.  Resolv can
 # handle multiple DNS requests concurrently without blocking the entire Ruby
@@ -37,7 +33,7 @@ end
 
 class Resolv
 
-  VERSION = "0.5.0"
+  VERSION = "0.6.1"
 
   ##
   # Looks up the first IP address for +name+.
@@ -83,9 +79,22 @@ class Resolv
 
   ##
   # Creates a new Resolv using +resolvers+.
+  #
+  # If +resolvers+ is not given, a hash, or +nil+, uses a Hosts resolver and
+  # and a DNS resolver.  If +resolvers+ is a hash, uses the hash as
+  # configuration for the DNS resolver.
 
-  def initialize(resolvers=nil, use_ipv6: nil)
-    @resolvers = resolvers || [Hosts.new, DNS.new(DNS::Config.default_config_hash.merge(use_ipv6: use_ipv6))]
+  def initialize(resolvers=(arg_not_set = true; nil), use_ipv6: (keyword_not_set = true; nil))
+    if !keyword_not_set && !arg_not_set
+      warn "Support for separate use_ipv6 keyword is deprecated, as it is ignored if an argument is provided. Do not provide a positional argument if using the use_ipv6 keyword argument.", uplevel: 1
+    end
+
+    @resolvers = case resolvers
+    when Hash, nil
+      [Hosts.new, DNS.new(DNS::Config.default_config_hash.merge(resolvers || {}))]
+    else
+      resolvers
+    end
   end
 
   ##
@@ -164,13 +173,16 @@ class Resolv
 
   class ResolvTimeout < Timeout::Error; end
 
+  WINDOWS = /mswin|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM || ::RbConfig::CONFIG['host_os'] =~ /mswin/
+  private_constant :WINDOWS
+
   ##
   # Resolv::Hosts is a hostname resolver that uses the system hosts file.
 
   class Hosts
-    if /mswin|mingw|cygwin/ =~ RUBY_PLATFORM and
+    if WINDOWS
       begin
-        require 'win32/resolv'
+        require 'win32/resolv' unless defined?(Win32::Resolv)
         DefaultFileName = Win32::Resolv.get_hosts_path || IO::NULL
       rescue LoadError
       end
@@ -615,16 +627,10 @@ class Resolv
       }
     end
 
-    if defined? SecureRandom
-      def self.random(arg) # :nodoc:
-        begin
-          SecureRandom.random_number(arg)
-        rescue NotImplementedError
-          rand(arg)
-        end
-      end
-    else
-      def self.random(arg) # :nodoc:
+    def self.random(arg) # :nodoc:
+      begin
+        SecureRandom.random_number(arg)
+      rescue NotImplementedError
         rand(arg)
       end
     end
@@ -656,8 +662,20 @@ class Resolv
       }
     end
 
-    def self.bind_random_port(udpsock, bind_host="0.0.0.0") # :nodoc:
-      begin
+    case RUBY_PLATFORM
+    when *[
+      # https://www.rfc-editor.org/rfc/rfc6056.txt
+      # Appendix A. Survey of the Algorithms in Use by Some Popular Implementations
+      /freebsd/, /linux/, /netbsd/, /openbsd/, /solaris/,
+      /darwin/, # the same as FreeBSD
+    ] then
+      def self.bind_random_port(udpsock, bind_host="0.0.0.0") # :nodoc:
+        udpsock.bind(bind_host, 0)
+      end
+    else
+      # Sequential port assignment
+      def self.bind_random_port(udpsock, bind_host="0.0.0.0") # :nodoc:
+        # Ephemeral port number range recommended by RFC 6056
         port = random(1024..65535)
         udpsock.bind(bind_host, port)
       rescue Errno::EADDRINUSE, # POSIX
@@ -980,13 +998,13 @@ class Resolv
             next unless keyword
             case keyword
             when 'nameserver'
-              nameserver.concat(args)
+              nameserver.concat(args.each(&:freeze))
             when 'domain'
               next if args.empty?
-              search = [args[0]]
+              search = [args[0].freeze]
             when 'search'
               next if args.empty?
-              search = args
+              search = args.each(&:freeze)
             when 'options'
               args.each {|arg|
                 case arg
@@ -997,22 +1015,22 @@ class Resolv
             end
           }
         }
-        return { :nameserver => nameserver, :search => search, :ndots => ndots }
+        return { :nameserver => nameserver.freeze, :search => search.freeze, :ndots => ndots.freeze }.freeze
       end
 
       def Config.default_config_hash(filename="/etc/resolv.conf")
         if File.exist? filename
-          config_hash = Config.parse_resolv_conf(filename)
+          Config.parse_resolv_conf(filename)
+        elsif WINDOWS
+          require 'win32/resolv' unless defined?(Win32::Resolv)
+          search, nameserver = Win32::Resolv.get_resolv_info
+          config_hash = {}
+          config_hash[:nameserver] = nameserver if nameserver
+          config_hash[:search] = [search].flatten if search
+          config_hash
         else
-          if /mswin|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM
-            require 'win32/resolv'
-            search, nameserver = Win32::Resolv.get_resolv_info
-            config_hash = {}
-            config_hash[:nameserver] = nameserver if nameserver
-            config_hash[:search] = [search].flatten if search
-          end
+          {}
         end
-        config_hash || {}
       end
 
       def lazy_initialize
@@ -2107,7 +2125,14 @@ class Resolv
 
       attr_reader :ttl
 
-      ClassHash = {} # :nodoc:
+      ClassHash = Module.new do
+        module_function
+
+        def []=(type_class_value, klass)
+          type_value, class_value = type_class_value
+          Resource.const_set(:"Type#{type_value}_Class#{class_value}", klass)
+        end
+      end
 
       def encode_rdata(msg) # :nodoc:
         raise NotImplementedError.new
@@ -2145,7 +2170,9 @@ class Resolv
       end
 
       def self.get_class(type_value, class_value) # :nodoc:
-        return ClassHash[[type_value, class_value]] ||
+        cache = :"Type#{type_value}_Class#{class_value}"
+
+        return (const_defined?(cache) && const_get(cache)) ||
                Generic.create(type_value, class_value)
       end
 
@@ -2574,7 +2601,7 @@ class Resolv
         end
 
         ##
-        # Flags for this proprty:
+        # Flags for this property:
         # - Bit 0 : 0 = not critical, 1 = critical
 
         attr_reader :flags

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: resolv
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Tanaka Akira
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-11 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
 description: Thread-aware DNS resolver library in Ruby.
 email:
@@ -31,7 +30,7 @@ files:
 - bin/console
 - bin/setup
 - ext/win32/resolv/extconf.rb
-- ext/win32/resolv/lib/win32/resolv.rb
+- ext/win32/resolv/lib/resolv.rb
 - ext/win32/resolv/resolv.c
 - lib/resolv.rb
 - resolv.gemspec
@@ -42,7 +41,6 @@ licenses:
 metadata:
   homepage_uri: https://github.com/ruby/resolv
   source_code_uri: https://github.com/ruby/resolv
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -57,8 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Thread-aware DNS resolver library in Ruby.
 test_files: []

data/ext/win32/resolv/lib/win32/resolv.rb

@@ -1,135 +0,0 @@
-# frozen_string_literal: false
-=begin
-= Win32 DNS and DHCP I/F
-
-=end
-
-require 'win32/registry'
-
-module Win32
-  module Resolv
-    API = Registry::API
-    Error = Registry::Error
-
-    def self.get_hosts_path
-      path = get_hosts_dir
-      path = File.expand_path('hosts', path)
-      File.exist?(path) ? path : nil
-    end
-
-    def self.get_resolv_info
-      search, nameserver = get_info
-      if search.empty?
-        search = nil
-      else
-        search.delete("")
-        search.uniq!
-      end
-      if nameserver.empty?
-        nameserver = nil
-      else
-        nameserver.delete("")
-        nameserver.delete("0.0.0.0")
-        nameserver.uniq!
-      end
-      [ search, nameserver ]
-    end
-  end
-end
-
-begin
-  require 'win32/resolv.so'
-rescue LoadError
-end
-
-module Win32
-#====================================================================
-# Windows NT
-#====================================================================
-  module Resolv
-    module SZ
-      refine Registry do
-        # ad hoc workaround for broken registry
-        def read_s(key)
-          type, str = read(key)
-          unless type == Registry::REG_SZ
-            warn "Broken registry, #{name}\\#{key} was #{Registry.type2name(type)}, ignored"
-            return String.new
-          end
-          str
-        end
-      end
-    end
-    using SZ
-
-    TCPIP_NT = 'SYSTEM\CurrentControlSet\Services\Tcpip\Parameters'
-
-    class << self
-      private
-      def get_hosts_dir
-        Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT) do |reg|
-          reg.read_s_expand('DataBasePath')
-        end
-      end
-
-      def get_info
-        search = nil
-        nameserver = get_dns_server_list
-        Registry::HKEY_LOCAL_MACHINE.open(TCPIP_NT) do |reg|
-          begin
-            slist = reg.read_s('SearchList')
-            search = slist.split(/,\s*/) unless slist.empty?
-          rescue Registry::Error
-          end
-
-          if add_search = search.nil?
-            search = []
-            begin
-              nvdom = reg.read_s('NV Domain')
-              unless nvdom.empty?
-                @search = [ nvdom ]
-                if reg.read_i('UseDomainNameDevolution') != 0
-                  if /^\w+\./ =~ nvdom
-                    devo = $'
-                  end
-                end
-              end
-            rescue Registry::Error
-            end
-          end
-
-          reg.open('Interfaces') do |h|
-            h.each_key do |iface, |
-              h.open(iface) do |regif|
-                next unless ns = %w[NameServer DhcpNameServer].find do |key|
-                  begin
-                    ns = regif.read_s(key)
-                  rescue Registry::Error
-                  else
-                    break ns.split(/[,\s]\s*/) unless ns.empty?
-                  end
-                end
-                next if (nameserver & ns).empty?
-
-                if add_search
-                  begin
-                    [ 'Domain', 'DhcpDomain' ].each do |key|
-                      dom = regif.read_s(key)
-                      unless dom.empty?
-                        search.concat(dom.split(/,\s*/))
-                        break
-                      end
-                    end
-                  rescue Registry::Error
-                  end
-                end
-              end
-            end
-          end
-          search << devo if add_search and devo
-        end
-        [ search.uniq, nameserver.uniq ]
-      end
-    end
-  end
-end