facter 4.0.33 → 4.0.38

data/lib/facter/facts/windows/networking/netmask6.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'netmask6'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:netmask6)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:netmask6)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/windows/networking/network.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'network'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:network)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:network)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/windows/networking/network6.rb

@@ -8,7 +8,7 @@ module Facts
         ALIASES = 'network6'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:network6)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:network6)
 
           [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end

data/lib/facter/facts/windows/networking/primary.rb

@@ -7,7 +7,7 @@ module Facts
         FACT_NAME = 'networking.primary'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:primary_interface)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:primary_interface)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facter/facts/windows/networking/scope6.rb

@@ -5,11 +5,13 @@ module Facts
     module Networking
       class Scope6
         FACT_NAME = 'networking.scope6'
+        ALIASES = 'scope6'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Networking.resolve(:scope6)
+          fact_value = Facter::Resolvers::Windows::Networking.resolve(:scope6)
 
-          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value),
+           Facter::ResolvedFact.new('scope6', fact_value, :legacy)]
         end
       end
     end

data/lib/facter/facts/windows/scope6_interfaces.rb

@@ -9,7 +9,7 @@ module Facts
       def call_the_resolver
         arr = []
         result = {}
-        interfaces = Facter::Resolvers::Networking.resolve(:interfaces)
+        interfaces = Facter::Resolvers::Windows::Networking.resolve(:interfaces)
         interfaces&.each { |interface_name, info| result["scope6_#{interface_name}"] = info[:scope6] if info[:scope6] }
 
         result.each { |fact, value| arr << Facter::ResolvedFact.new(fact, value, :legacy) }

data/lib/facter/facts/windows/sshalgorithmkey.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Facts
+  module Windows
+    class Sshalgorithmkey
+      FACT_NAME = 'ssh.*key'
+      TYPE = :legacy
+
+      def call_the_resolver
+        facts = []
+        privileged = Facter::Resolvers::Identity.resolve(:privileged)
+
+        return facts unless privileged
+
+        result = Facter::Resolvers::Windows::Ssh.resolve(:ssh)
+
+        result&.each { |ssh| facts << Facter::ResolvedFact.new("ssh#{ssh.name.to_sym}key", ssh.key, :legacy) }
+        facts
+      end
+    end
+  end
+end

data/lib/facter/facts/windows/sshfp_algorithm.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Facts
+  module Windows
+    class SshfpAlgorithm
+      FACT_NAME = 'sshfp_.*'
+      TYPE = :legacy
+
+      def call_the_resolver
+        facts = []
+        privileged = Facter::Resolvers::Identity.resolve(:privileged)
+
+        return facts unless privileged
+
+        result = Facter::Resolvers::Windows::Ssh.resolve(:ssh)
+
+        result&.each do |ssh|
+          facts << Facter::ResolvedFact.new("sshfp_#{ssh.name.to_sym}",
+                                            "#{ssh.fingerprint.sha1}\n#{ssh.fingerprint.sha256}", :legacy)
+        end
+        facts
+      end
+    end
+  end
+end

data/lib/facter/facts_utils/facts_utils.rb

@@ -6,5 +6,7 @@ module Facter
                          'KVM' => 'kvm', 'Virtual Machine' => 'hyperv', 'RHEV Hypervisor' => 'rhev',
                          'oVirt Node' => 'ovirt', 'HVM domU' => 'xenhvm', 'Bochs' => 'bochs', 'OpenBSD' => 'vmm',
                          'BHYVE' => 'bhyve' }.freeze
+
+    PHYSICAL_HYPERVISORS = %w[physical xen0 vmware_server vmware_workstation openvzhn vserver_host].freeze
   end
 end

data/lib/facter/framework/benchmarking/timer.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'benchmark'
+
+module Facter
+  module Framework
+    module Benchmarking
+      class Timer
+        class << self
+          def measure(fact_name)
+            if Options[:timing]
+              time = Benchmark.measure { yield }
+
+              puts "fact `#{fact_name}`, took: #{time.format('%r')} seconds"
+            else
+              yield
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/framework/cli/cli.rb

