facter 4.0.46 → 4.0.47

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

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+module Facter
+  module Util
+    module Resolvers
+      module Networking
+        module PrimaryInterface
+          @log ||= Log.new(self)
+
+          class << self
+            ROUTE_TABLE_MAPPING = {
+              'Iface' => 0,
+              'Destination' => 1,
+              'Gateway' => 2,
+              'Flags' => 3,
+              'RefCnt' => 4,
+              'Use' => 5,
+              'Metric' => 6,
+              'Mask' => 7,
+              'MTU' => 8,
+              'Window' => 9,
+              'IRTT' => 10
+            }.freeze
+
+            def read_from_route
+              return if Facter::Core::Execution.which('route').nil?
+
+              result = Facter::Core::Execution.execute('route -n get default', logger: @log)
+
+              result.match(/interface: (.+)/)&.captures&.first
+            end
+
+            def read_from_proc_route
+              content = Facter::Util::FileHelper.safe_read('/proc/net/route', '')
+
+              content.each_line.with_index do |line, index|
+                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
+              end
+
+              nil
+            end
+
+            def read_from_ip_route
+              return if Facter::Core::Execution.which('ip').nil?
+
+              output = Facter::Core::Execution.execute('ip route show default', logger: @log)
+              primary_interface = nil
+              output.each_line do |line|
+                primary_interface = line.strip.split(' ')[4] if line.start_with?('default')
+              end
+
+              primary_interface
+            end
+
+            def find_in_interfaces(interfaces)
+              interfaces.each do |iface_name, interface|
+                interface[:bindings]&.each do |binding|
+                  return iface_name unless Facter::Util::Resolvers::Networking.ignored_ip_address(binding[:address])
+                end
+
+                next unless interface[:bindings6]
+
+                interface[:bindings6].each do |binding|
+                  return iface_name unless Facter::Util::Resolvers::Networking.ignored_ip_address(binding[:address])
+                end
+              end
+
+              nil
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facter
+  module Util
+    module Resolvers
+      class Ssh
+        attr_accessor :fingerprint, :type, :key, :name
+        def initialize(fingerprint, type, key, name)
+          @fingerprint = fingerprint
+          @type = type
+          @key = key
+          @name = name
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+require 'base64'
+require 'digest/sha1'
+
+module Facter
+  module Util
+    module Resolvers
+      class SshHelper
+        class << self
+          SSH_NAME = { 'ssh-dss' => 'dsa', 'ecdsa-sha2-nistp256' => 'ecdsa',
+                       'ssh-ed25519' => 'ed25519', 'ssh-rsa' => 'rsa' }.freeze
+          SSH_FINGERPRINT = { 'rsa' => 1, 'dsa' => 2, 'ecdsa' => 3, 'ed25519' => 4 }.freeze
+
+          def create_ssh(key_type, key)
+            key_name = SSH_NAME[key_type]
+            return unless key_name
+
+            decoded_key = Base64.decode64(key)
+            ssh_fp = SSH_FINGERPRINT[key_name]
+            sha1 = "SSHFP #{ssh_fp} 1 #{Digest::SHA1.new.update(decoded_key)}"
+            sha256 = "SSHFP #{ssh_fp} 2 #{Digest::SHA2.new.update(decoded_key)}"
+
+            fingerprint = Facter::Util::Resolvers::FingerPrint.new(sha1, sha256)
+            Facter::Util::Resolvers::Ssh.new(fingerprint, key_type, key, key_name)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/{resolvers/utils → util/resolvers}/uptime_helper.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Facter
-  module Resolvers
-    module Utils
+  module Util
+    module Resolvers
       module UptimeHelper
         class << self
           def create_uptime_hash(seconds)

data/lib/facter/util/windows/win32ole.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'win32ole'
+
+module Facter
+  module Util
+    module Windows
+      class Win32Ole
+        RPC_C_IMP_LEVEL_IMPERSONATE = 3
+
+        def initialize
+          locator = WIN32OLE.new('WbemScripting.SWbemLocator')
+          @conn = locator.ConnectServer('.', 'root\\cimv2')
+          @conn.Security_.ImpersonationLevel = RPC_C_IMP_LEVEL_IMPERSONATE
+        end
+
+        def return_first(query)
+          result = exec_query(query)
+          return result.to_enum.first if result
+
+          nil
+        end
+
+        def exec_query(query)
+          @conn.execquery(query)
+        end
+      end
+    end
+  end
+end

data/lib/facter/version.rb

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

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.46
+  version: 4.0.47
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-13 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -179,6 +165,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/facter
+- lib/docs/generate.rb
+- lib/docs/template.erb
 - lib/facter.rb
 - lib/facter/config.rb
 - lib/facter/custom_facts/core/aggregate.rb
@@ -274,7 +262,6 @@ files:
 - 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/puppet_version.rb
 - lib/facter/facts/aix/ruby/platform.rb
 - lib/facter/facts/aix/ruby/sitedir.rb
 - lib/facter/facts/aix/ruby/version.rb
