facter 4.0.52 → 4.2.2

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/linux/dhcp.rb

@@ -75,7 +75,10 @@ module Facter
           def search_with_dhcpcd_command(interface_name)
             @log.debug("Attempt to get DHCP for interface #{interface_name}, from dhcpcd command")
 
-            output = Facter::Core::Execution.execute("dhcpcd -U #{interface_name}", logger: @log)
+            @dhcpcd_command ||= Facter::Core::Execution.which('dhcpcd')
+            return unless @dhcpcd_command
+
+            output = Facter::Core::Execution.execute("#{@dhcpcd_command} -U #{interface_name}", logger: @log)
             dhcp = output.match(/dhcp_server_identifier='(.*)'/)
             dhcp[1] if dhcp
           end

data/lib/facter/util/linux/if_inet6.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+require 'ipaddr'
+
+module Facter
+  module Util
+    module Linux
+      class IfInet6
+        class << self
+          IFA_FLAGS = {
+            'temporary' => 0x01,
+            'noad' => 0x02,
+            'optimistic' => 0x04,
+            'dadfailed' => 0x08,
+            'homeaddress' => 0x10,
+            'deprecated' => 0x20,
+            'tentative' => 0x40,
+            'permanent' => 0x80
+            # /proc/net/if_inet6 only supports the old 8bit flags
+            # I have been unable to find a simple solution to accesses
+            # the full 32bit flags.  netlink is all I can could find but
+            # that will likely be ugly
+            # 'managetempaddr' => 0x100,
+            # 'noprefixroute' => 0x200,
+            # 'mcautojoin' => 0x400,
+            # 'stableprivacy' => 0x800
+          }.freeze
+
+          def read_flags
+            return read_flags_from_proc if File.exist?('/proc/net/if_inet6')
+
+            {}
+          end
+
+          private
+
+          def read_flags_from_proc
+            flags = init_flags
+            Facter::Util::FileHelper.safe_read('/proc/net/if_inet6', nil).each_line do |line|
+              iface = line.split
+              next unless iface.size == 6
+
+              ip = parse_ip(iface[0])
+              flags[iface[5]][ip] = parse_ifa_flags(iface[4])
+            end
+            flags
+          end
+
+          def init_flags
+            Hash.new { |h1, k1| h1[k1] = Hash.new { |h2, k2| h2[k2] = [] } }
+          end
+
+          def parse_ifa_flags(flag)
+            flag = flag.hex
+            flags = []
+            IFA_FLAGS.each_pair do |name, value|
+              next if (flag & value).zero?
+
+              flags << name
+            end
+            flags
+          end
+
+          def parse_ip(ip)
+            # The ip address in if_net6 is a long string wit no colons
+            ip = ip.scan(/(\h{4})/).join(':')
+            IPAddr.new(ip).to_s
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/util/linux/socket_parser.rb

@@ -36,7 +36,7 @@ module Facter
           def search_for_mac(ifaddr)
             mac = mac_from_bonded_interface(ifaddr.name)
             mac ||= mac_from(ifaddr)
-            mac if !mac.nil? && mac != '00:00:00:00:00:00' && mac =~ /^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$/
+            mac if !mac.nil? && mac != '00:00:00:00:00:00' && mac =~ /^([0-9A-Fa-f]{2}[:-]){5,19}([0-9A-Fa-f]{2})$/
           end
 
           def mac_from_bonded_interface(interface_name)
@@ -59,8 +59,23 @@ module Facter
           end
 
           def bond_master_of(interface_name)
