facter 4.0.32 → 4.0.37

data/lib/facter/resolvers/aix/serialnumber.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Aix
+      class Serialnumber < BaseResolver
+        @fact_list ||= {}
+
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { read_serialnumber(fact_name) }
+          end
+
+          def read_serialnumber(fact_name)
+            odmquery = Facter::ODMQuery.new
+            odmquery
+              .equals('name', 'sys0')
+              .equals('attribute', 'systemid')
+            result = odmquery.execute
+
+            result.each_line do |line|
+              if line.include?('value')
+                @fact_list[:serialnumber] = line.split('=')[1].strip.delete('\"')[6..-1]
+                break
+              end
+            end
+
+            @fact_list[fact_name]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/augeas_resolver.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class Augeas < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/base_resolver.rb

@@ -16,15 +16,20 @@ module Facter
       end
 
       def self.resolve(fact_name)
-        @semaphore.synchronize do
-          subscribe_to_manager
-          post_resolve(fact_name)
-        end
-      rescue LoadError => e
+        subscribe_to_manager
+        post_resolve(fact_name)
+
+        validate_resolution(fact_name)
+      rescue LoadError, NameError => e
         log.debug("resolving fact #{fact_name}, but #{e}")
         @fact_list[fact_name] = nil
       end
 
+      def self.validate_resolution(fact_name)
+        @fact_list.fetch(fact_name) { @fact_list[fact_name] = nil }
+        @fact_list[fact_name]
+      end
+
       def self.post_resolve(_fact_name)
         raise NotImplementedError, "You must implement post_resolve(fact_name) method in #{name}"
       end

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

@@ -9,19 +9,9 @@ module Facter
         extend FFI::Library
 
         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
-        raw_loadavg = FFI::MemoryPointer.new(:double, 3)
-
-        res = Libc.getloadavg(raw_loadavg, 3)
-        return unless res == 3
-
-        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)

data/lib/facter/resolvers/bsd/processors.rb

@@ -5,7 +5,6 @@ module Facter
     module Bsd
       class Processors < BaseResolver
         @log = Facter::Log.new(self)
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private

data/lib/facter/resolvers/containers.rb

@@ -6,7 +6,6 @@ module Facter
       # :virtual
       # :hypervisor
 
-      @semaphore = Mutex.new
       @fact_list ||= {}
       INFO = { 'docker' => 'id', 'lxc' => 'name' }.freeze
 

data/lib/facter/resolvers/debian_version.rb

@@ -7,7 +7,6 @@ module Facter
       # :minor
       # :full
 
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/disk_resolver.rb

@@ -5,7 +5,6 @@ module Facter
     module Linux
       class Disk < BaseResolver
         @log = Facter::Log.new(self)
-        @semaphore = Mutex.new
         @fact_list ||= {}
         DIR = '/sys/block'
         FILE_PATHS = { model: 'device/model', size: 'size', vendor: 'device/vendor' }.freeze

