facter 4.0.26 → 4.0.28

data/lib/resolvers/utils/networking.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+module Resolvers
+  module Utils
+    module Networking
+      class << self
+        # Creates a hash with IP, netmask and network. Works for IPV4 and IPV6
+        # @param [String] addr The IP address
+        # @param [Integer] mask_length Number of 1 bits the netmask has
+        #
+        # @return [Hash] Hash containing ip address, netmask and network
+        def build_binding(addr, mask_length)
+          ip = IPAddr.new(addr)
+          mask_helper = ip.ipv6? ? 'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff' : '255.255.255.255'
+          mask = IPAddr.new(mask_helper).mask(mask_length)
+
+          { address: addr, netmask: mask.to_s, network: ip.mask(mask_length).to_s }
+        end
+
+        def expand_main_bindings(interfaces)
+          interfaces.each_value do |values|
+            expand_binding(values, values[:bindings]) if values[:bindings]
+            expand_binding(values, values[:bindings6], false) if values[:bindings6]
+          end
+        end
+
+        def get_scope(ip)
+          require 'socket'
+
+          scope6 = []
+          addrinfo = Addrinfo.new(['AF_INET6', 0, nil, ip], :INET6)
+
+          scope6 << 'compat,' if IPAddr.new(ip).ipv4_compat?
+          scope6 << if addrinfo.ipv6_linklocal?
+                      'link'
+                    elsif addrinfo.ipv6_sitelocal?
+                      'site'
+                    elsif addrinfo.ipv6_loopback?
+                      'host'
+                    else 'global'
+                    end
+          scope6.join
+        end
+
+        def find_valid_binding(bindings)
+          bindings.each do |binding|
+            return binding unless ignored_ip_address(binding[:address])
+          end
+          bindings.empty? ? nil : bindings.first
+        end
+
+        def ignored_ip_address(addr)
+          addr.empty? || addr.start_with?('127.', '169.254.') || addr.start_with?('fe80') || addr.eql?('::1')
+        end
+
+        private
+
+        def expand_binding(values, bindings, ipv4_type = true)
+          binding = find_valid_binding(bindings)
+          ip_protocol_type = ipv4_type ? '' : '6'
+
+          values["ip#{ip_protocol_type}".to_sym] = binding[:address]
+          values["netmask#{ip_protocol_type}".to_sym] = binding[:netmask]
+          values["network#{ip_protocol_type}".to_sym] = binding[:network]
+          values[:scope6] = get_scope(binding[:address]) unless ipv4_type
+        end
+      end
+    end
+  end
+end