@@ -108,6 +108,11 @@ module Facter
                  aliases: '-p',
                  desc: 'Load the Puppet libraries, thus allowing Facter to load Puppet-specific facts.'
 
+    class_option :timing,
+                 type: :boolean,
+                 aliases: '-t',
+                 desc: 'Show how much time it took to resolve each fact'
+
     desc '--man', 'Manual', hide: true
     map ['--man'] => :man
     def man(*args)
@@ -138,14 +143,26 @@ module Facter
 
     desc '--list-block-groups', 'List block groups', hide: true
     map ['--list-block-groups'] => :list_block_groups
-    def list_block_groups(*_args)
-      puts Facter::FactGroups.new.groups.to_yaml.lines[1..-1].join
+    def list_block_groups(*args)
+      options = @options.map { |(k, v)| [k.to_sym, v] }.to_h
+      Facter::Options.init_from_cli(options, args)
+
+      block_groups = Facter::FactGroups.new.groups.to_yaml.lines[1..-1].join
+      block_groups.gsub!(/:\s*\n/, "\n")
+
+      puts block_groups
     end
 
     desc '--list-cache-groups', 'List cache groups', hide: true
     map ['--list-cache-groups'] => :list_cache_groups
-    def list_cache_groups(*_args)
-      puts Facter::FactGroups.new.groups.to_yaml.lines[1..-1].join
+    def list_cache_groups(*args)
+      options = @options.map { |(k, v)| [k.to_sym, v] }.to_h
+      Facter::Options.init_from_cli(options, args)
+
+      cache_groups = Facter::FactGroups.new.groups.to_yaml.lines[1..-1].join
+      cache_groups.gsub!(/:\s*\n/, "\n")
+
+      puts cache_groups
     end
 
     def self.exit_on_failure?

data/lib/facter/framework/config/fact_groups.rb

@@ -13,6 +13,7 @@ module Facter
       @groups_file_path = group_list_path || default_path
       @groups ||= File.readable?(@groups_file_path) ? Hocon.load(@groups_file_path) : {}
       load_groups
+      load_groups_from_options
     end
 
     # Breakes down blocked groups in blocked facts
@@ -42,6 +43,18 @@ module Facter
 
     private
 
+    def load_groups_from_options
+      Options.external_dir.each do |dir|
+        next unless Dir.exist?(dir)
+
+        ext_facts = Dir.entries(dir)
+        ext_facts.reject! { |ef| ef =~ /^(\.|\.\.)$/ }
+        ext_facts.each do |ef|
+          @groups[ef] = nil
+        end
+      end
+    end
+
     def load_groups
       config = ConfigReader.init(Options[:config])
       @block_list = config.block_list || {}

data/lib/facter/framework/core/fact/internal/core_fact.rb

@@ -9,6 +9,8 @@ module Facter
     def create
       fact_class = @searched_fact.fact_class
 
+      return unless fact_class
+
       fact_class.new.call_the_resolver
     end
   end

data/lib/facter/framework/core/fact/internal/internal_fact_manager.rb

@@ -6,9 +6,8 @@ module Facter
 
     def resolve_facts(searched_facts)
       internal_searched_facts = filter_internal_facts(searched_facts)
-      threads = start_threads(internal_searched_facts)
-      resolved_facts = join_threads(threads, internal_searched_facts)
 
+      resolved_facts = resolve(internal_searched_facts)
       nil_resolved_facts = resolve_nil_facts(searched_facts)
 
       resolved_facts.concat(nil_resolved_facts)
@@ -29,36 +28,23 @@ module Facter
       resolved_facts
     end
 
-    def start_threads(searched_facts)
-      threads = []
-      # only resolve a fact once, even if multiple search facts depend on that fact
+    def resolve(searched_facts)
+      resolved_facts = []
+
       searched_facts
         .uniq { |searched_fact| searched_fact.fact_class.name }
         .each do |searched_fact|
