facter 4.0.43 → 4.0.49

data/lib/facter/resolvers/{path_resolver.rb → path.rb}

@@ -3,7 +3,7 @@
 module Facter
   module Resolvers
     class Path < BaseResolver
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private

data/lib/facter/resolvers/{processors_resolver.rb → processors.rb}

@@ -5,8 +5,11 @@ module Facter
     module Linux
       class Processors < BaseResolver
         @log = Facter::Log.new(self)
-        @fact_list ||= {}
+
+        init_resolver
+
         MHZ_TO_HZ = 1_000_000
+
         class << self
           # :count
           # :models
@@ -20,7 +23,7 @@ module Facter
           end
 
           def read_cpuinfo(fact_name)
-            cpuinfo_output = Util::FileHelper.safe_readlines('/proc/cpuinfo')
+            cpuinfo_output = Facter::Util::FileHelper.safe_readlines('/proc/cpuinfo')
             return if cpuinfo_output.empty?
 
             read_processors(cpuinfo_output) # + model names
@@ -62,7 +65,7 @@ module Facter
                .select { |dir| dir =~ /cpu[0-9]+$/ }
                .select { |dir| File.exist?("/sys/devices/system/cpu/#{dir}/topology/physical_package_id") }
                .map do |dir|
-              Util::FileHelper.safe_read("/sys/devices/system/cpu/#{dir}/topology/physical_package_id").strip
+              Facter::Util::FileHelper.safe_read("/sys/devices/system/cpu/#{dir}/topology/physical_package_id").strip
             end
                .uniq.count
           end

data/lib/facter/resolvers/{redhat_release_resolver.rb → redhat_release.rb}

@@ -7,7 +7,7 @@ module Facter
       # :version
       # :codename
 
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private
@@ -17,7 +17,7 @@ module Facter
         end
 
         def read_redhat_release(fact_name)
-          output = Util::FileHelper.safe_read('/etc/redhat-release', nil)
+          output = Facter::Util::FileHelper.safe_read('/etc/redhat-release', nil)
           return @fact_list[fact_name] = nil if output.nil?
 
           build_fact_list(output)

data/lib/facter/resolvers/{ruby_resolver.rb → ruby.rb}

@@ -3,7 +3,7 @@
 module Facter
   module Resolvers
     class Ruby < BaseResolver
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private

data/lib/facter/resolvers/{selinux_resolver.rb → selinux.rb}

@@ -3,7 +3,7 @@
 module Facter
   module Resolvers
     class SELinux < BaseResolver
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private
@@ -40,9 +40,9 @@ module Facter
           enforce_file = "#{mountpoint}/enforce"
           policy_file = "#{mountpoint}/policyvers"
 
-          @fact_list[:policy_version] = Util::FileHelper.safe_read(policy_file, nil)
+          @fact_list[:policy_version] = Facter::Util::FileHelper.safe_read(policy_file, nil)
 
-          enforce = Util::FileHelper.safe_read(enforce_file)
+          enforce = Facter::Util::FileHelper.safe_read(enforce_file)
           if enforce.eql?('1')
             @fact_list[:enforced] = true
             @fact_list[:current_mode] = 'enforcing'
@@ -53,7 +53,7 @@ module Facter
         end
 
         def read_selinux_config
-          file_lines = Util::FileHelper.safe_readlines('/etc/selinux/config')
+          file_lines = Facter::Util::FileHelper.safe_readlines('/etc/selinux/config')
 
           file_lines.map do |line|
             @fact_list[:config_mode] = line.split('=').last.strip if line =~ /^SELINUX=/

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

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     module Solaris
       class Disks < BaseResolver
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           private
@@ -36,7 +36,7 @@ module Facter
               disk_size = sizes[index].to_i
               disks[name] = {
                 product: products[index],
-                size: Facter::FactsUtils::UnitConverter.bytes_to_human_readable(disk_size),
+                size: Facter::Util::Facts::UnitConverter.bytes_to_human_readable(disk_size),
                 size_bytes: disk_size,
                 vendor: vendors[index]
               }

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

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     module Solaris
       class Dmi < BaseResolver
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           private
@@ -37,6 +37,8 @@ module Facter
 
             output = exec_smbios(param[0])
             facts = param[1]
