facter 4.0.26 → 4.0.28

data/lib/facts/macosx/networking/network.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Facts
+  module Macosx
+    module Networking
+      class Network
+        FACT_NAME = 'networking.network'
+        ALIASES = 'network'
+
+        def call_the_resolver
+          interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
+          primary = Facter::Resolvers::Macosx::Networking.resolve(:primary_interface)
+
+          fact_value = interfaces.dig(primary, :network) unless interfaces.nil?
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facts/macosx/networking/network6.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Facts
+  module Macosx
+    module Networking
+      class Network6
+        FACT_NAME = 'networking.network6'
+        ALIASES = 'network6'
+
+        def call_the_resolver
+          interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
+          primary = Facter::Resolvers::Macosx::Networking.resolve(:primary_interface)
+
+          fact_value = interfaces.dig(primary, :network6) unless interfaces.nil?
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facts/macosx/networking/primary.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Macosx
+    module Networking
+      class Primary
+        FACT_NAME = 'networking.primary'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Macosx::Networking.resolve(:primary_interface)
+
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facts/macosx/networking/scope6.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Facts
+  module Macosx
+    module Networking
+      class Scope6
+        FACT_NAME = 'networking.scope6'
+
+        def call_the_resolver
+          interfaces = Facter::Resolvers::Macosx::Networking.resolve(:interfaces)
+          primary = Facter::Resolvers::Macosx::Networking.resolve(:primary_interface)
+
+          fact_value = interfaces.dig(primary, :scope6) unless interfaces.nil?
+
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facts/solaris/aio_agent_version.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    class AioAgentVersion
+      FACT_NAME = 'aio_agent_version'
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::AioAgentVersion.resolve(:aio_agent_version)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

data/lib/facts/windows/aio_agent_version.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Facts
+  module Windows
+    class AioAgentVersion
+      FACT_NAME = 'aio_agent_version'
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::Windows::AioAgentVersion.resolve(:aio_agent_version)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

data/lib/facts/windows/ec2_metadata.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Facts
+  module Windows
+    class Ec2Metadata
+      FACT_NAME = 'ec2_metadata'
+
+      def call_the_resolver
+        return Facter::ResolvedFact.new(FACT_NAME, nil) unless aws?
+
+        fact_value = Facter::Resolvers::Ec2.resolve(:metadata)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value.empty? ? nil : fact_value)
+      end
+
+      def aws?
+        virtual = Facter::Resolvers::Virtualization.resolve(:virtual)
+
+        virtual == 'kvm' || virtual =~ /xen/
+      end
+    end
+  end
+end

data/lib/facts/windows/ec2_userdata.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Facts
+  module Windows
+    class Ec2Userdata
+      FACT_NAME = 'ec2_userdata'
+
+      def call_the_resolver
+        return Facter::ResolvedFact.new(FACT_NAME, nil) unless aws?
+
+        fact_value = Facter::Resolvers::Ec2.resolve(:userdata)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value.empty? ? nil : fact_value)
+      end
+
+      def aws?
+        virtual = Facter::Resolvers::Virtualization.resolve(:virtual)
+
+        virtual == 'kvm' || virtual =~ /xen/
+      end
+    end
+  end
+end

data/lib/facts_utils/hypervisors.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+module Facter
+  module FactsUtils
+    HYPERVISORS_HASH = { 'VMware' => 'vmware', 'VirtualBox' => 'virtualbox', 'Parallels' => 'parallels',
+                         'KVM' => 'kvm', 'Virtual Machine' => 'hyperv', 'RHEV Hypervisor' => 'rhev',
+                         'oVirt Node' => 'ovirt', 'HVM domU' => 'xenhvm', 'Bochs' => 'bochs', 'OpenBSD' => 'vmm',
+                         'BHYVE' => 'bhyve' }.freeze
+  end
+end

data/lib/framework/core/cache_manager.rb

@@ -13,14 +13,17 @@ module Facter
       return searched_facts, [] if !File.directory?(@cache_dir) || !Options[:cache]
 
       facts = []
-      searched_facts.each do |fact|
+      searched_facts.delete_if do |fact|
         res = resolve_fact(fact)
-        facts << res if res
+        if res
+          facts << res
+          true
+        else
+          false
+        end
       end
-      facts.each do |fact|
-        searched_facts.delete_if { |f| f.name == fact.name }
-      end
-      [searched_facts, facts]
+
+      [searched_facts, facts.flatten]
     end
 
     def cache_facts(resolved_facts)
@@ -37,10 +40,21 @@ module Facter
       end
     end
 
+    def group_cached?(group_name)
+      cached = @fact_groups.get_group_ttls(group_name) ? true : false
+      delete_cache(group_name) unless cached
+      cached
+    end
+
     private
 
     def resolve_fact(searched_fact)
-      group_name = @fact_groups.get_fact_group(searched_fact.name)
+      group_name =  if searched_fact.file
+                      searched_fact.name
+                    else
+                      @fact_groups.get_fact_group(searched_fact.name)
+                    end
+
       return unless group_name
 
       return unless group_cached?(group_name)