data/lib/facter/resolvers/dmi_decode.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class DmiDecode < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       ADDRESS_TO_VERSION = {

data/lib/facter/resolvers/dmi_resolver.rb

@@ -5,13 +5,13 @@ module Facter
     module Linux
       class DmiBios < BaseResolver
         @log = Facter::Log.new(self)
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self
           # :bios_vendor
           # :bios_date
           # :bios_version
+          # :board_asset_tag
           # :board_vendor
           # :board_serial
           # :board_name
@@ -29,9 +29,9 @@ module Facter
           end
 
           def read_facts(fact_name)
-            files = %w[bios_date bios_vendor bios_version board_vendor board_name board_serial
-                       chassis_asset_tag chassis_type sys_vendor product_name product_serial
-                       product_uuid]
+            files = %w[bios_date bios_vendor bios_version board_asset_tag board_vendor board_name
+                       board_serial chassis_asset_tag chassis_type sys_vendor product_name
+                       product_serial product_uuid]
             return unless File.directory?('/sys/class/dmi')
 
             file_content = Util::FileHelper.safe_read("/sys/class/dmi/id/#{fact_name}", nil)

data/lib/facter/resolvers/ec2.rb

@@ -1,21 +1,18 @@
 # frozen_string_literal: true
 
-require 'net/http'
-
 module Facter
   module Resolvers
     class Ec2 < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
       EC2_METADATA_ROOT_URL = 'http://169.254.169.254/latest/meta-data/'
       EC2_USERDATA_ROOT_URL = 'http://169.254.169.254/latest/user-data/'
-      EC2_CONNECTION_TIMEOUT = 0.6
       EC2_SESSION_TIMEOUT = 5
 
       class << self
         private
 
         def post_resolve(fact_name)
+          log.debug('Querying Ec2 metadata')
           @fact_list.fetch(fact_name) { read_facts(fact_name) }
         end
 
@@ -31,7 +28,7 @@ module Facter
           metadata.each_line do |line|
             next if line.empty?
 
-            http_path_component = build_path_compoent(line)
+            http_path_component = build_path_component(line)
             next if http_path_component == 'security-credentials/'
 
             if http_path_component.end_with?('/')
@@ -46,25 +43,13 @@ module Facter
           end
         end
 
-        def build_path_compoent(line)
+        def build_path_component(line)
           array_match = /^(\d+)=.*$/.match(line)
           array_match ? "#{array_match[1]}/" : line.strip
         end
 
         def get_data_from(url)
-          parsed_url = URI.parse(url)
-          http = Net::HTTP.new(parsed_url.host)
-          http.read_timeout = determine_session_timeout
-          http.open_timeout = EC2_CONNECTION_TIMEOUT
-          resp = http.get(parsed_url.path)
-          response_code_valid?(resp.code) ? resp.body : ''
-        rescue StandardError => e
-          log.debug("Trying to connect to #{url} but got: #{e.message}")
-          ''
-        end
-
-        def response_code_valid?(http_code)
-          http_code.to_i.equal?(200)
+          Utils::Http.get_request(url, {}, { session: determine_session_timeout })
         end
 
         def determine_session_timeout

data/lib/facter/resolvers/eos_release_resolver.rb

@@ -7,7 +7,6 @@ module Facter
       # :version
       # :codename
 
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/facterversion_resolver.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class Facterversion < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/filesystems_resolver.rb

@@ -5,7 +5,6 @@ module Facter
     module Linux
       class Filesystems < BaseResolver
         # :systems
-        @semaphore = Mutex.new
         @fact_list ||= {}
         @log = Facter::Log.new(self)
         class << self
@@ -22,7 +21,7 @@ module Facter
             filesystems = []
             output.each do |line|
               tokens = line.split(' ')
-              filesystems << tokens if tokens.size == 1
+              filesystems << tokens if tokens.size == 1 && tokens.first != 'fuseblk'
             end
             @fact_list[:systems] = filesystems.sort.join(',')
             @fact_list[fact_name]

data/lib/facter/resolvers/fips_enabled_resolver.rb

@@ -5,7 +5,6 @@ module Facter
     module Linux
       class FipsEnabled < BaseResolver
         #:fips_enabled
-        @semaphore = Mutex.new
         @fact_list ||= {}
         @log = Facter::Log.new(self)
         class << self

data/lib/facter/resolvers/freebsd/dmi_resolver.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Freebsd
+      class DmiBios < BaseResolver
+        @fact_list ||= {}
+
+        class << self
+          #:model
+
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { read_facts(fact_name) }
+          end
+
+          def read_facts(fact_name)
+            require_relative 'ffi/ffi_helper'
+
+            @fact_list[:bios_date]    = Facter::Freebsd::FfiHelper.kenv(:get, 'smbios.bios.reldate')
+            @fact_list[:bios_vendor]  = Facter::Freebsd::FfiHelper.kenv(:get, 'smbios.bios.vendor')
+            @fact_list[:bios_version] = Facter::Freebsd::FfiHelper.kenv(:get, 'smbios.bios.version')
+
+            @fact_list[:product_name]   = Facter::Freebsd::FfiHelper.kenv(:get, 'smbios.system.product')
+            @fact_list[:product_serial] = Facter::Freebsd::FfiHelper.kenv(:get, 'smbios.system.serial')
+            @fact_list[:product_uuid]   = Facter::Freebsd::FfiHelper.kenv(:get, 'smbios.system.uuid')
+
+            @fact_list[:sys_vendor] = Facter::Freebsd::FfiHelper.kenv(:get, 'smbios.system.maker')
+
+            @fact_list[fact_name]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/freebsd/ffi/ffi_helper.rb

@@ -8,10 +8,29 @@ module Facter
       module Libc
         extend FFI::Library
 
+        KENV_GET = 0
+
+        KENV_MVALLEN = 128
+
         ffi_lib 'c'
+        attach_function :kenv, %i[int string pointer int], :int
         attach_function :sysctlbyname, %i[string pointer pointer pointer size_t], :int
       end
 
+      def self.kenv(action, name, value = nil)
+        case action
+        when :get
+          len = Libc::KENV_MVALLEN + 1
+          value = FFI::MemoryPointer.new(:char, len)
+          res = Libc.kenv(Libc::KENV_GET, name, value, len)
+          return nil if res.negative?
+
+          value.read_string(res).chomp("\0")
+        else
+          raise "Action #{action} not supported"
+        end
+      end
+
       def self.sysctl_by_name(type, name)
         oldp = FFI::Pointer::NULL
         oldlenp = FFI::MemoryPointer.new(:size_t)

data/lib/facter/resolvers/freebsd/freebsd_version_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Freebsd
       class FreebsdVersion < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

data/lib/facter/resolvers/freebsd/geom_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Freebsd
       class Geom < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

data/lib/facter/resolvers/freebsd/processors.rb

@@ -7,7 +7,6 @@ module Facter
     module Freebsd
       class Processors < BaseResolver
         @log = Facter::Log.new(self)
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private

data/lib/facter/resolvers/freebsd/swap_memory_resolver.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Freebsd
+      class SwapMemory < BaseResolver
+        @fact_list ||= {}
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { read_swap_memory(fact_name) }
+          end
+
+          def read_swap_memory(fact_name) # rubocop:disable Metrics/AbcSize
+            output = Facter::Core::Execution.execute('swapinfo -k', logger: log)
+            data = output.split("\n")[1..-1].map { |line| line.split(/\s+/) }
+
+            unless data.empty?
+              @fact_list[:total_bytes]     = kilobytes_to_bytes(data.map { |line| line[1].to_i }.inject(:+))
+              @fact_list[:used_bytes]      = kilobytes_to_bytes(data.map { |line| line[2].to_i }.inject(:+))
+              @fact_list[:available_bytes] = kilobytes_to_bytes(data.map { |line| line[3].to_i }.inject(:+))
+              @fact_list[:capacity] = FilesystemHelper.compute_capacity(@fact_list[:used_bytes],
+                                                                        @fact_list[:total_bytes])
+              @fact_list[:encrypted] = data.map { |line| line[0].end_with?('.eli') }.all?
+            end
+
+            @fact_list[fact_name]
+          end
+
+          def kilobytes_to_bytes(quantity)
+            (quantity.to_f * 1024).to_i
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/freebsd/system_memory_resolver.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Freebsd
+      class SystemMemory < BaseResolver
+        @fact_list ||= {}
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { calculate_system_memory(fact_name) }
+          end
+
+          def calculate_system_memory(fact_name)
+            read_total_memory_in_bytes
+            read_available_memory_in_bytes
+
+            @fact_list[:used_bytes] = @fact_list[:total_bytes] - @fact_list[:available_bytes]
+            @fact_list[:capacity] = FilesystemHelper.compute_capacity(@fact_list[:used_bytes], @fact_list[:total_bytes])
+
+            @fact_list[fact_name]
+          end
+
+          def read_available_memory_in_bytes
+            output = Facter::Core::Execution.execute('vmstat -H --libxo json', logger: log)
+            data = JSON.parse(output)
+            @fact_list[:available_bytes] = data['memory']['free-memory'] * 1024
+          end
+
+          def read_total_memory_in_bytes
+            require_relative 'ffi/ffi_helper'
+
+            @fact_list[:total_bytes] = Facter::Freebsd::FfiHelper.sysctl_by_name(:long, 'hw.physmem')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/gce.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    class Gce < BaseResolver
+      @fact_list ||= {}
+      METADATA_URL = 'http://metadata.google.internal/computeMetadata/v1/?recursive=true&alt=json'
+      HEADERS = { "Metadata-Flavor": 'Google', "Accept": 'application/json' }.freeze
+
+      class << self
+        private
+
+        def post_resolve(fact_name)
+          log.debug('reading Gce metadata')
+          @fact_list.fetch(fact_name) { read_facts(fact_name) }
+        end
+
+        def read_facts(fact_name)
+          @fact_list[:metadata] = query_for_metadata
+          @fact_list[fact_name]
+        end
+
+        def query_for_metadata
+          gce_data = extract_to_hash(Utils::Http.get_request(METADATA_URL, HEADERS))
+          parse_instance(gce_data)
+
+          gce_data.empty? ? nil : gce_data
+        end
+
+        def extract_to_hash(metadata)
+          JSON.parse(metadata)
+        rescue JSON::ParserError => e
+          log.debug("Trying to parse result but got: #{e.message}")
+          {}
+        end
+
+        def parse_instance(gce_data)
+          instance_data = gce_data['instance']
+          return if instance_data.nil? || instance_data.empty?
+
+          %w[image machineType zone].each do |key|
+            instance_data[key] = instance_data[key].split('/').last if instance_data[key]
+          end
+
+          network = instance_data.dig('networkInterfaces', 0, 'network')
+          instance_data['networkInterfaces'][0]['network'] = network.split('/').last unless network.nil?
+
+          gce_data['instance'] = instance_data
+        end
+      end
+    end
+  end
+end