-            content = Facter::Core::Execution.execute("ip link show #{interface_name}", logger: @log)
-            content.match(/master (\S*) /)&.captures&.first
+            content = get_ip_link_show_data(interface_name)
+            content&.match(/master (\S*) /)&.captures&.first
+          end
+
+          def get_ip_link_show_data(interface_name)
+            @ip_link_show_data ||= read_ip_link_show_data
+            @ip_link_show_data[interface_name]
+          end
+
+          def read_ip_link_show_data
+            ip_link_show_data = {}
+            output = Facter::Core::Execution.execute('ip -o link show', logger: @log)
+            output.each_line do |line|
+              interface_name = line.split(':')[1]&.strip if line
+              ip_link_show_data[interface_name] = line if interface_name
+            end
+            ip_link_show_data
           end
 
           def mac_from(ifaddr)

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.2.2' unless defined?(VERSION)
 end

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.52
+  version: 4.2.2
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.3.3
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.3.3
@@ -108,6 +114,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +190,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: New version of Facter
+description: You can prove anything with facts!
 email:
 - team-nw@puppet.com
 executables:
@@ -164,6 +198,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
 - bin/facter
 - lib/docs/generate.rb
 - lib/docs/generate_cli.rb
@@ -260,10 +295,12 @@ files:
 - lib/facter/facts/aix/partitions.rb
 - lib/facter/facts/aix/path.rb
 - lib/facter/facts/aix/processor.rb
+- lib/facter/facts/aix/processors/cores.rb
 - lib/facter/facts/aix/processors/count.rb
 - lib/facter/facts/aix/processors/isa.rb
 - lib/facter/facts/aix/processors/models.rb
 - lib/facter/facts/aix/processors/speed.rb
+- lib/facter/facts/aix/processors/threads.rb
 - lib/facter/facts/aix/ruby/platform.rb
 - lib/facter/facts/aix/ruby/sitedir.rb
 - lib/facter/facts/aix/ruby/version.rb
@@ -489,11 +526,13 @@ files:
 - lib/facter/facts/linux/partitions.rb
 - lib/facter/facts/linux/path.rb
 - lib/facter/facts/linux/processor.rb
+- lib/facter/facts/linux/processors/cores.rb
 - lib/facter/facts/linux/processors/count.rb
 - lib/facter/facts/linux/processors/isa.rb
 - lib/facter/facts/linux/processors/models.rb
 - lib/facter/facts/linux/processors/physicalcount.rb
 - lib/facter/facts/linux/processors/speed.rb
+- lib/facter/facts/linux/processors/threads.rb
 - lib/facter/facts/linux/ruby/platform.rb
 - lib/facter/facts/linux/ruby/sitedir.rb
 - lib/facter/facts/linux/ruby/version.rb
@@ -576,11 +615,13 @@ files:
 - lib/facter/facts/macosx/os/name.rb
 - lib/facter/facts/macosx/os/release.rb
 - lib/facter/facts/macosx/path.rb
+- lib/facter/facts/macosx/processors/cores.rb
 - lib/facter/facts/macosx/processors/count.rb
 - lib/facter/facts/macosx/processors/isa.rb
 - lib/facter/facts/macosx/processors/models.rb
 - lib/facter/facts/macosx/processors/physicalcount.rb
 - lib/facter/facts/macosx/processors/speed.rb
+- lib/facter/facts/macosx/processors/threads.rb
 - lib/facter/facts/macosx/ruby/platform.rb
 - lib/facter/facts/macosx/ruby/sitedir.rb
 - lib/facter/facts/macosx/ruby/version.rb
@@ -716,11 +757,13 @@ files:
 - lib/facter/facts/solaris/os/name.rb
 - lib/facter/facts/solaris/os/release.rb
 - lib/facter/facts/solaris/path.rb
+- lib/facter/facts/solaris/processors/cores.rb
 - lib/facter/facts/solaris/processors/count.rb
 - lib/facter/facts/solaris/processors/isa.rb
 - lib/facter/facts/solaris/processors/models.rb
 - lib/facter/facts/solaris/processors/physicalcount.rb
 - lib/facter/facts/solaris/processors/speed.rb
+- lib/facter/facts/solaris/processors/threads.rb
 - lib/facter/facts/solaris/ruby/platform.rb
 - lib/facter/facts/solaris/ruby/sitedir.rb
 - lib/facter/facts/solaris/ruby/version.rb