data/lib/resolvers/windows/aio_agent_version.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Windows
+      class AioAgentVersion < BaseResolver
+        REGISTRY_PATH = 'SOFTWARE\\Puppet Labs\\Puppet'
+        @semaphore = Mutex.new
+        @fact_list ||= {}
+
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { read_version(fact_name) }
+          end
+
+          def read_version(fact_name)
+            ::Win32::Registry::HKEY_LOCAL_MACHINE.open(REGISTRY_PATH) do |reg|
+              build_fact_list(reg)
+            end
+
+            @fact_list[fact_name]
+          rescue Win32::Registry::Error
+            log.debug("The registry path #{REGISTRY_PATH} does not exist")
+          end
+
+          def build_fact_list(reg)
+            puppet_aio_path = read_for_64_bit(reg) || read_for_32_bit(reg)
+
+            return if puppet_aio_path.nil? || puppet_aio_path.empty?
+
+            puppet_aio_version_path = File.join(puppet_aio_path, 'VERSION')
+            aio_agent_version = Util::FileHelper.safe_read(puppet_aio_version_path, nil)&.chomp
+
+            @fact_list[:aio_agent_version] = aio_agent_version&.match(/^\d+\.\d+\.\d+(\.\d+){0,2}/)&.to_s
+          end
+
+          def read_for_64_bit(reg)
+            reg.read('RememberedInstallDir64')[1]
+          rescue Win32::Registry::Error
+            log.debug('Could not read Puppet AIO path from 64 bit registry')
+            nil
+          end
+
+          def read_for_32_bit(reg)
+            reg.read('RememberedInstallDir')[1]
+          rescue Win32::Registry::Error
+            log.debug('Could not read Puppet AIO path from 32 bit registry')
+            nil
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.26
+  version: 4.0.28
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-11 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -198,6 +198,141 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- acceptance/.beaker.yml
+- acceptance/.gitignore
+- acceptance/Gemfile
+- acceptance/Rakefile
+- acceptance/bin/ci-bootstrap-from-artifacts.sh
+- acceptance/config/aio/options.rb
+- acceptance/config/git/options.rb
+- acceptance/config/nodes/aix-53-power.yaml
+- acceptance/config/nodes/aix-61-power.yaml
+- acceptance/config/nodes/aix-71-power.yaml
+- acceptance/config/nodes/huaweios-6-powerpc.yaml
+- acceptance/config/nodes/solaris-10-sparc.yaml
+- acceptance/config/nodes/solaris-11-sparc.yaml
+- acceptance/lib/facter/acceptance/base_fact_utils.rb
+- acceptance/lib/facter/acceptance/user_fact_utils.rb
+- acceptance/lib/helper.rb
+- acceptance/lib/puppet/acceptance/common_utils.rb
+- acceptance/lib/puppet/acceptance/git_utils.rb
+- acceptance/lib/puppet/acceptance/install_utils.rb
+- acceptance/setup/aio/pre-suite/001_run_with_facter_ng.rb
+- acceptance/tests/custom_facts/cached_custom_fact.rb
+- acceptance/tests/custom_facts/conflicts_with_builtin_fact.rb
+- acceptance/tests/custom_facts/custom_fact_with_10001_weight_overrides_external_fact.rb
+- acceptance/tests/custom_facts/expand_command.rb
+- acceptance/tests/custom_facts/having_multiple_facts_in_one_file.rb
+- acceptance/tests/custom_facts/not_expand_command.rb
+- acceptance/tests/custom_facts/using_win32ole_should_not_hang.rb
+- acceptance/tests/custom_facts/weighted_cached_custom_facts.rb
+- acceptance/tests/custom_facts/windows_not_expand_command.rb
+- acceptance/tests/external_facts/env_var_overrides_external_fact.rb
+- acceptance/tests/external_facts/external_dir_overrides_default_external_fact.rb
+- acceptance/tests/external_facts/external_fact_overrides_custom_fact.rb
+- acceptance/tests/external_facts/external_fact_overrides_custom_fact_with_10000_weight_or_less.rb
+- acceptance/tests/external_facts/external_fact_overrides_custom_fact_with_confine.rb
+- acceptance/tests/external_facts/external_fact_stderr_messages_output_to_stderr.rb
+- acceptance/tests/external_facts/external_facts_only_run_once.rb
+- acceptance/tests/external_facts/fact_directory_precedence.rb
+- acceptance/tests/external_facts/handle_same_filename_in_different_dirs.rb
+- acceptance/tests/external_facts/non_root_users_default_external_fact_directory.rb
+- acceptance/tests/external_facts/root_uses_default_external_fact_dir.rb
+- acceptance/tests/external_facts/structured_executable_facts.rb
+- acceptance/tests/facter_returns_success_on_non_existent_fact.rb
+- acceptance/tests/facts/dmi.rb
+- acceptance/tests/facts/facterversion.rb
+- acceptance/tests/facts/identity.rb
+- acceptance/tests/facts/mountpoints_fact.rb
+- acceptance/tests/facts/networking_facts.rb
+- acceptance/tests/facts/nim_type.rb
+- acceptance/tests/facts/non_root_users_without_errors.rb
+- acceptance/tests/facts/operatingsystem_detection_after_clear_on_ubuntu.rb
+- acceptance/tests/facts/os_processors_and_kernel.rb
+- acceptance/tests/facts/osx_numeric_hostname.rb
+- acceptance/tests/facts/partitions.rb
+- acceptance/tests/facts/productname.rb
+- acceptance/tests/facts/ruby.rb
+- acceptance/tests/facts/ssh_key.rb
+- acceptance/tests/facts/validate_file_system_size_bytes.rb
+- acceptance/tests/facts/verify_tmpfs_file_system.rb
+- acceptance/tests/facts/windows_os.rb
+- acceptance/tests/load_libfacter.rb
+- acceptance/tests/no_errors_on_stderr.rb
+- acceptance/tests/options/color.rb
+- acceptance/tests/options/config.rb
+- acceptance/tests/options/config_file/blocklist.rb
+- acceptance/tests/options/config_file/blocklist_from_puppet_facts.rb
+- acceptance/tests/options/config_file/custom_dir_overridden_by_cli_custom_dir.rb
+- acceptance/tests/options/config_file/custom_facts.rb
+- acceptance/tests/options/config_file/custom_facts_list.rb
+- acceptance/tests/options/config_file/debug.rb
+- acceptance/tests/options/config_file/debug_override_config_file.rb
+- acceptance/tests/options/config_file/default_file_location.rb
+- acceptance/tests/options/config_file/external_dir_conflicts_with_cli_no_external_facts.rb
+- acceptance/tests/options/config_file/external_dir_overridden_by_cli_external_dir.rb
+- acceptance/tests/options/config_file/external_facts.rb
+- acceptance/tests/options/config_file/external_facts_list.rb
+- acceptance/tests/options/config_file/load_from_ruby.rb
+- acceptance/tests/options/config_file/log_level.rb
+- acceptance/tests/options/config_file/no_custom_facts_and_custom_dir.rb
+- acceptance/tests/options/config_file/no_custom_facts_and_facterlib.rb
+- acceptance/tests/options/config_file/no_custom_facts_and_load_path.rb
+- acceptance/tests/options/config_file/no_external_facts.rb
+- acceptance/tests/options/config_file/no_external_facts_and_external_dir.rb
+- acceptance/tests/options/config_file/no_ruby_disables_custom_facts.rb
+- acceptance/tests/options/config_file/no_ruby_disables_ruby_facts.rb
+- acceptance/tests/options/config_file/trace.rb
+- acceptance/tests/options/config_file/ttls_cached_external_execution_resolver_with_json_output.rb
+- acceptance/tests/options/config_file/ttls_cached_external_execution_resolver_with_text_output.rb
+- acceptance/tests/options/config_file/ttls_cached_external_execution_resolver_with_yaml_output.rb
+- acceptance/tests/options/config_file/ttls_cached_external_json_resolver.rb
+- acceptance/tests/options/config_file/ttls_cached_external_text_resolver.rb
+- acceptance/tests/options/config_file/ttls_cached_external_yaml_resolver.rb
+- acceptance/tests/options/config_file/ttls_cached_facts_clear_by_empty_ttls_cache_list.rb
+- acceptance/tests/options/config_file/ttls_cached_facts_creates_json_cache_file.rb
+- acceptance/tests/options/config_file/ttls_cached_facts_expire_facts_do_not_read_the_old_cached_value.rb
+- acceptance/tests/options/config_file/ttls_cached_facts_expire_facts_refresh_the_cached_value.rb
+- acceptance/tests/options/config_file/ttls_cached_facts_read_from_the_cached_value.rb
+- acceptance/tests/options/config_file/ttls_cached_facts_that_are_corrupt_are_refreshed.rb
+- acceptance/tests/options/config_file/ttls_cached_facts_that_are_empty_return_an_empty_value.rb
+- acceptance/tests/options/config_file/ttls_puppet_facts_creates_json_for_cached_facts.rb
+- acceptance/tests/options/config_file/ttls_puppet_facts_honors_cached_facts.rb
+- acceptance/tests/options/config_file/verbose.rb
+- acceptance/tests/options/custom_facts.rb
+- acceptance/tests/options/custom_facts_facterlib.rb
+- acceptance/tests/options/custom_facts_list.rb
+- acceptance/tests/options/custom_facts_load_path.rb
+- acceptance/tests/options/debug.rb
+- acceptance/tests/options/external_facts.rb
+- acceptance/tests/options/external_facts_list.rb
+- acceptance/tests/options/help.rb
+- acceptance/tests/options/json.rb
+- acceptance/tests/options/list_block_groups.rb
+- acceptance/tests/options/list_block_groups_facter_4.rb
+- acceptance/tests/options/list_cache_groups.rb
+- acceptance/tests/options/log_level.rb
+- acceptance/tests/options/no_block.rb
+- acceptance/tests/options/no_cache_should_not_cache_facts.rb
+- acceptance/tests/options/no_cache_should_not_load_cached_facts.rb
+- acceptance/tests/options/no_cache_should_not_refresh_cached_facts.rb
+- acceptance/tests/options/no_color.rb
+- acceptance/tests/options/no_custom_facts.rb
+- acceptance/tests/options/no_custom_facts_and_custom_dir.rb
+- acceptance/tests/options/no_custom_facts_and_facterlib.rb
+- acceptance/tests/options/no_custom_facts_and_load_path.rb
+- acceptance/tests/options/no_external_facts.rb
+- acceptance/tests/options/no_external_facts_and_external_dir.rb
+- acceptance/tests/options/no_ruby.rb
+- acceptance/tests/options/puppet_facts.rb
+- acceptance/tests/options/show_legacy.rb
+- acceptance/tests/options/strict.rb
+- acceptance/tests/options/trace.rb
+- acceptance/tests/options/verbose.rb
+- acceptance/tests/options/version.rb
+- acceptance/tests/options/yaml.rb
+- acceptance/tests/ticket_1123_facter_with_invalid_locale.rb
+- acceptance/tests/ticket_1238_hostname_fqdn.rb
 - agent/facter-ng.gemspec
 - agent/lib/facter-ng.rb
 - bin/facter
