openfact 6.1.0 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4daa243a80d8ba47b89553843beda2cb577af1592688fc50824b28b4453c4e72
-  data.tar.gz: 1e1cbf1a2817cf2eb906ed791fd58bc60d0b1acaa229ace93e8a55d2f353c758
+  metadata.gz: 8ec1e87aeff5006c3da9300d30a0a0afeed9091c895d8062ce4afe1c52755303
+  data.tar.gz: 169e48d951c9cde33b143897b4553d78f1617a2102c5d8d562c22b9b788bb125
 SHA512:
-  metadata.gz: 1791dc19b98a3676c9adcbc03df513ba5907d123159de09e6a67317ecdee1003eb5c1ea057b9099d81972c10f39e55a9f73f02f5a498918cc7fd227a710990b6
-  data.tar.gz: ba01bd6bf64dfe485897a0be96bcb8f7686b8500298f3205b28c7d8f20905b3d4db9530e11221be1e5bc55e92370eea7d82f0dcc80d82eaf58d19b4f6b74a861
+  metadata.gz: 714c4becbbc91916e4158e510029509df78092d5ea1ac2dbff9bda114fb4be2cd4bb2c72bb37f8d402188412d176567bd8e502d608bc445df61f4141493e3f1d
+  data.tar.gz: 7a7bfc29a6a408334203f3c45fddf959e62208bea87f8a7c9e3c76ad08e41ad1ca8a0eec812336bbdffc8ba93e246a8ba03b7b9301252d779ede5691cf494d43

data/lib/facter/resolvers/ec2.rb

@@ -19,9 +19,7 @@ module Facter
 
         def read_facts(fact_name)
           if fact_name == :metadata
-            metadata = {}
-            query_for_metadata(EC2_METADATA_ROOT_URL, metadata)
-            @fact_list[:metadata] = metadata
+            @fact_list[:metadata] = read_metadata
           else
             @fact_list[:userdata] = get_data_from(EC2_USERDATA_ROOT_URL).strip.force_encoding('UTF-8')
           end
@@ -29,9 +27,29 @@ module Facter
           @fact_list[fact_name]
         end
 
+        # A failed root listing means no EC2-compatible metadata service is
+        # available, so there is no metadata to report. Once the root listing
+        # succeeds, any failed child request rejects the whole result.
+        def read_metadata
+          root_listing = root_metadata_listing
+          return {} unless root_listing
+
+          add_metadata_entries(EC2_METADATA_ROOT_URL, root_listing, {})
+        end
+
+        def root_metadata_listing
+          get_metadata_from(EC2_METADATA_ROOT_URL)
+        rescue StandardError => e
+          log.debug("EC2 metadata is not available: #{e.message}")
+          nil
+        end
+
         def query_for_metadata(url, container)
-          metadata = get_metadata_from(url)
-          metadata.each_line do |line|
+          add_metadata_entries(url, get_metadata_from(url), container)
+        end
+
+        def add_metadata_entries(url, listing, container)
+          listing.each_line do |line|
             next if line.empty?
 
             http_path_component = build_path_component(line)

data/lib/facter/resolvers/hostname.rb

@@ -9,6 +9,11 @@ module Facter
 
       init_resolver
 
+      # Upper bound, in seconds, for the fqdn lookup. A hung name service
+      # otherwise stalls fact collection until the agent's runtimeout fires
+      # (OpenVoxProject/openvox#485). Only applied on Rubies that honour it.
+      FQDN_LOOKUP_TIMEOUT = 10
+
       class << self
         private
 
@@ -48,14 +53,27 @@ module Facter
 
         def retrieve_with_addrinfo(host)
           begin
-            name = Socket.getaddrinfo(host, 0, Socket::AF_UNSPEC, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME)[0]
+            addr = Addrinfo.getaddrinfo(host, 0, Socket::AF_UNSPEC, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME,
+                                        **addrinfo_options)[0]
           rescue StandardError => e