@@ -766,6 +809,7 @@ files:
 - lib/facter/facts/windows/interfaces.rb
 - lib/facter/facts/windows/ipaddress6_interfaces.rb
 - lib/facter/facts/windows/ipaddress_interfaces.rb
+- lib/facter/facts/windows/is_virtual.rb
 - lib/facter/facts/windows/kernel.rb
 - lib/facter/facts/windows/kernelmajversion.rb
 - lib/facter/facts/windows/kernelrelease.rb
@@ -810,10 +854,12 @@ files:
 - lib/facter/facts/windows/os/windows/system32.rb
 - lib/facter/facts/windows/path.rb
 - lib/facter/facts/windows/processor.rb
+- lib/facter/facts/windows/processors/cores.rb
 - lib/facter/facts/windows/processors/count.rb
 - lib/facter/facts/windows/processors/isa.rb
 - lib/facter/facts/windows/processors/models.rb
 - lib/facter/facts/windows/processors/physicalcount.rb
+- lib/facter/facts/windows/processors/threads.rb
 - lib/facter/facts/windows/ruby/platform.rb
 - lib/facter/facts/windows/ruby/sitedir.rb
 - lib/facter/facts/windows/ruby/version.rb
@@ -826,8 +872,7 @@ files:
 - lib/facter/facts/windows/system_uptime/seconds.rb
 - lib/facter/facts/windows/system_uptime/uptime.rb
 - lib/facter/facts/windows/timezone.rb
-- lib/facter/facts/windows/virtualization/is_virtual.rb
-- lib/facter/facts/windows/virtualization/virtual.rb
+- lib/facter/facts/windows/virtual.rb
 - lib/facter/framework/benchmarking/timer.rb
 - lib/facter/framework/cli/cli.rb
 - lib/facter/framework/cli/cli_launcher.rb
@@ -837,7 +882,6 @@ files:
 - lib/facter/framework/core/fact/external/external_fact_manager.rb
 - lib/facter/framework/core/fact/internal/core_fact.rb
 - lib/facter/framework/core/fact/internal/internal_fact_manager.rb
-- lib/facter/framework/core/fact_augmenter.rb
 - lib/facter/framework/core/fact_filter.rb
 - lib/facter/framework/core/fact_loaders/class_discoverer.rb
 - lib/facter/framework/core/fact_loaders/external_fact_loader.rb
@@ -933,6 +977,7 @@ files:
 - lib/facter/resolvers/partitions.rb
 - lib/facter/resolvers/path.rb
 - lib/facter/resolvers/processors.rb
+- lib/facter/resolvers/processors_lscpu.rb
 - lib/facter/resolvers/redhat_release.rb
 - lib/facter/resolvers/release_from_first_line.rb
 - lib/facter/resolvers/ruby.rb
@@ -1000,12 +1045,13 @@ files:
 - lib/facter/util/aix/odm_query.rb
 - lib/facter/util/api_debugger.rb
 - lib/facter/util/facts/facts_utils.rb
+- lib/facter/util/facts/posix/virtual_detector.rb
 - lib/facter/util/facts/unit_converter.rb
 - lib/facter/util/facts/uptime_parser.rb
-- lib/facter/util/facts/virtual_detector.rb
 - lib/facter/util/facts/windows_release_finder.rb
 - lib/facter/util/file_helper.rb
 - lib/facter/util/linux/dhcp.rb
+- lib/facter/util/linux/if_inet6.rb
 - lib/facter/util/linux/routing_table.rb
 - lib/facter/util/linux/socket_parser.rb
 - lib/facter/util/macosx/system_profile_executor.rb
@@ -1026,7 +1072,7 @@ files:
 - lib/facter/version.rb
 homepage: https://github.com/puppetlabs/facter
 licenses:
-- MIT
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -1034,17 +1080,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.3'
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: '4.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !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
+summary: Facter, a system inventory tool
 test_files: []