facter 4.0.52 → 4.1.0

data/lib/facter/resolvers/solaris/ffi/structs.rb

@@ -111,6 +111,18 @@ module Facter
             self[:sin_addr][:s_addr]
           end
         end
+
+        class In6Addr < ::FFI::Struct
+          layout :s_addr, [:uint32_t, 4]
+        end
+
+        class SockaddrIn6 < ::FFI::Struct
+          layout  :sin6_family, :sa_family_t,
+                  :sin6_port, :in_port_t,
+                  :sin6_flowinfo, :uint32_t,
+                  :sin6_addr, In6Addr,
+                  :sin6_scope_id, :uint32_t
+        end
       end
     end
   end

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

@@ -14,23 +14,26 @@ module Facter
             @fact_list.fetch(fact_name) { read_mounts(fact_name) }
           end
 
-          def root_device
-            cmdline = Facter::Util::FileHelper.safe_read('/proc/cmdline')
-            match = cmdline.match(/root=([^\s]+)/)
-            match&.captures&.first
-          end
-
-          def compute_device(device)
-            # If the "root" device, lookup the actual device from the kernel options
-            # This is done because not all systems symlink /dev/root
-            device = root_device if device == '/dev/root'
-            device
+          def exclude_auto_home_mounts!
+            @mounts.reject! do |mount|
+              parent = mount[:path].rpartition('/').first
+              @auto_home_paths.include?(parent)
+            end
           end
 
           def read_mounts(fact_name) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
-            mounts = []
+            @mounts = []
+            @auto_home_paths = []
+
             Facter::Util::Resolvers::FilesystemHelper.read_mountpoints.each do |fs|
-              device = compute_device(fs.name)
+              if fs.name == 'auto_home'
+                @auto_home_paths << fs.mount_point
+                next
+              end
+
+              next if fs.mount_type == 'autofs'
+
+              device = fs.name
               filesystem = fs.mount_type
               path = fs.mount_point
               options = fs.options.split(',').map(&:strip)
@@ -47,11 +50,14 @@ module Facter
               available = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(available_bytes)
               used = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(used_bytes)
 
