facter 4.6.1 → 4.7.1

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

@@ -650,6 +650,65 @@ os_hierarchy.each do |os|
     require_relative '../../facts/ol/os/distro/description'
     require_relative '../../facts/ol/os/distro/id'
 
+  when 'openbsd'
+    require_relative '../../facts/openbsd/augeas/version'
+    require_relative '../../facts/openbsd/ec2_metadata'
+    require_relative '../../facts/openbsd/ec2_userdata'
+    require_relative '../../facts/openbsd/facterversion'
+    require_relative '../../facts/openbsd/is_virtual'
+    require_relative '../../facts/openbsd/kernel'
+    require_relative '../../facts/openbsd/kernelrelease'
+    require_relative '../../facts/openbsd/mountpoints'
+    require_relative '../../facts/openbsd/path'
+    require_relative '../../facts/openbsd/ssh'
+    require_relative '../../facts/openbsd/sshalgorithmkey'
+    require_relative '../../facts/openbsd/sshfp_algorithm'
+    require_relative '../../facts/openbsd/timezone'
+    require_relative '../../facts/openbsd/virtual'
+    require_relative '../../facts/openbsd/dmi/bios/vendor'
+    require_relative '../../facts/openbsd/dmi/bios/version'
+    require_relative '../../facts/openbsd/dmi/manufacturer'
+    require_relative '../../facts/openbsd/dmi/product/name'
+    require_relative '../../facts/openbsd/dmi/product/serial_number'
+    require_relative '../../facts/openbsd/dmi/product/uuid'
+    require_relative '../../facts/openbsd/identity/group'
+    require_relative '../../facts/openbsd/identity/gid'
+    require_relative '../../facts/openbsd/identity/privileged'
+    require_relative '../../facts/openbsd/identity/uid'
+    require_relative '../../facts/openbsd/identity/user'
+    require_relative '../../facts/openbsd/networking/dhcp'
+    require_relative '../../facts/openbsd/networking/domain'
+    require_relative '../../facts/openbsd/networking/fqdn'
+    require_relative '../../facts/openbsd/networking/hostname'
+    require_relative '../../facts/openbsd/networking/interfaces'
+    require_relative '../../facts/openbsd/networking/ip'
+    require_relative '../../facts/openbsd/networking/ip6'
+    require_relative '../../facts/openbsd/networking/mac'
+    require_relative '../../facts/openbsd/networking/mtu'
+    require_relative '../../facts/openbsd/networking/netmask'
+    require_relative '../../facts/openbsd/networking/netmask6'
+    require_relative '../../facts/openbsd/networking/network'
+    require_relative '../../facts/openbsd/networking/network6'
+    require_relative '../../facts/openbsd/networking/primary'
+    require_relative '../../facts/openbsd/networking/scope6'
+    require_relative '../../facts/openbsd/os/architecture'
+    require_relative '../../facts/openbsd/os/hardware'
+    require_relative '../../facts/openbsd/os/name'
+    require_relative '../../facts/openbsd/os/release'
+    require_relative '../../facts/openbsd/processors/isa'
+    require_relative '../../facts/openbsd/ruby/platform'
+    require_relative '../../facts/openbsd/ruby/sitedir'
+    require_relative '../../facts/openbsd/ruby/version'
+    require_relative '../../facts/openbsd/system_uptime/days'
+    require_relative '../../facts/openbsd/system_uptime/hours'
+    require_relative '../../facts/openbsd/system_uptime/seconds'
+    require_relative '../../facts/openbsd/system_uptime/uptime'
+
+    require_relative '../../resolvers/openbsd/dhcp'
+    require_relative '../../resolvers/openbsd/dmi'
+    require_relative '../../resolvers/openbsd/mountpoints'
+    require_relative '../../resolvers/openbsd/virtual'
+
   when 'openwrt'
     require_relative '../../facts/openwrt/os/release'
 

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

@@ -26,6 +26,8 @@ class OsDetector
                    detect_distro
                  when /freebsd/
                    :freebsd
+                 when /openbsd/i
+                   :openbsd
                  when /bsd/
                    :bsd
                  when /solaris/

data/lib/facter/framework/logging/logger.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'logger'
+require 'set'
 
 module Facter
   RED     = "\e[31m"
@@ -15,8 +16,8 @@ module Facter
     @@logger = nil
     @@message_callback = nil
     @@has_errors = false