@@ -319,6 +306,7 @@ files:
 - lib/facter/facts/freebsd/identity/privileged.rb
 - lib/facter/facts/freebsd/identity/uid.rb
 - lib/facter/facts/freebsd/identity/user.rb
+- lib/facter/facts/freebsd/is_virtual.rb
 - lib/facter/facts/freebsd/kernel.rb
 - lib/facter/facts/freebsd/kernelrelease.rb
 - lib/facter/facts/freebsd/memory/swap/available.rb
@@ -366,7 +354,6 @@ files:
 - lib/facter/facts/freebsd/processors/isa.rb
 - lib/facter/facts/freebsd/processors/models.rb
 - lib/facter/facts/freebsd/processors/speed.rb
-- lib/facter/facts/freebsd/puppet_version.rb
 - lib/facter/facts/freebsd/ruby/platform.rb
 - lib/facter/facts/freebsd/ruby/sitedir.rb
 - lib/facter/facts/freebsd/ruby/version.rb
@@ -378,6 +365,7 @@ files:
 - lib/facter/facts/freebsd/system_uptime/seconds.rb
 - lib/facter/facts/freebsd/system_uptime/uptime.rb
 - lib/facter/facts/freebsd/timezone.rb
+- lib/facter/facts/freebsd/virtual.rb
 - lib/facter/facts/freebsd/zfs_featurenumbers.rb
 - lib/facter/facts/freebsd/zfs_version.rb
 - lib/facter/facts/freebsd/zpool_featureflags.rb
@@ -491,7 +479,6 @@ files:
 - 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/puppet_version.rb
 - lib/facter/facts/linux/ruby/platform.rb
 - lib/facter/facts/linux/ruby/sitedir.rb
 - lib/facter/facts/linux/ruby/version.rb
@@ -577,7 +564,6 @@ files:
 - 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/puppet_version.rb
 - lib/facter/facts/macosx/ruby/platform.rb
 - lib/facter/facts/macosx/ruby/sitedir.rb
 - lib/facter/facts/macosx/ruby/version.rb
@@ -704,7 +690,6 @@ files:
 - 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/puppet_version.rb
 - lib/facter/facts/solaris/ruby/platform.rb
 - lib/facter/facts/solaris/ruby/sitedir.rb
 - lib/facter/facts/solaris/ruby/version.rb
@@ -796,7 +781,6 @@ files:
 - 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/puppet_version.rb
 - lib/facter/facts/windows/ruby/platform.rb
 - lib/facter/facts/windows/ruby/sitedir.rb
 - lib/facter/facts/windows/ruby/version.rb
@@ -811,11 +795,6 @@ files:
 - lib/facter/facts/windows/timezone.rb
 - lib/facter/facts/windows/virtualization/is_virtual.rb
 - lib/facter/facts/windows/virtualization/virtual.rb
-- lib/facter/facts_utils/facts_utils.rb
-- lib/facter/facts_utils/unit_converter.rb
-- lib/facter/facts_utils/uptime_parser.rb
-- lib/facter/facts_utils/virtual_detector.rb
-- lib/facter/facts_utils/windows_release_finder.rb
 - lib/facter/framework/benchmarking/timer.rb
 - lib/facter/framework/cli/cli.rb
 - lib/facter/framework/cli/cli_launcher.rb
@@ -849,7 +828,6 @@ files:
 - lib/facter/framework/logging/logger.rb
 - lib/facter/framework/logging/logger_helper.rb
 - lib/facter/framework/parsers/query_parser.rb
-- lib/facter/framework/utils/utils.rb
 - lib/facter/models/fact_collection.rb
 - lib/facter/models/loaded_fact.rb
 - lib/facter/models/resolved_fact.rb
@@ -870,8 +848,6 @@ files:
 - lib/facter/resolvers/aix/partitions.rb
 - lib/facter/resolvers/aix/processors.rb
 - lib/facter/resolvers/aix/serialnumber.rb
-- lib/facter/resolvers/aix/utils/info_extractor.rb
-- lib/facter/resolvers/aix/utils/odm_query.rb
 - lib/facter/resolvers/augeas_resolver.rb
 - lib/facter/resolvers/base_resolver.rb
 - lib/facter/resolvers/bsd/ffi/ffi_helper.rb
@@ -894,6 +870,7 @@ files:
 - lib/facter/resolvers/freebsd/processors.rb
 - lib/facter/resolvers/freebsd/swap_memory_resolver.rb
 - lib/facter/resolvers/freebsd/system_memory_resolver.rb
+- lib/facter/resolvers/freebsd/virtual_resolver.rb
 - lib/facter/resolvers/gce.rb
 - lib/facter/resolvers/hostname_resolver.rb
 - lib/facter/resolvers/identity_resolver.rb
@@ -911,7 +888,6 @@ files:
 - lib/facter/resolvers/macosx/swap_memory_resolver.rb
 - lib/facter/resolvers/macosx/system_memory_resolver.rb
 - lib/facter/resolvers/macosx/system_profiler_resolver.rb