-              mounts << Hash[Facter::Util::Resolvers::FilesystemHelper::MOUNT_KEYS
-                             .zip(Facter::Util::Resolvers::FilesystemHelper::MOUNT_KEYS
+              @mounts << Hash[Facter::Util::Resolvers::FilesystemHelper::MOUNT_KEYS
+                              .zip(Facter::Util::Resolvers::FilesystemHelper::MOUNT_KEYS
                 .map { |v| binding.local_variable_get(v) })]
             end
-            @fact_list[:mountpoints] = mounts
+
+            exclude_auto_home_mounts!
+
+            @fact_list[:mountpoints] = @mounts
             @fact_list[fact_name]
           end
         end

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

@@ -101,16 +101,31 @@ module Facter
           end
 
           def inet_ntop(lifreq, ss_family)
-            sockaddr = FFI::Sockaddr.new(lifreq.lifru_addr.to_ptr)
-            sockaddr_in = FFI::SockaddrIn.new(sockaddr.to_ptr)
-            ip = FFI::InAddr.new(sockaddr_in[:sin_addr].to_ptr)
-            buffer_size = FFI::INET_ADDRSTRLEN
-            buffer_size = FFI::INET6_ADDRSTRLEN if ss_family == FFI::AF_INET6
+            if ss_family == FFI::AF_INET
+              buffer_size = FFI::INET_ADDRSTRLEN
+              ip = get_ipv4(lifreq)
+            else # FFI::AF_INET6
+              buffer_size = FFI::INET6_ADDRSTRLEN
+              ip = get_ipv6(lifreq)
+            end
+
             buffer = ::FFI::MemoryPointer.new(:char, buffer_size)
 
             FFI::Ioctl.inet_ntop(ss_family, ip.to_ptr, buffer.to_ptr, buffer.size)
           end
 
+          def get_ipv4(lifreq)
+            sockaddr = FFI::Sockaddr.new(lifreq.lifru_addr.to_ptr)
+            sockaddr_in = FFI::SockaddrIn.new(sockaddr.to_ptr)
+            FFI::InAddr.new(sockaddr_in[:sin_addr].to_ptr)
+          end
+
+          def get_ipv6(lifreq)
+            sockaddr = FFI::Sockaddr.new(lifreq.lifru_addr.to_ptr)
+            sockaddr_in6 = FFI::SockaddrIn6.new(sockaddr.to_ptr)
+            FFI::In6Addr.new(sockaddr_in6[:sin6_addr].to_ptr)
+          end
+
           def count_interfaces
             lifnum = FFI::Lifnum.new
             lifnum[:lifn_family] = FFI::AF_UNSPEC

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

@@ -38,7 +38,6 @@ module Facter
                 uuid: uuid,
                 status: status,
                 path: path
-
               }
             end
             zones_fact

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

@@ -17,7 +17,7 @@ module Facter
             @fact_list.fetch(fact_name) { calculate_system_uptime(fact_name) }
           end
 
-          def substract_system_uptime_from_ole
+          def subtract_system_uptime_from_ole
             win = Facter::Util::Windows::Win32Ole.new
             opsystem = win.return_first('SELECT LocalDateTime,LastBootUpTime FROM Win32_OperatingSystem')
             unless opsystem
@@ -35,35 +35,16 @@ module Facter
           end
 
           def calculate_system_uptime(fact_name)
-            seconds = substract_system_uptime_from_ole.to_i if substract_system_uptime_from_ole
+            seconds = subtract_system_uptime_from_ole&.to_i
             if !seconds || seconds.negative?
               @log.debug 'Unable to determine system uptime!'
               return
             end
 
-            hours = seconds / 3600
-            days = hours / 24
-
-            result = { seconds: seconds, hours: hours, days: days }
-
-            result[:uptime] = determine_uptime(result)
-            build_fact_list(result)
-
+            @fact_list = Facter::Util::Resolvers::UptimeHelper.create_uptime_hash(seconds)
             @fact_list[fact_name]
           end
 
-          def determine_uptime(result_hash)
-            minutes = (result_hash[:seconds] - result_hash[:hours] * 3600) / 60
-
-            if result_hash[:days].zero?
-              "#{result_hash[:hours]}:#{minutes} hours"
-            elsif result_hash[:days] == 1
-              "#{result_hash[:days]} day"
-            else
-              "#{result_hash[:days]} days"
-            end
-          end
-
           def build_fact_list(system_uptime)
             @fact_list[:days] = system_uptime[:days]
             @fact_list[:hours] = system_uptime[:hours]

data/lib/facter/templates/man.erb

@@ -13,14 +13,14 @@ Many of the command line options can also be set via the HOCON config file. This
 
 OPTIONS
 -------
-<% @Facter::Cli.class_options.each do |name, option| -%><% next if option.hide%>
+<% Facter::Cli.class_options.each do |name, option| -%><% next if option.hide%>
   * `<%= option.aliases[0] + '`, `' if option.aliases.any? %>--<%= 'no-' if negate_options.include?(name.to_s)%><%= name.to_s.gsub('_','-') %>`:
 
     <%= option.description %>
 
 <% end -%>
 
-<% @Facter::Cli.commands.select { |_k, command_class| command_class.instance_of?(Thor::Command) }.each do |_, command| -%>
+<% Facter::Cli.commands.select { |_k, command_class| command_class.instance_of?(Thor::Command) }.each do |_, command| -%>
   * `<%= command.usage %>`:
 
     <%= command.description %>
@@ -32,7 +32,7 @@ FILES
 -----
 <em>/etc/puppetlabs/facter/facter.conf</em>
 
-A HOCON config file that can be used to specify directories for custom and external facts, set various command line options, and specify facts to block. See example below for details, or visit the GitHub README.
+A HOCON config file that can be used to specify directories for custom and external facts, set various command line options, and specify facts to block. See example below for details, or visit the [GitHub README](https://github.com/puppetlabs/puppetlabs-hocon#overview).
 
 EXAMPLES
 --------
@@ -55,7 +55,7 @@ dmi => {
     version => "6.00"
   }
 }
-[\.\.\.]
+[...]
 ```
 
 Display a single structured fact:
@@ -91,7 +91,7 @@ $ facter processorcount
 Format facts as JSON:
 
 ```
-$ facter \-\-json os.name os.release.major processors.isa
+$ facter --json os.name os.release.major processors.isa
 {
   "os.name": "Ubuntu",
   "os.release.major": "14.04",
@@ -120,7 +120,7 @@ cli : {
     verbose   : false,
     log-level : "info"
 }
-# always loaded, fact-sepcific configuration
+# always loaded, fact-specific configuration
 facts : {
     # for valid blocklist entries, use --list-block-groups
     blocklist : [ "file system", "EC2" ],

data/lib/facter/util/facts/unit_converter.rb

@@ -10,7 +10,7 @@ module Facter
 
             value_in_bytes = value_in_bytes.to_i
 
-            (value_in_bytes / (1024.0 * 1024.0)).round(2)
+            (value_in_bytes / (1024.0 * 1024.0))
           end
 
           def hertz_to_human_readable(speed)
@@ -19,7 +19,7 @@ module Facter
 
             validated_speed, metric_prefix = determine_metric_prefix(speed)
 
-            format('%<displayed_speed>.2f', displayed_speed: validated_speed).to_s + ' ' + metric_prefix + 'Hz'
+            format('%<displayed_speed>.2f', displayed_speed: validated_speed.round(2)).to_s + ' ' + metric_prefix + 'Hz'
           end
 
           def bytes_to_human_readable(bytes)

data/lib/facter/util/facts/virtual_detector.rb

@@ -9,27 +9,20 @@ module Facter
         end
 
         def platform
-          fact_value = check_docker_lxc || check_dmi || check_freebsd || check_gce || retrieve_from_virt_what
-          fact_value ||= check_vmware || check_open_vz || check_vserver || check_xen || check_other_facts
-          fact_value ||= check_lspci || 'physical'
+          @@fact_value ||= check_docker_lxc || check_freebsd || check_gce || retrieve_from_virt_what
+          @@fact_value ||= check_vmware || check_open_vz || check_vserver || check_xen || check_other_facts
+          @@fact_value ||= check_lspci || 'physical'
 
-          fact_value
+          @@fact_value
         end
 
+        private
+
         def check_docker_lxc
           @log.debug('Checking Docker and LXC')
           Facter::Resolvers::Containers.resolve(:vm)
         end
 
-        def check_dmi
-          @log.debug('Checking DMI')
-          vendor = Facter::Resolvers::DmiDecode.resolve(:vendor)
-          @log.debug("dmi detected vendor: #{vendor}")
-          return 'kvm' if vendor =~ /Amazon/
-
-          'xen' if vendor =~ /Xen/
-        end
-
         def check_gce
           @log.debug('Checking GCE')
           bios_vendor = Facter::Resolvers::Linux::DmiBios.resolve(:bios_vendor)

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

@@ -10,7 +10,7 @@ module Facter
           CONNECTION_TIMEOUT = 0.6
           SESSION_TIMEOUT = 5
 
-          # Makes a GET http request and returns it's response.
+          # Makes a GET http request and returns its response.
           #
           # Params:
           # url: String which contains the address to which the request will be made
@@ -40,6 +40,12 @@ module Facter
             http = http_obj(uri, timeouts)
             request = request_obj(headers, uri, request_type)
 
+            # The Windows implementation of sockets does not respect net/http
+            # timeouts, so check if the target is reachable in a different way
+            if Gem.win_platform?
+              Socket.tcp(uri.host, uri.port, connect_timeout: timeouts[:connection] || CONNECTION_TIMEOUT)
+            end
+
             # Make the request
             response = http.request(request)
             response.uri = url

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

@@ -37,11 +37,8 @@ module Facter
                 next if index.zero?
 
                 route = line.strip.split("\t")
-                if route.count > 7 &&
-                   route[ROUTE_TABLE_MAPPING['Destination']] == '00000000' &&
-                   route[ROUTE_TABLE_MAPPING['Mask']] == '00000000'
-                  return route[ROUTE_TABLE_MAPPING['Iface']]
-                end
+
+                return route[ROUTE_TABLE_MAPPING['Iface']] if valid_default_route?(route)
               end
 
               nil
@@ -74,6 +71,15 @@ module Facter
 
               nil
             end
+
+            private
+
+            def valid_default_route?(route)
+              route.count > 7 &&
+                route[ROUTE_TABLE_MAPPING['Destination']] == '00000000' &&
+                route[ROUTE_TABLE_MAPPING['Mask']] == '00000000' &&
+                route[ROUTE_TABLE_MAPPING['Iface']] != '*' # `*` represents blackhole and not a valid interface
+            end
           end
         end
       end

data/lib/facter/util/utils.rb

@@ -4,7 +4,7 @@ module Facter
   module Utils
     # Sort nested hash.
     def self.sort_hash_by_key(hash, recursive = true, &block)
-      hash.keys.sort(&block).each_with_object({}) do |key, seed|
+      hash.keys.sort(&block).each_with_object(hash.class.new) do |key, seed|
         seed[key] = hash[key]
         seed[key] = sort_hash_by_key(seed[key], true, &block) if recursive && seed[key].is_a?(Hash)
 
@@ -29,5 +29,22 @@ module Facter
         object
       end
     end
+
+    def self.try_to_bool(value)
+      case value.to_s
+      when 'true'
+        true
+      when 'false'
+        false
+      else
+        value
+      end
+    end
+
+    def self.try_to_int(value)
+      Integer(value)
+    rescue ArgumentError, TypeError
+      value
+    end
   end
 end

data/lib/facter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.52
+  version: 4.1.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -1043,7 +1043,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: New version of Facter