-        threads << Thread.new do
-          begin
-            fact = CoreFact.new(searched_fact)
-            fact.create
-          rescue StandardError => e
-            @@log.log_exception(e)
-            nil
-          end
+        begin
+          fact = CoreFact.new(searched_fact)
+          fact_value = nil
+          Facter::Framework::Benchmarking::Timer.measure(searched_fact.name) { fact_value = fact.create }
+          resolved_facts << fact_value unless fact_value.nil?
+        rescue StandardError => e
+          @@log.log_exception(e)
         end
       end
 
-      threads
-    end
-
-    def join_threads(threads, searched_facts)
-      resolved_facts = []
-
-      threads.each do |thread|
-        thread.join
-        resolved_facts << thread.value unless thread.value.nil?
-      end
-
       resolved_facts.flatten!
-
       FactAugmenter.augment_resolved_facts(searched_facts, resolved_facts)
     end
   end

data/lib/facter/framework/core/fact_filter.rb

@@ -7,6 +7,8 @@ module Facter
   class FactFilter
     def filter_facts!(searched_facts)
       filter_legacy_facts!(searched_facts)
+      filter_blocked_legacy_facts!(searched_facts)
+
       searched_facts.each do |fact|
         fact.value = if fact.filter_tokens.any? && fact.value.respond_to?(:dig)
                        fact.value.dig(*fact.filter_tokens)
@@ -18,6 +20,17 @@ module Facter
 
     private
 