-- lib/facter/resolvers/macosx/utils/system_profile_executor.rb
 - lib/facter/resolvers/memory_resolver.rb
 - lib/facter/resolvers/mountpoints_resolver.rb
 - lib/facter/resolvers/networking_linux_resolver.rb
@@ -921,7 +897,6 @@ files:
 - lib/facter/resolvers/partitions.rb
 - lib/facter/resolvers/path_resolver.rb
 - lib/facter/resolvers/processors_resolver.rb
-- lib/facter/resolvers/puppet_version_resolver.rb
 - lib/facter/resolvers/redhat_release_resolver.rb
 - lib/facter/resolvers/ruby_resolver.rb
 - lib/facter/resolvers/selinux_resolver.rb
@@ -947,14 +922,6 @@ files:
 - lib/facter/resolvers/timezone_resolver.rb
 - lib/facter/resolvers/uname_resolver.rb
 - lib/facter/resolvers/uptime_resolver.rb
-- lib/facter/resolvers/utils/ffi/load_averages.rb
-- lib/facter/resolvers/utils/filesystem_helper.rb
-- lib/facter/resolvers/utils/fingerprint.rb
-- lib/facter/resolvers/utils/http.rb
-- lib/facter/resolvers/utils/networking.rb
-- lib/facter/resolvers/utils/ssh.rb
-- lib/facter/resolvers/utils/ssh_helper.rb
-- lib/facter/resolvers/utils/uptime_helper.rb
 - lib/facter/resolvers/virt_what.rb
 - lib/facter/resolvers/vmware.rb
 - lib/facter/resolvers/windows/aio_agent_version.rb
@@ -984,7 +951,6 @@ files:
 - lib/facter/resolvers/windows/ssh.rb
 - lib/facter/resolvers/windows/system32_resolver.rb
 - lib/facter/resolvers/windows/uptime_resolver.rb
-- lib/facter/resolvers/windows/utils/win32ole.rb
 - lib/facter/resolvers/windows/virtualization_resolver.rb
 - lib/facter/resolvers/windows/win_os_description_resolver.rb
 - lib/facter/resolvers/wpar_resolver.rb
@@ -992,8 +958,30 @@ files:
 - lib/facter/resolvers/zfs.rb
 - lib/facter/resolvers/zpool.rb
 - lib/facter/templates/man.erb
+- lib/facter/util/aix/info_extractor.rb
+- lib/facter/util/aix/odm_query.rb
 - lib/facter/util/api_debugger.rb
+- lib/facter/util/facts/facts_utils.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/macosx/system_profile_executor.rb
+- lib/facter/util/resolvers/aws_token.rb
+- lib/facter/util/resolvers/ffi/load_averages.rb
+- lib/facter/util/resolvers/filesystem_helper.rb
+- lib/facter/util/resolvers/fingerprint.rb
+- lib/facter/util/resolvers/http.rb
+- lib/facter/util/resolvers/networking.rb
+- lib/facter/util/resolvers/networking/dhcp.rb
+- lib/facter/util/resolvers/networking/networking.rb
+- lib/facter/util/resolvers/networking/primary_interface.rb
+- lib/facter/util/resolvers/ssh.rb
+- lib/facter/util/resolvers/ssh_helper.rb
+- lib/facter/util/resolvers/uptime_helper.rb
+- lib/facter/util/utils.rb
+- lib/facter/util/windows/win32ole.rb
 - lib/facter/version.rb
 homepage: 
 licenses:

data/lib/facter/facts/aix/puppet_version.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Facts
-  module Aix
-    class PuppetVersion
-      FACT_NAME = 'puppetversion'
-
-      def call_the_resolver
-        fact_value = Facter::Resolvers::PuppetVersionResolver.resolve(:puppetversion)
-
-        Facter::ResolvedFact.new(FACT_NAME, fact_value)
-      end
-    end
-  end
-end

data/lib/facter/facts/freebsd/puppet_version.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Facts
-  module Freebsd
-    class PuppetVersion
-      FACT_NAME = 'puppetversion'
-
-      def call_the_resolver
-        fact_value = Facter::Resolvers::PuppetVersionResolver.resolve(:puppetversion)
-
-        Facter::ResolvedFact.new(FACT_NAME, fact_value)
-      end
-    end
-  end
-end

data/lib/facter/facts/linux/puppet_version.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Facts
-  module Linux
-    class PuppetVersion
-      FACT_NAME = 'puppetversion'
-
-      def call_the_resolver
-        fact_value = Facter::Resolvers::PuppetVersionResolver.resolve(:puppetversion)
-
-        Facter::ResolvedFact.new(FACT_NAME, fact_value)
-      end
-    end
-  end
-end

data/lib/facter/facts/macosx/puppet_version.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Facts
-  module Macosx
-    class PuppetVersion
-      FACT_NAME = 'puppetversion'
-
-      def call_the_resolver
-        fact_value = Facter::Resolvers::PuppetVersionResolver.resolve(:puppetversion)
-
-        Facter::ResolvedFact.new(FACT_NAME, fact_value)
-      end
-    end
-  end
-end