-    @@debug_messages = []
-    @@warn_messages = []
+    @@debug_messages = Set.new
+    @@warn_messages = Set.new
     @@timing = false
 
     class << self

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

@@ -22,7 +22,7 @@ module Facter
 
             result.each_line do |line|
               if line.include?('value')
-                @fact_list[:serialnumber] = line.split('=')[1].strip.delete('\"')[6..]
+                @fact_list[:serialnumber] = line.split('=')[1].strip.delete('\"')[6..-1]
                 break
               end
             end

data/lib/facter/resolvers/az.rb

@@ -26,7 +26,7 @@ module Facter
 
         def get_data_from(url)
           headers = { Metadata: 'true' }
-          Facter::Util::Resolvers::Http.get_request(url, headers, { session: determine_session_timeout })
+          Facter::Util::Resolvers::Http.get_request(url, headers, { session: determine_session_timeout }, false)
         end
 
         def determine_session_timeout

data/lib/facter/resolvers/base_resolver.rb

@@ -3,8 +3,8 @@
 module Facter
   module Resolvers
     class BaseResolver
-      def self.log
-        @log ||= Log.new(self)
+      class << self
+        attr_reader :log
       end
 
       def self.invalidate_cache
@@ -14,6 +14,7 @@ module Facter
       def self.init_resolver
         @fact_list = {}
         @semaphore = Mutex.new
+        @log = Log.new(self)
       end
 
       def self.subscribe_to_manager

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

@@ -5,7 +5,6 @@ module Facter
     module Bsd
       class Processors < BaseResolver
         init_resolver
-        @log = Facter::Log.new(self)
 
         class << self
           private

data/lib/facter/resolvers/disks.rb

@@ -4,8 +4,6 @@ module Facter
   module Resolvers
     module Linux
       class Disks < BaseResolver
-        @log = Facter::Log.new(self)
-
         init_resolver
 
         DIR = '/sys/block'

data/lib/facter/resolvers/dmi.rb

@@ -4,8 +4,6 @@ module Facter
   module Resolvers
     module Linux
       class DmiBios < BaseResolver
-        @log = Facter::Log.new(self)
-
         init_resolver
 
         class << self

data/lib/facter/resolvers/ec2.rb

@@ -52,7 +52,7 @@ module Facter
         def get_data_from(url)
           headers = {}
           headers['X-aws-ec2-metadata-token'] = v2_token if v2_token
-          Facter::Util::Resolvers::Http.get_request(url, headers, { session: determine_session_timeout })
+          Facter::Util::Resolvers::Http.get_request(url, headers, { session: determine_session_timeout }, false)
         end
 
         def determine_session_timeout

data/lib/facter/resolvers/filesystems.rb

@@ -8,8 +8,6 @@ module Facter
 
         init_resolver
 
-        @log = Facter::Log.new(self)
-
         class << self
           private
 

data/lib/facter/resolvers/fips_enabled.rb

@@ -8,8 +8,6 @@ module Facter
 
         init_resolver
 
-        @log = Facter::Log.new(self)
-
         class << self
           private
 

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

@@ -7,7 +7,6 @@ module Facter
     module Freebsd
       class Processors < BaseResolver
         init_resolver
-        @log = Facter::Log.new(self)
 
         class << self
           private

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

@@ -15,7 +15,7 @@ module Facter
 
           def read_swap_memory(fact_name)
             output = Facter::Core::Execution.execute('swapinfo -k', logger: log)
-            data = output.split("\n")[1..].map { |line| line.split(/\s+/) }
+            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(:+))

data/lib/facter/resolvers/gce.rb

@@ -22,7 +22,7 @@ module Facter
         end
 
         def query_for_metadata
-          gce_data = extract_to_hash(Facter::Util::Resolvers::Http.get_request(METADATA_URL, HEADERS))
+          gce_data = extract_to_hash(Facter::Util::Resolvers::Http.get_request(METADATA_URL, HEADERS, false))
           parse_instance(gce_data)
 
           gce_data.empty? ? nil : gce_data

data/lib/facter/resolvers/hostname.rb

@@ -19,6 +19,11 @@ module Facter
         def retrieve_info(fact_name)
           require 'socket'
           output = Socket.gethostname