@@ -237,6 +372,7 @@ files:
 - lib/custom_facts/util/windows_root.rb
 - lib/custom_facts/version.rb
 - lib/facter.rb
+- lib/facts/aix/aio_agent_version.rb
 - lib/facts/aix/augeas/version.rb
 - lib/facts/aix/facterversion.rb
 - lib/facts/aix/filesystems.rb
@@ -285,6 +421,9 @@ files:
 - lib/facts/bsd/kernelversion.rb
 - lib/facts/bsd/load_averages.rb
 - lib/facts/bsd/os/family.rb
+- lib/facts/bsd/processors/count.rb
+- lib/facts/bsd/processors/models.rb
+- lib/facts/bsd/processors/speed.rb
 - lib/facts/debian/architecture.rb
 - lib/facts/debian/lsbdistcodename.rb
 - lib/facts/debian/lsbdistdescription.rb
@@ -294,7 +433,13 @@ files:
 - lib/facts/debian/os/distro/id.rb
 - lib/facts/debian/os/distro/release.rb
 - lib/facts/debian/os/release.rb
+- lib/facts/freebsd/disks.rb
 - lib/facts/freebsd/os/release.rb
+- lib/facts/freebsd/partitions.rb
+- lib/facts/freebsd/processors/count.rb
+- lib/facts/freebsd/processors/models.rb
+- lib/facts/freebsd/processors/speed.rb
+- lib/facts/linux/aio_agent_version.rb
 - lib/facts/linux/augeas/version.rb
 - lib/facts/linux/dhcp_servers.rb
 - lib/facts/linux/disks.rb