-            @log.debug("Socket.getaddrinfo failed to retrieve fqdn for hostname #{host} with: #{e}")
+            @log.debug("Addrinfo.getaddrinfo failed to retrieve fqdn for hostname #{host} with: #{e}")
             return
           end
-          return if name.nil? || name.empty? || host == name[2] || name[2] == name[3]
 
-          name[2]
+          name = addr&.canonname
+          return if name.nil? || name.empty? || host == name || name == addr.ip_address
+
+          name
+        end
+
+        # Addrinfo.getaddrinfo only honours the timeout keyword from Ruby 4.0
+        # on. Older MRI accepts and ignores it; JRuby does not accept it.
+        def addrinfo_options
+          addrinfo_timeout_supported? ? { timeout: FQDN_LOOKUP_TIMEOUT } : {}
+        end
+
+        def addrinfo_timeout_supported?
+          RUBY_ENGINE == 'ruby' && Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('4.0')
         end
 
         def exists_and_valid_fqdn?(fqdn, hostname)

data/lib/facter/resolvers/linux/hostname.rb

@@ -10,6 +10,11 @@ module Facter
 
         init_resolver
 
+        # Upper bound, in seconds, for the fqdn lookup. A hung name service
+        # otherwise stalls fact collection until the agent's runtimeout fires
+        # (OpenVoxProject/openvox#485). Only applied on Rubies that honour it.
+        FQDN_LOOKUP_TIMEOUT = 10
+
         class << self
           private
 
@@ -65,16 +70,35 @@ module Facter
 
           def retrieve_fqdn_for_host(host)
             begin
-              name = Socket.getaddrinfo(host, 0, Socket::AF_UNSPEC, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME)[0]
+              addr = Addrinfo.getaddrinfo(host, 0, Socket::AF_UNSPEC, Socket::SOCK_STREAM, nil, Socket::AI_CANONNAME,
+                                          **addrinfo_options)[0]
             rescue StandardError => e
-              log.debug("Socket.getaddrinfo failed to retrieve fqdn for hostname #{host} with: #{e}")
+              log.debug("Addrinfo.getaddrinfo failed to retrieve fqdn for hostname #{host} with: #{e}")
+              # The name service is not answering. The FFI lookup below has no
+              # timeout and holds the GVL while it waits, so do not try it.
+              return if lookup_timed_out?(e)
             end
 
-            return name[2] if !name.nil? && !name.empty? && host != name[2] && name[2] != name[3]
+            name = addr&.canonname
+            return name if exists_and_not_empty?(name) && host != name && name != addr.ip_address
 
             retrieve_fqdn_for_host_with_ffi(host)
           end
 
+          def lookup_timed_out?(error)
+            error.is_a?(Errno::ETIMEDOUT) || (defined?(IO::TimeoutError) && error.is_a?(IO::TimeoutError))
+          end
+
+          # Addrinfo.getaddrinfo only honours the timeout keyword from Ruby 4.0
+          # on. Older MRI accepts and ignores it; JRuby does not accept it.
+          def addrinfo_options
+            addrinfo_timeout_supported? ? { timeout: FQDN_LOOKUP_TIMEOUT } : {}
+          end
+
+          def addrinfo_timeout_supported?
+            RUBY_ENGINE == 'ruby' && Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('4.0')
+          end
+
           def retrieve_fqdn_for_host_with_ffi(host)
             require_relative '../../../facter/util/resolvers/ffi/hostname'
 

data/lib/facter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Facter
-  VERSION = '6.1.0' unless defined?(VERSION)
+  VERSION = '6.2.1' unless defined?(VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openfact
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.1
 platform: ruby
 authors:
 - OpenVox Project
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.90.0
+        version: 1.91.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.90.0
+        version: 1.91.0
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -1287,7 +1287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.20
 specification_version: 4
 summary: OpenFact, a system inventory tool
 test_files: []