+    # This will filter out the legacy facts that should be blocked. Because some legacy facts are just aliases
+    # to the core ones, even if they are blocked, facter will resolved them but they won't be displayed.
+
+    def filter_blocked_legacy_facts!(facts)
+      blocked_facts = Options[:blocked_facts] || []
+
+      facts.reject! do |fact|
+        blocked_facts.select { |blocked_fact| fact.name.match(/^#{blocked_fact}/) && fact.type == :legacy }.any?
+      end
+    end
+
     def filter_legacy_facts!(resolved_facts)
       return unless !Options[:show_legacy] && Options[:user_query].empty?
 

data/lib/facter/framework/core/fact_loaders/fact_loader.rb

@@ -64,11 +64,34 @@ module Facter
     def block_facts(facts, options)
       blocked_facts = options[:blocked_facts] || []
 
+      reject_list_core, reject_list_legacy = construct_reject_lists(blocked_facts, facts)
+
       facts = facts.reject do |fact|
-        blocked_facts.select { |blocked_fact| fact.name.match(/^#{blocked_fact}/) }.any?
+        reject_list_core.include?(fact) || reject_list_core.find do |fact_to_block|
+          fact_to_block.klass == fact.klass
+        end || reject_list_legacy.include?(fact)
       end
 
       facts
     end
+
+    def construct_reject_lists(blocked_facts, facts)
+      reject_list_core = []
+      reject_list_legacy = []
+
+      blocked_facts.each do |blocked|
+        facts.each do |fact|
+          next unless fact.name =~ /^#{blocked}/
+
+          if fact.type == :core
+            reject_list_core << fact
+          else
+            reject_list_legacy << fact
+          end
+        end
+      end
+
+      [reject_list_core, reject_list_legacy]
+    end
   end
 end

data/lib/facter/framework/core/fact_loaders/internal_fact_loader.rb

@@ -30,18 +30,18 @@ module Facter
     def load_for_os(operating_system)
       # select only classes
       classes = ClassDiscoverer.instance.discover_classes(operating_system)
-
       classes.each do |class_name|
         fact_name = class_name::FACT_NAME
-
         # if fact is already loaded, skip it
-        next if @facts.any? { |fact| fact.name == fact_name }
-
-        type = class_name.const_defined?('TYPE') ? class_name::TYPE : :core
-        load_fact(fact_name, class_name, type)
+        unless @facts.any? { |fact| fact.name == fact_name }
+          type = class_name.const_defined?('TYPE') ? class_name::TYPE : :core
+          load_fact(fact_name, class_name, type)
+        end
         next unless class_name.const_defined?('ALIASES')
 
-        [*class_name::ALIASES].each { |fact_alias| load_fact(fact_alias, class_name, :legacy) }
+        [*class_name::ALIASES].each do |fact_alias|
+          load_fact(fact_alias, class_name, :legacy) unless @facts.any? { |fact| fact.name == fact_alias }
+        end
       end
     end
 

data/lib/facter/framework/core/file_loader.rb

@@ -39,6 +39,8 @@ load_dir(['resolvers'])
 load_dir(['facts_utils'])
 load_dir(%w[framework core])
 load_dir(['models'])
+load_dir(%w[framework benchmarking])
+
 load_dir(%w[framework core fact_loaders])
 load_dir(%w[framework core fact internal])
 load_dir(%w[framework core fact external])

data/lib/facter/framework/core/options/option_store.rb

@@ -23,6 +23,7 @@ module Facter
     @block_list = {}
     @fact_groups = {}
     @color = false
+    @timing = false
 
     class << self
       attr_reader :debug, :verbose, :log_level, :show_legacy, :ruby,
@@ -31,7 +32,7 @@ module Facter
       attr_accessor :config, :user_query, :strict, :json, :haml, :external_facts,
                     :cache, :yaml, :puppet, :ttls, :block, :cli, :config_file_custom_dir,
                     :config_file_external_dir, :default_external_dir, :fact_groups,
-                    :block_list, :color, :trace
+                    :block_list, :color, :trace, :timing
 
       attr_writer :external_dir
 
@@ -159,6 +160,7 @@ module Facter
         @blocked_facts = []
         @fact_groups = {}
         @block_list = {}
+        @timing = false
       end
 
       def fallback_external_dir

data/lib/facter/framework/core/session_cache.rb

@@ -2,13 +2,10 @@
 
 module Facter
   class SessionCache
-    @semaphore = Mutex.new
     @resolvers = []
 
     def self.subscribe(resolver)
-      @semaphore.synchronize do
-        @resolvers << resolver
-      end
+      @resolvers << resolver
     end
 
     def self.invalidate_all_caches

data/lib/facter/framework/detector/os_detector.rb

@@ -44,7 +44,11 @@ class OsDetector
     hierarchy = @os_hierarchy.construct_hierarchy(identifier)
     if hierarchy.empty?
       @log.debug("Could not detect hierarchy using os identifier: #{identifier} , trying with family")
-      hierarchy = @os_hierarchy.construct_hierarchy(detect_family)
+
+      detect_family.to_s.split.each do |family|
+        hierarchy = @os_hierarchy.construct_hierarchy(family)
+        return hierarchy unless hierarchy.empty?
+      end
     end
 
     if hierarchy.empty?

data/lib/facter/framework/formatters/legacy_fact_formatter.rb

@@ -26,7 +26,8 @@ module Facter
       pretty_json = hash_to_facter_format(fact_collection)
 
       pretty_json = remove_enclosing_accolades(pretty_json)
-      remove_comma_and_quotation(pretty_json)
+      pretty_json = remove_comma_and_quotation(pretty_json)
+      handle_newlines(pretty_json)
     end
 
     def format_for_multiple_user_queries(user_queries, resolved_facts)
@@ -38,6 +39,7 @@ module Facter
       pretty_json = hash_to_facter_format(facts_to_display)
       pretty_json = remove_enclosing_accolades(pretty_json)
       pretty_json = remove_comma_and_quotation(pretty_json)
+      pretty_json = handle_newlines(pretty_json)
 
       @log.debug('Remove quotes from value if value is a string')
       pretty_json.gsub(/^(\S*) => \"(.*)\"/, '\1 => \2')
@@ -84,6 +86,11 @@ module Facter
       pretty_fact_json.gsub(/^},/, '}')
     end
 
+    def handle_newlines(pretty_fact_json)
+      @log.debug('Convert newline characters to actual newlines')
+      pretty_fact_json.gsub('\n', "\n")
+    end
+
     def remove_comma_and_quotation(output)
       # quotation marks that come after \ are not removed
       @log.debug('Remove unnecessary comma and quotation marks on root facts')