+          unless output
+            log.debug('Socket.gethostname failed to return hostname')
+            return
+          end
+
           hostname, domain = retrieve_from_fqdn(output)
 
           fqdn = retrieve_with_addrinfo(hostname) if hostname_and_no_domain?(hostname, domain)

data/lib/facter/resolvers/identity.rb

@@ -3,8 +3,6 @@
 module Facter
   module Resolvers
     class PosxIdentity < BaseResolver
-      @log = Facter::Log.new(self)
-
       init_resolver
 
       class << self

data/lib/facter/resolvers/macosx/mountpoints.rb

@@ -7,8 +7,6 @@ module Facter
         include Facter::Util::Resolvers::FilesystemHelper
         init_resolver
 
-        @log = Facter::Log.new(self)
-
         class << self
           private
 

data/lib/facter/resolvers/memory.rb

@@ -6,8 +6,6 @@ module Facter
       class Memory < BaseResolver
         init_resolver
 
-        @log = Facter::Log.new(self)
-
         class << self
           private
 

data/lib/facter/resolvers/mountpoints.rb

@@ -7,8 +7,6 @@ module Facter
 
       init_resolver
 
-      @log = Facter::Log.new(self)
-
       class << self
         private
 

data/lib/facter/resolvers/networking.rb

@@ -44,7 +44,7 @@ module Facter
 
         def parse_interfaces_response(response)
           parsed_interfaces_data = {}
-          interfaces_data = Hash[*response.split(/^([A-Za-z0-9_.]+): /)[1..]]
+          interfaces_data = Hash[*response.split(/^([A-Za-z0-9_.]+): /)[1..-1]]
 
           interfaces_data.each do |interface_name, raw_data|
             parsed_interface_data = {}