@@ -310,6 +455,8 @@ files:
 - lib/facts/linux/dmi/product/name.rb
 - lib/facts/linux/dmi/product/serial_number.rb
 - lib/facts/linux/dmi/product/uuid.rb
+- lib/facts/linux/ec2_metadata.rb
+- lib/facts/linux/ec2_userdata.rb
 - lib/facts/linux/facterversion.rb
 - lib/facts/linux/filesystems.rb
 - lib/facts/linux/fips_enabled.rb
@@ -402,6 +549,7 @@ files:
 - lib/facts/linux/system_uptime/uptime.rb
 - lib/facts/linux/timezone.rb
 - lib/facts/linux/virtual.rb
+- lib/facts/macosx/aio_agent_version.rb
 - lib/facts/macosx/augeas/version.rb
 - lib/facts/macosx/dmi/product/name.rb
 - lib/facts/macosx/facterversion.rb
@@ -434,11 +582,21 @@ files:
 - lib/facts/macosx/memory/system/used.rb
 - lib/facts/macosx/memory/system/used_bytes.rb
 - lib/facts/macosx/mountpoints.rb
+- lib/facts/macosx/networking/dhcp.rb
 - lib/facts/macosx/networking/domain.rb
 - lib/facts/macosx/networking/fqdn.rb
 - lib/facts/macosx/networking/hostname.rb