@@ -51,16 +65,32 @@ module Facter
       return unless data
 
       @log.debug("loading cached values for #{group_name} facts")
-      create_fact(searched_fact, data[searched_fact.name])
+
+      create_facts(searched_fact, data)
     end
 
-    def create_fact(searched_fact, value)
-      Facter::ResolvedFact.new(searched_fact.name, value, searched_fact.type,
-                               searched_fact.user_query, searched_fact.filter_tokens)
+    def create_facts(searched_fact, data)
+      if searched_fact.type == :file
+        facts = []
+        data.each do |fact_name, fact_value|
+          fact = Facter::ResolvedFact.new(fact_name, fact_value, searched_fact.type,
+                                          searched_fact.user_query, searched_fact.filter_tokens)
+          fact.file = searched_fact.file
+          facts << fact
+        end
+        facts
+      else
+        [Facter::ResolvedFact.new(searched_fact.name, data[searched_fact.name], searched_fact.type,
+                                  searched_fact.user_query, searched_fact.filter_tokens)]
+      end
     end
 
     def cache_fact(fact)
-      group_name = @fact_groups.get_fact_group(fact.name)
+      group_name = if fact.file
+                     File.basename(fact.file)
+                   else
+                     @fact_groups.get_fact_group(fact.name)
+                   end
       return if !group_name || fact.value.nil?
 
       return unless group_cached?(group_name)
@@ -98,12 +128,6 @@ module Facter
       @groups[group_name] = data
     end
 
-    def group_cached?(group_name)
-      cached = @fact_groups.get_group_ttls(group_name) ? true : false
-      delete_cache(group_name) unless cached
-      cached
-    end
-
     def check_ttls?(group_name)
       ttls = @fact_groups.get_group_ttls(group_name)
       return false unless ttls

data/lib/framework/core/fact/external/external_fact_manager.rb

@@ -17,10 +17,11 @@ module Facter
       resolved_custom_facts = []
 
       custom_facts.each do |custom_fact|
-        fact_value = LegacyFacter.value(custom_fact.name)
-        resolved_fact = ResolvedFact.new(custom_fact.name, fact_value, :custom)
+        fact = LegacyFacter[custom_fact.name]
+        resolved_fact = ResolvedFact.new(custom_fact.name, fact.value, :custom)
         resolved_fact.filter_tokens = []
         resolved_fact.user_query = custom_fact.user_query
+        resolved_fact.file = fact.options[:file]
 
         resolved_custom_facts << resolved_fact
       end

data/lib/framework/core/fact_loaders/external_fact_loader.rb

@@ -34,8 +34,9 @@ module Facter
 
       external_facts_to_load = LegacyFacter.collection.external_facts
 
-      external_facts_to_load&.each do |external_fact_name|
-        loaded_fact = LoadedFact.new(external_fact_name.to_s, nil, :external)
+      external_facts_to_load&.each do |k, v|
+        loaded_fact = LoadedFact.new(k.to_s, nil, :external)
+        loaded_fact.file = v.options[:file]
         external_facts << loaded_fact
       end
 

data/lib/framework/formatters/legacy_fact_formatter.rb

@@ -14,7 +14,8 @@ module Facter
 
       user_query = user_queries.first
       return format_for_no_query(resolved_facts) if user_query.empty?
-      return format_for_single_user_query(user_queries.first, resolved_facts) unless user_query.empty?
+
+      format_for_single_user_query(user_queries.first, resolved_facts)
     end
 
     private
@@ -25,7 +26,7 @@ module Facter
       pretty_json = hash_to_facter_format(fact_collection)
 
       pretty_json = remove_enclosing_accolades(pretty_json)
-      remove_comma_and_quation(pretty_json)
+      remove_comma_and_quotation(pretty_json)
     end
 
     def format_for_multiple_user_queries(user_queries, resolved_facts)
@@ -36,7 +37,7 @@ module Facter
       facts_to_display.each { |k, v| facts_to_display[k] = v.nil? ? '' : v }
       pretty_json = hash_to_facter_format(facts_to_display)
       pretty_json = remove_enclosing_accolades(pretty_json)