+            return unless output
+
             facts.each do |name, regx|
               @fact_list[name] = output.match(/#{regx}/)&.captures&.first
             end

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

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     module Solaris
       class DmiSparc < BaseResolver
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           private

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

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     module Solaris
       class Filesystem < BaseResolver
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           private

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

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     module Solaris
       class Ipaddress < BaseResolver
-        @fact_list ||= {}
+        init_resolver
+
         class << self
           private
 

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

@@ -14,7 +14,7 @@ module Facter
         # :role_service
         # :role_impl
 
-        @fact_list ||= {}
+        init_resolver
 
         VIRTINFO_MAPPING = {
           chassis_serial: %w[DOMAINCHASSIS serialno],
@@ -36,8 +36,6 @@ module Facter
           end
 
           def call_virtinfo(fact_name)
-            # return unless File.executable?('/usr/sbin/virtinfo')
-
             virtinfo_output = Facter::Core::Execution.execute('/usr/sbin/virtinfo  -a  -p', logger: log)
             return if virtinfo_output.empty?
 

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

@@ -4,10 +4,11 @@ module Facter
   module Resolvers
     module Solaris
       class Memory < BaseResolver
+        init_resolver
         BLOCKSIZE = 512
         # :system
         # :swap
-        @fact_list ||= {}
+
         class << self
           private
 
@@ -31,7 +32,7 @@ module Facter
             sys[:total_bytes] = total
             sys[:available_bytes] = free
             sys[:used_bytes] = total - free
-            sys[:capacity] = FilesystemHelper.compute_capacity(total - free, total)
+            sys[:capacity] = Facter::Util::Resolvers::FilesystemHelper.compute_capacity(total - free, total)
 
             sys
           end
@@ -44,7 +45,7 @@ module Facter
             swap_hash[:total_bytes] = total
             swap_hash[:available_bytes] = free
             swap_hash[:used_bytes] = total - free
-            swap_hash[:capacity] = FilesystemHelper.compute_capacity(total - free, total)
+            swap_hash[:capacity] = Facter::Util::Resolvers::FilesystemHelper.compute_capacity(total - free, total)
 
             swap_hash if total != 0
           end

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

@@ -4,9 +4,9 @@ module Facter
   module Resolvers
     module Solaris
       class Mountpoints < BaseResolver
-        include Facter::FilesystemHelper
-        @fact_list ||= {}
-        @log = Facter::Log.new(self)
+        include Facter::Util::Resolvers::FilesystemHelper
+        init_resolver
+
         class << self
           private
 
@@ -15,7 +15,7 @@ module Facter
           end
 
           def root_device
-            cmdline = Util::FileHelper.safe_read('/proc/cmdline')
+            cmdline = Facter::Util::FileHelper.safe_read('/proc/cmdline')
             match = cmdline.match(/root=([^\s]+)/)
             match&.captures&.first
           end
@@ -27,27 +27,28 @@ module Facter
             device
           end
 
-          def read_mounts(fact_name) # rubocop:disable Metrics/AbcSize
+          def read_mounts(fact_name) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
             mounts = []
-            FilesystemHelper.read_mountpoints.each do |fs|
+            Facter::Util::Resolvers::FilesystemHelper.read_mountpoints.each do |fs|
               device = compute_device(fs.name)
               filesystem = fs.mount_type
               path = fs.mount_point
               options = fs.options.split(',').map(&:strip)
 
-              stats = FilesystemHelper.read_mountpoint_stats(path)
+              stats = Facter::Util::Resolvers::FilesystemHelper.read_mountpoint_stats(path)
               size_bytes = stats.bytes_total.abs
               available_bytes = stats.bytes_available.abs
 
               used_bytes = stats.bytes_used.abs
               total_bytes = used_bytes + available_bytes
-              capacity = FilesystemHelper.compute_capacity(used_bytes, total_bytes)
+              capacity = Facter::Util::Resolvers::FilesystemHelper.compute_capacity(used_bytes, total_bytes)
 
-              size = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(size_bytes)
-              available = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(available_bytes)
-              used = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(used_bytes)
+              size = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(size_bytes)
+              available = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(available_bytes)
+              used = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(used_bytes)
 
-              mounts << Hash[FilesystemHelper::MOUNT_KEYS.zip(FilesystemHelper::MOUNT_KEYS
+              mounts << Hash[Facter::Util::Resolvers::FilesystemHelper::MOUNT_KEYS
+                             .zip(Facter::Util::Resolvers::FilesystemHelper::MOUNT_KEYS
                 .map { |v| binding.local_variable_get(v) })]
             end
             @fact_list[:mountpoints] = mounts

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

@@ -1,15 +1,12 @@
 # frozen_string_literal: true
 
 require_relative 'ffi/ffi.rb'
-require 'ipaddr'
-
 module Facter
   module Resolvers
     module Solaris
       class Networking < BaseResolver
+        init_resolver
         @log = Facter::Log.new(self)
-        @fact_list ||= {}
-        @interfaces = {}
 
         class << self
           private
@@ -19,24 +16,38 @@ module Facter
           end
 
           def read_facts(fact_name)
-            lifreqs = load_interfaces
-            @interfaces = {}
+            begin
+              lifreqs = load_interfaces
+              @interfaces = {}
+
+              lifreqs.each do |lifreq|
+                obtain_info_for_interface(lifreq)
+              end
+
+              @fact_list[:primary_interface] = Facter::Util::Resolvers::Networking::PrimaryInterface.read_from_route
 
-            lifreqs.each do |lifreq|
-              @interfaces[lifreq.name] ||= {}
+              unless @interfaces.empty?
+                @fact_list[:interfaces] = @interfaces
+                @fact_list[:primary_interface] ||=
+                  Facter::Util::Resolvers::Networking::PrimaryInterface.find_in_interfaces(@interfaces)
+              end
 
-              add_mac(lifreq)
-              add_bindings(lifreq)
-              add_mtu(lifreq)
-              add_dhcp(lifreq.name)
+              Facter::Util::Resolvers::Networking.expand_main_bindings(@fact_list)
+            rescue StandardError => e
+              @log.log_exception(e)
             end
+            @fact_list[fact_name]
+          end
 
-            @fact_list = { interfaces: @interfaces } unless @interfaces.empty?
-            primary_interface
+          def obtain_info_for_interface(lifreq)
+            @interfaces[lifreq.name] ||= {}
 
-            ::Resolvers::Utils::Networking.expand_main_bindings(@fact_list)
+            add_mac(lifreq)
+            add_bindings(lifreq)
+            add_mtu(lifreq)
 
-            @fact_list[fact_name]
+            dhcp = Facter::Util::Resolvers::Networking::Dhcp.get(lifreq.name, @log)
+            @interfaces[lifreq.name][:dhcp] = dhcp if dhcp
           end
 
           def add_mac(lifreq)
@@ -44,7 +55,10 @@ module Facter
 
             ioctl = FFI::Ioctl.ioctl(FFI::SIOCGARP, arp, lifreq.ss_family)
 
-            @log.debug("Error! #{::FFI::LastError.error}") if ioctl == -1
+            if ioctl == -1
+              @log.debug("Could not read MAC address for interface #{lifreq.name} "\
+                          "error code is: #{::FFI::LastError.error}")
+            end
 
             mac = arp.sa_data_to_mac
             @interfaces[lifreq.name][:mac] ||= mac if mac.count('0') < 12
@@ -54,7 +68,7 @@ module Facter
             ip = inet_ntop(lifreq, lifreq.ss_family)
             _netmask, netmask_length = load_netmask(lifreq)
 
-            bindings = ::Resolvers::Utils::Networking.build_binding(ip, netmask_length)
+            bindings = Facter::Util::Resolvers::Networking.build_binding(ip, netmask_length)
 
             bindings_key = BINDINGS_KEY[lifreq.ss_family]
             @interfaces[lifreq.name][bindings_key] ||= []
@@ -64,7 +78,10 @@ module Facter
           def add_mtu(lifreq)
             ioctl = FFI::Ioctl.ioctl(FFI::SIOCGLIFMTU, lifreq, lifreq.ss_family)
 
-            @log.debug("Error! #{::FFI::LastError.error}") if ioctl == -1
+            if ioctl == -1
+              @log.error("Cold not read MTU, error code is #{::FFI::LastError.error}")
+              return
+            end
 
             @interfaces[lifreq.name][:mtu] ||= lifreq[:lifr_lifru][:lifru_metric]
           end
@@ -75,11 +92,12 @@ module Facter
             ioctl = FFI::Ioctl.ioctl(FFI::SIOCGLIFNETMASK, netmask_lifreq, lifreq.ss_family)
 
             if ioctl == -1
-              @log.debug("Error! #{::FFI::LastError.error}")
-            else
-              netmask = inet_ntop(netmask_lifreq, lifreq.ss_family)
-              [netmask, calculate_mask_length(netmask)]
+              @log.error("Could not read Netmask, error code is: #{::FFI::LastError.error}")
+              return
             end
+
+            netmask = inet_ntop(netmask_lifreq, lifreq.ss_family)
+            [netmask, Facter::Util::Resolvers::Networking.calculate_mask_length(netmask)]
           end
 
           def inet_ntop(lifreq, ss_family)
@@ -101,7 +119,7 @@ module Facter
 
             ioctl = FFI::Ioctl.ioctl(FFI::SIOCGLIFNUM, lifnum)
 
-            @log.debug("Error! #{::FFI::LastError.error}") if ioctl == -1
+            @log.error("Could not read interface count, error code is: #{::FFI::LastError.error}") if ioctl == -1
 
             lifnum[:lifn_count]
           end
@@ -113,7 +131,14 @@ module Facter
 
             ioctl = FFI::Ioctl.ioctl(FFI::SIOCGLIFCONF, lifconf)
 
-            @log.debug("Error! #{::FFI::LastError.error}") if ioctl == -1
+            # we need to enlarge the scope of this pointer so that Ruby GC will not free the memory.
+            # If the pointer if freed, Lifreq structures will contain garbage from memory.
+            @long_living_pointer = lifconf
+
+            if ioctl == -1
+              @log.error("Could not read interface information, error code is: #{::FFI::LastError.error}")
+              return []
+            end
 
             interfaces = []
             interface_count.times do |i|
@@ -122,24 +147,6 @@ module Facter
 
             interfaces
           end
-
-          def calculate_mask_length(netmask)
-            ipaddr = IPAddr.new(netmask)
-            ipaddr.to_i.to_s(2).count('1')
-          end
-
-          def primary_interface
-            result = Facter::Core::Execution.execute('route -n get default', logger: log)
-
-            @fact_list[:primary_interface] = result.match(/interface: (.+)/)&.captures&.first
-          end
-
-          def add_dhcp(interface_name)
-            dhcpinfo_command = Facter::Core::Execution.which('dhcpinfo') || '/sbin/dhcpinfo'
-            result = Facter::Core::Execution.execute("#{dhcpinfo_command} -i #{interface_name} ServerID", logger: log)
-
-            @interfaces[interface_name][:dhcp] = result.chomp
-          end
         end
       end
     end

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

@@ -4,9 +4,11 @@ module Facter
   module Resolvers
     module Solaris
       class OsRelease < BaseResolver
-        @fact_list ||= {}
-        @os_version_regex_patterns = ['Solaris \d+ \d+/\d+ s(\d+)[sx]?_u(\d+)wos_',
-                                      'Solaris (\d+)[.](\d+)', 'Solaris (\d+)']
+        init_resolver
+
+        OS_VERSION_REGEX_PATTERNS = ['Solaris \d+ \d+/\d+ s(\d+)[sx]?_u(\d+)wos_',
+                                     'Solaris (\d+)[.](\d+)', 'Solaris (\d+)'].freeze
+
         class << self
           private
 
@@ -15,10 +17,10 @@ module Facter
           end
 
           def build_release_facts(fact_name)
-            result = Util::FileHelper.safe_read('/etc/release', nil)
+            result = Facter::Util::FileHelper.safe_read('/etc/release', nil)
             return @fact_list[fact_name] = nil if result.nil?
 
-            @os_version_regex_patterns.each do |os_version_regex|
+            OS_VERSION_REGEX_PATTERNS.each do |os_version_regex|
               major, minor = search_for_os_version(/#{os_version_regex}/, result)
               next unless major || minor