data/lib/facter/resolvers/openbsd/dhcp.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require_relative '../networking'
+
+module Facter
+  module Resolvers
+    module Openbsd
+      class Dhcp < Facter::Resolvers::Networking
+        init_resolver
+        class << self
+          def extract_dhcp(interface_name, raw_data, parsed_interface_data)
+            return unless raw_data.match?(/status:\s+active/)
+
+            result = Facter::Core::Execution.execute("dhcpleasectl -l #{interface_name}", logger: log)
+            parsed_interface_data[:dhcp] = extract_values(result, /\sdhcp server (\S+)/).first unless result.empty?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/openbsd/dmi.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Openbsd
+      class DmiBios < BaseResolver
+        init_resolver
+
+        class << self
+          private
+
+          def post_resolve(fact_name, _options)
+            @fact_list.fetch(fact_name) { read_facts(fact_name) }
+          end
+
+          CTL_HW = 6
+          HW_VENDOR = 14
+          HW_PRODUCT = 15
+          HW_VERSION = 16
+          HW_SERIALNO = 17
+          HW_UUID = 18
+
+          def read_facts(fact_name)
+            require 'facter/resolvers/bsd/ffi/ffi_helper'
+
+            @fact_list[:bios_vendor]  = Facter::Bsd::FfiHelper.sysctl(:string, [CTL_HW, HW_VENDOR])
+            @fact_list[:bios_version] = Facter::Bsd::FfiHelper.sysctl(:string, [CTL_HW, HW_VERSION])
+
+            @fact_list[:product_name]   = Facter::Bsd::FfiHelper.sysctl(:string, [CTL_HW, HW_PRODUCT])
+            @fact_list[:product_serial] = Facter::Bsd::FfiHelper.sysctl(:string, [CTL_HW, HW_SERIALNO])
+            @fact_list[:product_uuid]   = Facter::Bsd::FfiHelper.sysctl(:string, [CTL_HW, HW_UUID])
+
+            @fact_list[:sys_vendor] = Facter::Bsd::FfiHelper.sysctl(:string, [CTL_HW, HW_VENDOR])
+
+            @fact_list[fact_name]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/openbsd/mountpoints.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Openbsd
+      class Mountpoints < BaseResolver
+        init_resolver
+
+        BLOCK_SIZE = 512
+
+        class << self
+          private
+
+          def post_resolve(fact_name, _options)
+            @fact_list.fetch(fact_name) { read_mount(fact_name) }
+          end
+
+          def read_mount(fact_name)
+            @fact_list[:mountpoints] = {}
+            output = Facter::Core::Execution.execute('mount', logger: log)
+            output.split("\n").map do |line|
+              add_mount_points_fact(line)
+            end
+
+            retrieve_sizes_for_mounts
+            @fact_list[fact_name]
+          end
+
+          def add_mount_points_fact(line)
+            elem = line.split("\s")
+            options = elem.drop(5)
+            options.each { |option| option.tr!('(),', '') }
+            @fact_list[:mountpoints][elem[2]] = { device: elem[0], filesystem: elem[4],
+                                                  options: options }
+          end
+
+          def retrieve_sizes_for_mounts
+            output = Facter::Core::Execution.execute('df -P', logger: log)
+            output.split("\n").drop(1).map do |line|
+              next if line.match?(/-\s+-\s+-/)
+
+              mount_info = line.split("\s")
+              mount_info[3] = translate_to_bytes(mount_info[3])
+              mount_info[2] = translate_to_bytes(mount_info[2])
+              mount_info[1] = translate_to_bytes(mount_info[1])
+              compute_sizes(mount_info)
+            end
+          end
+
+          def translate_to_bytes(strin_size)
+            strin_size.to_i * BLOCK_SIZE
+          end
+
+          def compute_sizes(info)
+            available_bytes = info[3]
+            used_bytes = info[2]
+            size_bytes = info[1]
+            @fact_list[:mountpoints][info.last].merge!(
+              capacity: Facter::Util::Resolvers::FilesystemHelper.compute_capacity(used_bytes, size_bytes),
+              available_bytes: available_bytes,
+              used_bytes: used_bytes,
+              size_bytes: size_bytes,
+              available: Facter::Util::Facts::UnitConverter.bytes_to_human_readable(available_bytes),
+              used: Facter::Util::Facts::UnitConverter.bytes_to_human_readable(used_bytes),
+              size: Facter::Util::Facts::UnitConverter.bytes_to_human_readable(size_bytes)
+            )
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/openbsd/virtual.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Openbsd
+      class Virtual < BaseResolver
+        init_resolver
+
+        class << self
+          # :model
+
+          VM_GUEST_SYSCTL_NAMES = {
+            'VMM' => 'vmm',
+            'vServer' => 'vserver',
+            'oracle' => 'virtualbox',
+            'xen' => 'xenu',
+            'none' => nil
+          }.freeze
+
+          private
+
+          def post_resolve(fact_name, _options)
+            @fact_list.fetch(fact_name) { read_facts(fact_name) }
+          end
+
+          CTL_HW = 6
+          HW_PRODUCT = 15
+
+          def read_facts(fact_name)
+            require 'facter/resolvers/bsd/ffi/ffi_helper'
+
+            vm = Facter::Bsd::FfiHelper.sysctl(:string, [CTL_HW, HW_PRODUCT])
+            vm = if VM_GUEST_SYSCTL_NAMES.key?(vm)
+                   VM_GUEST_SYSCTL_NAMES[vm]
+                 else
+                   'physical'
+                 end
+            @fact_list[:vm] = vm
+            @fact_list[fact_name]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/partitions.rb

@@ -112,9 +112,9 @@ module Facter
 
         def execute_and_extract_blkid_info
           stdout = Facter::Core::Execution.execute('blkid', logger: log)
-          output_hash = Hash[*stdout.split(/^([^:]+):/)[1..]]
+          output_hash = Hash[*stdout.split(/^([^:]+):/)[1..-1]]
           output_hash.each do |key, value|
-            output_hash[key] = Hash[*value.delete('"').chomp.rstrip.split(/ ([^= ]+)=/)[1..]]
+            output_hash[key] = Hash[*value.delete('"').chomp.rstrip.split(/ ([^= ]+)=/)[1..-1]]
           end
         end
 

data/lib/facter/resolvers/processors.rb

@@ -4,8 +4,6 @@ module Facter
   module Resolvers
     module Linux
       class Processors < BaseResolver
-        @log = Facter::Log.new(self)
-
         init_resolver
 
         MHZ_TO_HZ = 1_000_000

data/lib/facter/resolvers/solaris/mountpoints.rb

@@ -7,8 +7,6 @@ module Facter
         include Facter::Util::Resolvers::FilesystemHelper
         init_resolver
 
-        @log = Facter::Log.new(self)
-
         class << self
           private
 

data/lib/facter/resolvers/solaris/networking.rb