-      pretty_json = remove_comma_and_quation(pretty_json)
+      pretty_json = remove_comma_and_quotation(pretty_json)
 
       @log.debug('Remove quotes from value if value is a string')
       pretty_json.gsub(/^(\S*) => \"(.*)\"/, '\1 => \2')
@@ -60,7 +61,7 @@ module Facter
       pretty_json = JSON.pretty_generate(facts_hash)
 
       @log.debug('Change key value delimiter from : to =>')
-      pretty_json.gsub!(/":/, '" =>')
+      pretty_json.gsub!(/":\s/, '" => ')
 
       @log.debug('Remove quotes from parent nodes')
       pretty_json.gsub!(/\"(.*)\"\ =>/, '\1 =>')
@@ -83,7 +84,7 @@ module Facter
       pretty_fact_json.gsub(/^},/, '}')
     end
 
-    def remove_comma_and_quation(output)
+    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')
       output.split("\n")

data/lib/framework/parsers/query_parser.rb

@@ -26,7 +26,8 @@ module Facter
         matched_facts = []
         @log.debug "User query is: #{query_list}"
         @query_list = query_list
-        query_list = loaded_fact.map(&:name) unless query_list.any?
+
+        return no_user_query(loaded_fact) unless query_list.any?
 
         query_list.each do |query|
           @log.debug "Query is #{query}"
@@ -37,6 +38,14 @@ module Facter
         matched_facts.flatten(1)
       end
 
+      def no_user_query(loaded_facts)
+        searched_facts = []
+        loaded_facts.each do |loaded_fact|
+          searched_facts << SearchedFact.new(loaded_fact.name, loaded_fact.klass, [], '', loaded_fact.type)
+        end
+        searched_facts
+      end
+
       def search_for_facts(query, loaded_fact_hash)
         resolvable_fact_list = []
         query = query.to_s
@@ -90,7 +99,10 @@ module Facter
         fact_name = loaded_fact.name.to_s
         klass_name = loaded_fact.klass
         type = loaded_fact.type
-        SearchedFact.new(fact_name, klass_name, filter_tokens, user_query, type)
+        sf = SearchedFact.new(fact_name, klass_name, filter_tokens, user_query, type)
+        sf.file = loaded_fact.file
+
+        sf
       end
 
       def construct_filter_tokens(query_tokens, query_token_range)

data/lib/models/loaded_fact.rb

@@ -3,11 +3,13 @@
 module Facter
   class LoadedFact
     attr_reader :name, :klass, :type
+    attr_accessor :file
 
-    def initialize(name, klass, type = nil)
+    def initialize(name, klass, type = nil, file = nil)
       @name = name
       @klass = klass
       @type = type.nil? ? :core : type
+      @file = file
     end
   end
 end

data/lib/models/resolved_fact.rb

@@ -3,7 +3,7 @@
 module Facter
   class ResolvedFact
     attr_reader :name, :type
-    attr_accessor :user_query, :filter_tokens, :value
+    attr_accessor :user_query, :filter_tokens, :value, :file
 
     def initialize(name, value = '', type = :core, user_query = nil, filter_tokens = [])
       @name = name

data/lib/models/searched_fact.rb

@@ -3,6 +3,7 @@
 module Facter
   class SearchedFact
     attr_reader :name, :fact_class, :filter_tokens, :user_query, :type
+    attr_accessor :file
 
     def initialize(fact_name, fact_class, filter_tokens, user_query, type)
       @name = fact_name

data/lib/resolvers/{agent_resolver.rb → aio_agent_version.rb}

@@ -2,7 +2,7 @@
 
 module Facter
   module Resolvers
-    class Agent < BaseResolver
+    class AioAgentVersion < BaseResolver
       @semaphore = Mutex.new
       @fact_list ||= {}
 
@@ -14,8 +14,9 @@ module Facter
         end
 
         def read_agent_version
-          version_file = ::File.join(ROOT_DIR, 'lib/puppet/VERSION')
-          @fact_list[:aio_agent_version] = ::File.read(version_file)
+          aio_agent_version = Util::FileHelper.safe_read('/opt/puppetlabs/puppet/VERSION', nil)&.chomp
+          aio_agent_version = aio_agent_version&.match(/^\d+\.\d+\.\d+(\.\d+){0,2}/)&.to_s
+          @fact_list[:aio_agent_version] = aio_agent_version
         end
       end
     end

data/lib/resolvers/bsd/ffi/ffi_helper.rb

@@ -10,6 +10,7 @@ module Facter
 
         ffi_lib 'c'
         attach_function :getloadavg, %i[pointer int], :int
+        attach_function :sysctl, %i[pointer uint pointer pointer pointer size_t], :int
       end
 
       def self.read_load_averages
@@ -20,6 +21,36 @@ module Facter
 
         raw_loadavg.read_array_of_double(res)
       end
+
+      def self.sysctl(type, oids)
+        name = FFI::MemoryPointer.new(:uint, oids.size)
+        name.write_array_of_uint(oids)
+        namelen = oids.size
+
+        oldp = FFI::Pointer::NULL
+        oldlenp = FFI::MemoryPointer.new(:size_t)
+
+        newp = FFI::Pointer::NULL
+        newlen = 0
+
+        if type == :string
+          res = Libc.sysctl(name, namelen, oldp, oldlenp, newp, newlen)
+          return nil if res.negative?
+        else
+          oldlenp.write(:size_t, FFI.type_size(type))
+        end
+
+        oldp = FFI::MemoryPointer.new(:uint8_t, oldlenp.read(:size_t))
+        res = Libc.sysctl(name, namelen, oldp, oldlenp, newp, newlen)
+        return nil if res.negative?
+
+        case type
+        when :string
+          oldp.read_string
+        else
+          oldp.read(type)
+        end
+      end
     end
   end
 end