+- lib/facts/macosx/networking/interfaces.rb
 - lib/facts/macosx/networking/ip.rb
+- lib/facts/macosx/networking/ip6.rb
 - lib/facts/macosx/networking/mac.rb
+- lib/facts/macosx/networking/mtu.rb
+- lib/facts/macosx/networking/netmask.rb
+- lib/facts/macosx/networking/netmask6.rb
+- lib/facts/macosx/networking/network.rb
+- lib/facts/macosx/networking/network6.rb
+- lib/facts/macosx/networking/primary.rb
+- lib/facts/macosx/networking/scope6.rb
 - lib/facts/macosx/os/architecture.rb
 - lib/facts/macosx/os/family.rb
 - lib/facts/macosx/os/hardware.rb
@@ -499,6 +657,7 @@ files:
 - lib/facts/sles/os/distro/release.rb
 - lib/facts/sles/os/family.rb
 - lib/facts/sles/os/release.rb
+- lib/facts/solaris/aio_agent_version.rb
 - lib/facts/solaris/augeas/version.rb
 - lib/facts/solaris/facterversion.rb
 - lib/facts/solaris/filesystems.rb
@@ -546,12 +705,15 @@ files:
 - lib/facts/solaris/zpool_version.rb
 - lib/facts/ubuntu/os/distro/release.rb
 - lib/facts/ubuntu/os/release.rb
+- lib/facts/windows/aio_agent_version.rb
 - lib/facts/windows/augeas/version.rb
 - lib/facts/windows/dhcp_servers.rb
 - lib/facts/windows/dmi/manufacturer.rb
 - lib/facts/windows/dmi/product/name.rb
 - lib/facts/windows/dmi/product/serial_number.rb
 - lib/facts/windows/dmi/product/uuid.rb
+- lib/facts/windows/ec2_metadata.rb
+- lib/facts/windows/ec2_userdata.rb
 - lib/facts/windows/facterversion.rb
 - lib/facts/windows/fips_enabled.rb
 - lib/facts/windows/hypervisors/hyperv.rb
@@ -625,6 +787,7 @@ files:
 - lib/facts/windows/timezone.rb
 - lib/facts/windows/virtualization/is_virtual.rb
 - lib/facts/windows/virtualization/virtual.rb
+- lib/facts_utils/hypervisors.rb
 - lib/facts_utils/unit_converter.rb
 - lib/facts_utils/uptime_parser.rb
 - lib/facts_utils/windows_release_finder.rb
@@ -665,7 +828,7 @@ files:
 - lib/models/loaded_fact.rb
 - lib/models/resolved_fact.rb
 - lib/models/searched_fact.rb
-- lib/resolvers/agent_resolver.rb
+- lib/resolvers/aio_agent_version.rb
 - lib/resolvers/aix/architecture_resolver.rb
 - lib/resolvers/aix/ffi/ffi_helper.rb
 - lib/resolvers/aix/filesystem_resolver.rb
@@ -682,15 +845,20 @@ files:
 - lib/resolvers/base_resolver.rb
 - lib/resolvers/bsd/ffi/ffi_helper.rb
 - lib/resolvers/bsd/load_averages_resolver.rb