@@ -6,7 +6,6 @@ module Facter
     module Solaris
       class Networking < BaseResolver
         init_resolver
-        @log = Facter::Log.new(self)
 
         class << self
           private

data/lib/facter/resolvers/ssh.rb

@@ -3,8 +3,6 @@
 module Facter
   module Resolvers
     class Ssh < BaseResolver
-      @log = Facter::Log.new(self)
-
       init_resolver
 
       FILE_NAMES = %w[ssh_host_rsa_key.pub ssh_host_dsa_key.pub ssh_host_ecdsa_key.pub ssh_host_ed25519_key.pub].freeze

data/lib/facter/resolvers/windows/dmi_bios.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class DMIBios < BaseResolver
-      @log = Facter::Log.new(self)
       init_resolver
 
       class << self

data/lib/facter/resolvers/windows/dmi_computersystem.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class DMIComputerSystem < BaseResolver
-      @log = Facter::Log.new(self)
       init_resolver
 
       class << self

data/lib/facter/resolvers/windows/hardware_architecture.rb

@@ -24,7 +24,6 @@ module Facter
           build_facts_list(hardware: hard, architecture: arch)
           @fact_list[fact_name]
         rescue LoadError => e
-          log = Facter::Log.new(self)
           log.debug("The ffi gem has not been installed: #{e}")
         end
 

data/lib/facter/resolvers/windows/identity.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     class Identity < BaseResolver
       NAME_SAM_COMPATIBLE = 2
-      @log = Facter::Log.new(self)
 
       init_resolver
 

data/lib/facter/resolvers/windows/kernel.rb

@@ -3,8 +3,6 @@
 module Facter
   module Resolvers
     class Kernel < BaseResolver
-      @log = Facter::Log.new(self)
-
       init_resolver
 
       class << self

data/lib/facter/resolvers/windows/memory.rb

@@ -3,8 +3,6 @@
 module Facter
   module Resolvers
     class Memory < BaseResolver
-      @log = Facter::Log.new(self)
-
       init_resolver
 
       class << self

data/lib/facter/resolvers/windows/networking.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Windows
       class Networking < BaseResolver
-        @log = Facter::Log.new(self)
         init_resolver
 
         class << self

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

@@ -4,8 +4,6 @@ module Facter
   module Resolvers
     module Windows
       class Ssh < BaseResolver
-        @log = Facter::Log.new(self)
-
         init_resolver
 
         FILE_NAMES = %w[ssh_host_rsa_key.pub ssh_host_dsa_key.pub

data/lib/facter/resolvers/windows/system32.rb

@@ -3,8 +3,6 @@
 module Facter
   module Resolvers
     class System32 < BaseResolver
-      @log = Facter::Log.new(self)
-
       init_resolver
 
       class << self

data/lib/facter/resolvers/windows/timezone.rb

@@ -34,7 +34,6 @@ module Facter
             require_relative '../../../facter/resolvers/windows/ffi/winnls_ffi'
             WinnlsFFI.GetACP.to_s
           rescue LoadError => e
-            log = Facter::Log.new(self)
             log.debug("Could not retrieve codepage: #{e}")
           end
         end

data/lib/facter/resolvers/windows/uptime.rb

@@ -6,8 +6,6 @@ module Facter
   module Resolvers
     module Windows
       class Uptime < BaseResolver
-        @log = Facter::Log.new(self)
-
         init_resolver
 
         class << self

data/lib/facter/resolvers/windows/virtualization.rb

@@ -4,16 +4,21 @@ module Facter
   module Resolvers
     module Windows
       class Virtualization < BaseResolver
-        @log = Facter::Log.new(self)
-
         init_resolver
 
         class << self
           # Virtual
           # Is_Virtual
 
-          MODEL_HASH = { 'VirtualBox' => 'virtualbox', 'VMware' => 'vmware', 'KVM' => 'kvm',
-                         'Bochs' => 'bochs', 'Google' => 'gce', 'OpenStack' => 'openstack' }.freeze
+          MODEL_HASH = {
+            'VirtualBox' => 'virtualbox',
+            'VMware' => 'vmware',
+            'KVM' => 'kvm',
+            'Bochs' => 'bochs',
+            'Google' => 'gce',
+            'OpenStack' => 'openstack',
+            'AHV' => 'ahv'
+          }.freeze
 
           private