facter 4.4.1 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74662429c9115d4eb8feca42d49031fa3be3ff42c200a8c6ee58c664f8afa9da
-  data.tar.gz: e1c21ea94af446c6700c27db8c24f150671f7ee8410b8e070436e709ff85fc87
+  metadata.gz: c01a91258966862aa3d5b43fca18899206b64cefa3fd42446ac1c012132e90ea
+  data.tar.gz: 3e1c32c10e166a3dcb8ed55d709b4ce8cbe9c56b9238ed42964519caf48b82be
 SHA512:
-  metadata.gz: 9a1a2529c0fe5df5da517bbcc8b76b2a53c5c138af5d83ebf8dc25b051d28861816ed4b8ab6c1e167ec4c6bcef50df7d68a34abd22f04442f44eaebd499f3bef
-  data.tar.gz: 6c31e966940c2d1a525c5fb1f416b5af15e2b8c57516c92eab6e74be361d198bd6494e26b85316758e7e42ff1eecc6fc3480c3f718b8de2e7d452bcde39911f0
+  metadata.gz: a9f7a49e2297d1dd06b1544118e58a5cba75aa04a5991e61e3450039ff86caa934c30d1d7b584d4432a081d010be6f978f6bc6fef8cfdfa38367ec858f0a2754
+  data.tar.gz: c7793db89e1fd72269eba0b1f195942020a60d699374b661cd87f418be2aff38cb128ab45d0959696e696601c0bb70b7715d85c5c6404bb1aa77e9727e5f659b

data/lib/facter/custom_facts/util/collection.rb

@@ -32,7 +32,7 @@ module LegacyFacter
 
         fact
       rescue StandardError => e
-        log.log_exception("Unable to add fact #{name}: #{e}")
+        log.log_exception(e)
       end
 
       # Add a resolution mechanism for a named fact.  This does not distinguish
@@ -48,6 +48,8 @@ module LegacyFacter
         fact.add(options, &block)
 
         fact
+      rescue StandardError => e
+        log.log_exception(e)
       end
 
       include Enumerable

data/lib/facter/custom_facts/util/fact.rb

@@ -35,7 +35,7 @@ module Facter
       #
       # @api private
       def initialize(name, options = {})
-        @name = name.to_s.downcase.intern
+        @name = LegacyFacter::Util::Normalization.normalize(name.to_s.downcase).intern
 
         @options = options.dup
         extract_ldapname_option!(options)

data/lib/facter/custom_facts/util/normalization.rb

@@ -54,6 +54,10 @@ module LegacyFacter
           raise NormalizationError, "String #{value.inspect} doesn't match the reported encoding #{value.encoding}"
         end
 
+        if value.codepoints.include?(0)
+          raise NormalizationError, "String #{value.inspect} contains a null byte reference; unsupported for all facts."
+        end
+
         value
       rescue EncodingError
         raise NormalizationError, "String encoding #{value.encoding} is not UTF-8 and could not be converted to UTF-8"

data/lib/facter/resolvers/augeas.rb

@@ -17,6 +17,9 @@ module Facter
           @fact_list[:augeas_version] ||= read_augeas_from_gem
 
           @fact_list[fact_name]
+        rescue LoadError => e
+          log.debug("Resolving fact #{fact_name}, but got #{e} at #{e.backtrace[0]}")
+          @fact_list[:augeas_version] = nil
         end
 
         def read_augeas_from_cli

data/lib/facter/resolvers/base_resolver.rb

@@ -27,11 +27,8 @@ module Facter
 
           cache_nil_for_unresolved_facts(fact_name)
         end
-      rescue NoMethodError => e
-        log.debug("Could not resolve #{fact_name}, got #{e} at #{e.backtrace[0]}")
-        @fact_list[fact_name] = nil
       rescue LoadError, NameError => e
-        log.debug("Resolving fact #{fact_name}, but got #{e} at #{e.backtrace[0]}")
+        log.error("Resolving fact #{fact_name}, but got #{e} at #{e.backtrace[0]}")
         @fact_list[fact_name] = nil
       end
 

data/lib/facter/resolvers/dmi.rb

@@ -36,7 +36,7 @@ module Facter
             return unless File.directory?('/sys/class/dmi')
 
             file_content = Facter::Util::FileHelper.safe_read("/sys/class/dmi/id/#{fact_name}", nil)
-                                                   .encode('UTF-8', invalid: :replace)
+            file_content = file_content.encode('UTF-8', invalid: :replace) if file_content
             if files.include?(fact_name.to_s) && file_content
               file_content = file_content.strip
               @fact_list[fact_name] = file_content unless file_content.empty?

data/lib/facter/resolvers/os_release.rb

@@ -69,17 +69,28 @@ module Facter
         def process_id
           return unless @fact_list[:id]
 
+          @fact_list[:id] = 'sles' if /sles_sap/i.match?(@fact_list[:id])
           @fact_list[:id] = 'opensuse' if /opensuse/i.match?(@fact_list[:id])
         end
 
         def process_name
           return unless @fact_list[:name]
 
+          normalize_os_name
           join_os_name
           capitalize_os_name
           append_linux_to_os_name
         end
 
