facter 4.0.41 → 4.0.47

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

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Solaris
+      class Mountpoints < BaseResolver
+        include Facter::Util::Resolvers::FilesystemHelper
+        init_resolver
+
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { read_mounts(fact_name) }
+          end
+
+          def root_device
+            cmdline = Facter::Util::FileHelper.safe_read('/proc/cmdline')
+            match = cmdline.match(/root=([^\s]+)/)
+            match&.captures&.first
+          end
+
+          def compute_device(device)
+            # If the "root" device, lookup the actual device from the kernel options
+            # This is done because not all systems symlink /dev/root
+            device = root_device if device == '/dev/root'
+            device
+          end
+
+          def read_mounts(fact_name) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+            mounts = []
+            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 = 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 = Facter::Util::Resolvers::FilesystemHelper.compute_capacity(used_bytes, total_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[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
+            @fact_list[fact_name]
+          end
+        end
+      end
+    end
+  end
+end

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,9 +78,12 @@ 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]
+            @interfaces[lifreq.name][:mtu] ||= lifreq[:lifr_lifru][:lifru_metric]
           end
 
           def load_netmask(lifreq)
@@ -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
 

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

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

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

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

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

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

data/lib/facter/resolvers/ssh_resolver.rb

@@ -4,9 +4,12 @@ module Facter
   module Resolvers
     class SshResolver < BaseResolver
       @log = Facter::Log.new(self)
-      @fact_list ||= {}
-      @file_names = %w[ssh_host_rsa_key.pub ssh_host_dsa_key.pub ssh_host_ecdsa_key.pub ssh_host_ed25519_key.pub]
-      @file_paths = %w[/etc/ssh /usr/local/etc/ssh /etc /usr/local/etc /etc/opt/ssh]
+
+      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
+      FILE_PATHS = %w[/etc/ssh /usr/local/etc/ssh /etc /usr/local/etc /etc/opt/ssh].freeze
+
       class << self
         private
 
@@ -16,15 +19,16 @@ module Facter
 
         def retrieve_info(fact_name)
           ssh_list = []
-          @file_paths.each do |file_path|
+          FILE_PATHS.each do |file_path|
             next unless File.directory?(file_path)
 
-            @file_names.each do |file_name|
-              file_content = Util::FileHelper.safe_read(File.join(file_path, file_name), nil)
+            FILE_NAMES.each do |file_name|
+              file_content = Facter::Util::FileHelper.safe_read(File.join(file_path, file_name), nil)
               next unless file_content
 
               key_type, key = file_content.split(' ')
-              ssh_list << ::Resolvers::Utils::SshHelper.create_ssh(key_type, key)
+              ssh = Facter::Util::Resolvers::SshHelper.create_ssh(key_type, key)
+              ssh_list << ssh if ssh
             end
           end
           @fact_list[:ssh] = ssh_list

data/lib/facter/resolvers/suse_release_resolver.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_suse_release(fact_name)
-          output = Util::FileHelper.safe_read('/etc/SuSE-release', nil)
+          output = Facter::Util::FileHelper.safe_read('/etc/SuSE-release', nil)
           return @fact_list[fact_name] = nil if output.nil?
 
           output_strings = output.split(' ')

data/lib/facter/resolvers/sw_vers_resolver.rb

@@ -6,8 +6,8 @@ module Facter
       # :productname
       # :productversion
       # :buildversion
-      #
-      @fact_list ||= {}
+
+      init_resolver
 
       class << self
         private

data/lib/facter/resolvers/timezone_resolver.rb

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

data/lib/facter/resolvers/uname_resolver.rb

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

data/lib/facter/resolvers/uptime_resolver.rb

@@ -3,7 +3,7 @@
 module Facter
   module Resolvers
     class Uptime < BaseResolver
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private
@@ -13,7 +13,7 @@ module Facter
         end
 
         def uptime_system_call(fact_name)
-          seconds = Facter::UptimeParser.uptime_seconds_unix
+          seconds = Facter::Util::Facts::UptimeParser.uptime_seconds_unix
           build_fact_list(seconds)
 
           @fact_list[fact_name]
@@ -22,7 +22,7 @@ module Facter
         def build_fact_list(seconds)
           return @fact_list[:uptime] = 'unknown' unless seconds
 
-          @fact_list = Utils::UptimeHelper.create_uptime_hash(seconds)
+          @fact_list = Facter::Util::Resolvers::UptimeHelper.create_uptime_hash(seconds)
         end
       end
     end

data/lib/facter/resolvers/virt_what.rb

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

data/lib/facter/resolvers/vmware.rb

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

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

@@ -5,7 +5,7 @@ module Facter
     module Windows
       class AioAgentVersion < BaseResolver
         REGISTRY_PATH = 'SOFTWARE\\Puppet Labs\\Puppet'
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           private
@@ -30,7 +30,7 @@ module Facter
             return if puppet_aio_path.nil? || puppet_aio_path.empty?
 
             puppet_aio_version_path = File.join(puppet_aio_path, 'VERSION')
-            aio_agent_version = Util::FileHelper.safe_read(puppet_aio_version_path, nil)&.chomp
+            aio_agent_version = Facter::Util::FileHelper.safe_read(puppet_aio_version_path, nil)&.chomp
 
             @fact_list[:aio_agent_version] = aio_agent_version&.match(/^\d+\.\d+\.\d+(\.\d+){0,2}/)&.to_s
           end

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

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     class DMIBios < BaseResolver
       @log = Facter::Log.new(self)
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         # Manufacturer
@@ -17,7 +17,7 @@ module Facter
         end
 
         def read_fact_from_bios(fact_name)
-          win = Win32Ole.new
+          win = Facter::Util::Windows::Win32Ole.new
 
           bios = win.return_first('SELECT Manufacturer,SerialNumber from Win32_BIOS')
           unless bios