+- lib/resolvers/bsd/processors.rb
 - lib/resolvers/debian_version.rb
 - lib/resolvers/disk_resolver.rb
 - lib/resolvers/dmi_resolver.rb
 - lib/resolvers/docker_lxc.rb
+- lib/resolvers/ec2.rb
 - lib/resolvers/eos_release_resolver.rb
 - lib/resolvers/facterversion_resolver.rb
 - lib/resolvers/filesystems_resolver.rb
 - lib/resolvers/fips_enabled_resolver.rb
+- lib/resolvers/freebsd/ffi/ffi_helper.rb
 - lib/resolvers/freebsd/freebsd_version_resolver.rb
+- lib/resolvers/freebsd/geom_resolver.rb
+- lib/resolvers/freebsd/processors.rb
 - lib/resolvers/hostname_resolver.rb
 - lib/resolvers/identity_resolver.rb
 - lib/resolvers/load_averages_resolver.rb
@@ -699,9 +867,9 @@ files:
 - lib/resolvers/lspci.rb
 - lib/resolvers/macosx/dmi_resolver.rb
 - lib/resolvers/macosx/filesystems_resolver.rb
-- lib/resolvers/macosx/ipaddress_resolver.rb
 - lib/resolvers/macosx/load_averages_resolver.rb
 - lib/resolvers/macosx/mountpoints_resolver.rb
+- lib/resolvers/macosx/networking.rb
 - lib/resolvers/macosx/processor_resolver.rb
 - lib/resolvers/macosx/swap_memory_resolver.rb
 - lib/resolvers/macosx/system_memory_resolver.rb
@@ -735,10 +903,12 @@ files:
 - lib/resolvers/uptime_resolver.rb
 - lib/resolvers/utils/filesystem_helper.rb
 - lib/resolvers/utils/fingerprint.rb
+- lib/resolvers/utils/networking.rb
 - lib/resolvers/utils/ssh.rb
 - lib/resolvers/utils/ssh_helper.rb
 - lib/resolvers/virt_what.rb
 - lib/resolvers/vmware.rb
+- lib/resolvers/windows/aio_agent_version.rb
 - lib/resolvers/windows/dmi_bios_resolver.rb
 - lib/resolvers/windows/dmi_computersystem_resolver.rb
 - lib/resolvers/windows/ffi/ffi.rb
@@ -799,7 +969,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: New version of Facter

data/lib/resolvers/macosx/ipaddress_resolver.rb

@@ -1,52 +0,0 @@
-# frozen_string_literal: true
-
-module Facter
-  module Resolvers
-    module Macosx
-      class Ipaddress < BaseResolver
-        @semaphore = Mutex.new
-        @fact_list ||= {}
-        class << self
-          private
-
-          def post_resolve(fact_name)
-            @fact_list.fetch(fact_name) { read_ipaddress(fact_name) }
-          end
-
-          def read_ipaddress(fact_name)
-            ip = nil
-            primary_interface = read_primary_interface
-            unless primary_interface.nil?
-              @fact_list[:primary] = primary_interface
-              output = Facter::Core::Execution.execute("ipconfig getifaddr #{primary_interface}", logger: log)
-              ip = output.strip
-            end
-            find_all_interfaces
-            @fact_list[:ip] = ip
-            @fact_list[fact_name]
-          end
-
-          def read_primary_interface
-            iface = nil
-            output = Facter::Core::Execution.execute('route -n get default', logger: log)
-            output.split(/^\S/).each do |str|
-              iface = Regexp.last_match(1) if str.strip =~ /interface: (\S+)/
-            end
-            iface
-          end
-
-          def find_all_interfaces
-            output = Facter::Core::Execution.execute('ifconfig -a', logger: log)
-
-            data_hash = Hash[*output.split(/^([A-Za-z0-9_]+): /)[1..-1]]
-
-            macaddress = */ether (([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2}))/.match(data_hash[@fact_list[:primary]])
-            @fact_list[:macaddress] = macaddress[1]
-
-            @fact_list[:interfaces] = data_hash.keys.join(',')
-          end
-        end
-      end
-    end
-  end
-end