+        def normalize_os_name
+          os_name = @fact_list[:name]
+          @fact_list[:name] = if os_name.downcase.start_with?('sles')
+                                'SLES'
+                              else
+                                os_name
+                              end
+        end
+
         def join_os_name
           os_name = @fact_list[:name]
           @fact_list[:name] = if os_name.downcase.start_with?('red', 'oracle', 'arch', 'manjaro')

data/lib/facter/resolvers/solaris/mountpoints.rb

@@ -25,7 +25,7 @@ module Facter
             @mounts = []
             @auto_home_paths = []
 
-            Facter::Util::Resolvers::FilesystemHelper.read_mountpoints.each do |fs|
+            Facter::Util::Resolvers::FilesystemHelper.read_mountpoints&.each do |fs|
               if fs.name == 'auto_home'
                 @auto_home_paths << fs.mount_point
                 next
@@ -33,26 +33,22 @@ module Facter
 
               next if fs.mount_type == 'autofs'
 
+              mounts = {}
               device = fs.name
               filesystem = fs.mount_type
               path = fs.mount_point
               options = fs.options.split(',').map(&:strip)
 
-              stats = Facter::Util::Resolvers::FilesystemHelper.read_mountpoint_stats(path)
-              size_bytes = stats.bytes_total.abs
-              available_bytes = stats.bytes_available.abs
-
-              used_bytes = stats.bytes_used.abs
-              total_bytes = used_bytes + available_bytes
-              capacity = Facter::Util::Resolvers::FilesystemHelper.compute_capacity(used_bytes, total_bytes)
-
-              size = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(size_bytes)
-              available = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(available_bytes)
-              used = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(used_bytes)
+              mounts = read_stats(path).tap do |hash|
+                hash[:device] = device
+                hash[:filesystem] = filesystem
+                hash[:path] = path
+                hash[:options] = options if options.any?
+              end
 
               @mounts << Hash[Facter::Util::Resolvers::FilesystemHelper::MOUNT_KEYS
                               .zip(Facter::Util::Resolvers::FilesystemHelper::MOUNT_KEYS
-                .map { |v| binding.local_variable_get(v) })]
+                .map { |v| mounts[v] })]
             end
 
             exclude_auto_home_mounts!
@@ -60,6 +56,29 @@ module Facter
             @fact_list[:mountpoints] = @mounts
             @fact_list[fact_name]
           end
+
+          def read_stats(path)
+            begin
+              stats = Facter::Util::Resolvers::FilesystemHelper.read_mountpoint_stats(path)
+              size_bytes = stats.bytes_total.abs
+              available_bytes = stats.bytes_available.abs
+              used_bytes = stats.bytes_used.abs
+              total_bytes = used_bytes + available_bytes
+            rescue Sys::Filesystem::Error
+              size_bytes = used_bytes = available_bytes = 0
+            end
+
+            {
+              size_bytes: size_bytes,
+              available_bytes: available_bytes,
+              used_bytes: used_bytes,
+              total_bytes: total_bytes,
+              capacity: Facter::Util::Resolvers::FilesystemHelper.compute_capacity(used_bytes, total_bytes),
+              size: Facter::Util::Facts::UnitConverter.bytes_to_human_readable(size_bytes),
+              available: Facter::Util::Facts::UnitConverter.bytes_to_human_readable(available_bytes),
+              used: Facter::Util::Facts::UnitConverter.bytes_to_human_readable(used_bytes)
+            }
+          end
         end
       end
     end

data/lib/facter/resolvers/windows/timezone.rb

@@ -22,7 +22,7 @@ module Facter
 
           def codepage
             result = codepage_from_api
-            result.empty? ? codepage_from_registry : result
+            result&.empty? ? codepage_from_registry : result
           end
 
           def codepage_from_registry

data/lib/facter/util/resolvers/filesystem_helper.rb

@@ -33,7 +33,7 @@ module Facter
           private
 
           def force_utf(mounts)
-            mounts.each do |mount|
+            mounts&.each do |mount|
               mount.name.force_encoding('UTF-8')
               mount.mount_type.force_encoding('UTF-8')
               mount.mount_point.force_encoding('UTF-8')

data/lib/facter/util/resolvers/networking/networking.rb

@@ -36,7 +36,9 @@ module Facter
             interfaces = networking_facts[:interfaces]
 
             expand_interfaces(interfaces) unless interfaces.nil?
-            expand_primary_interface(networking_facts, primary) unless primary.nil? || interfaces.nil?
+            return if primary.nil? || interfaces.nil? || networking_facts.nil?
+
+            expand_primary_interface(networking_facts, primary)
           end
 
           def get_scope(ip)
@@ -105,7 +107,7 @@ module Facter
           end
 
           def expand_primary_interface(networking_facts, primary)
-            networking_facts[:interfaces][primary].each do |key, value|
+            networking_facts[:interfaces][primary]&.each do |key, value|
               networking_facts[key] = value unless %i[bindings bindings6].include?(key)
             end
           end

data/lib/facter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.4.2
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-12 00:00:00.000000000 Z
+date: 2023-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake