facter 4.0.44 → 4.0.50

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

@@ -5,12 +5,12 @@ module Facter
     module Windows
       class AioAgentVersion < BaseResolver
         REGISTRY_PATH = 'SOFTWARE\\Puppet Labs\\Puppet'
-        @fact_list ||= {}
+        init_resolver
 
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_version(fact_name) }
           end
 
@@ -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 → dmi_bios.rb}

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     class DMIBios < BaseResolver
       @log = Facter::Log.new(self)
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         # Manufacturer
@@ -12,12 +12,12 @@ module Facter
 
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_fact_from_bios(fact_name) }
         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

data/lib/facter/resolvers/windows/{dmi_computersystem_resolver.rb → dmi_computersystem.rb}

@@ -4,7 +4,7 @@ module Facter
   module Resolvers
     class DMIComputerSystem < BaseResolver
       @log = Facter::Log.new(self)
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         # Name
@@ -12,12 +12,12 @@ module Facter
 
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_fact_from_computer_system(fact_name) }
         end
 
         def read_fact_from_computer_system(fact_name)
-          win = Win32Ole.new
+          win = Facter::Util::Windows::Win32Ole.new
           computersystem = win.return_first('SELECT Name,UUID FROM Win32_ComputerSystemProduct')
           unless computersystem
             @log.debug 'WMI query returned no results for Win32_ComputerSystemProduct with values Name and UUID.'

data/lib/facter/resolvers/windows/ffi/network_utils.rb

@@ -31,8 +31,7 @@ class NetworkUtils
 
     def find_mac_address(adapter)
       adapter[:PhysicalAddress].first(adapter[:PhysicalAddressLength])
-                               .map { |e| format('%<mac_address>02x', mac_address: e.to_i) }
-                               .join(':').upcase
+                               .map { |e| format('%<mac_address>02x', mac_address: e.to_i) }.join(':').upcase
     end
   end
 end

data/lib/facter/resolvers/windows/{fips_resolver.rb → fips.rb}

@@ -7,11 +7,12 @@ module Facter
     module Windows
       class Fips < BaseResolver
         # :fips_enabled
-        @fact_list ||= {}
+        init_resolver
+
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_fact_from_registry(fact_name) }
           end
 

data/lib/facter/resolvers/windows/{hardware_architecture_resolver.rb → hardware_architecture.rb}

@@ -3,11 +3,12 @@
 module Facter
   module Resolvers
     class HardwareArchitecture < BaseResolver
-      @fact_list ||= {}
+      init_resolver
+
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_hardware_information(fact_name) }
         end
 

data/lib/facter/resolvers/windows/{identity_resolver.rb → identity.rb}

@@ -5,12 +5,13 @@ module Facter
     class Identity < BaseResolver
       NAME_SAM_COMPATIBLE = 2
       @log = Facter::Log.new(self)
-      @fact_list ||= {}
+
+      init_resolver
 
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { retrieve_facts(fact_name) }
         end
 

data/lib/facter/resolvers/windows/{kernel_resolver.rb → kernel.rb}

@@ -4,11 +4,13 @@ module Facter
   module Resolvers
     class Kernel < BaseResolver
       @log = Facter::Log.new(self)
-      @fact_list ||= {}
+
+      init_resolver
+
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_os_version_information(fact_name) }
         end
 

data/lib/facter/resolvers/windows/{memory_resolver.rb → memory.rb}

@@ -4,11 +4,13 @@ module Facter
   module Resolvers
     class Memory < BaseResolver
       @log = Facter::Log.new(self)
-      @fact_list ||= {}
+
+      init_resolver
+
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { validate_info(fact_name) }
         end
 
@@ -21,6 +23,10 @@ module Facter
             return
           end
 
+          # 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 = state_ptr
+
           PerformanceInformation.new(state_ptr)
         end
 

data/lib/facter/resolvers/windows/{netkvm_resolver.rb → netkvm.rb}

@@ -5,11 +5,12 @@ require 'win32/registry'
 module Facter
   module Resolvers
     class NetKVM < BaseResolver
-      @fact_list ||= {}
+      init_resolver
+
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_fact_from_registry(fact_name) }
         end
 

data/lib/facter/resolvers/windows/{networking_resolver.rb → networking.rb}

@@ -5,11 +5,12 @@ module Facter
     module Windows
       class Networking < BaseResolver
         @log = Facter::Log.new(self)
-        @fact_list ||= {}
+        init_resolver
+
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { read_network_information(fact_name) }
           end
 
@@ -23,9 +24,11 @@ module Facter
 
             return unless (adapter_addresses = get_adapter_addresses(size_ptr, adapter_addresses, flags))
 
+            retrieve_domain_from_registry
+
             iterate_list(adapter_addresses)
 
-            ::Resolvers::Utils::Networking.expand_main_bindings(@fact_list)
+            Facter::Util::Resolvers::Networking.expand_main_bindings(@fact_list)
 
             @fact_list[fact_name]
           end
@@ -68,7 +71,11 @@ module Facter
                 adapter_address = IpAdapterAddressesLh.new(adapter_address[:Next])
                 next
               end
-              @fact_list[:domain] ||= adapter_address[:DnsSuffix].read_wide_string_without_length
+
+              if !@fact_list[:domain] || @fact_list[:domain].empty?
+                @fact_list[:domain] = adapter_address[:DnsSuffix].read_wide_string_without_length
+              end
+
               name = adapter_address[:FriendlyName].read_wide_string_without_length
               net_interface[name] = build_interface_info(adapter_address, name)
             end
@@ -119,16 +126,27 @@ module Facter
           def find_bindings(sock_addr, unicast, addr)
             return unless [NetworkingFFI::AF_INET, NetworkingFFI::AF_INET6].include?(sock_addr[:sa_family])
 
-            ::Resolvers::Utils::Networking.build_binding(addr, unicast[:OnLinkPrefixLength])
+            Facter::Util::Resolvers::Networking.build_binding(addr, unicast[:OnLinkPrefixLength])
           end
 
           def find_primary_interface(sock_addr, name, addr)
             if !@fact_list[:primary_interface] &&
                ([NetworkingFFI::AF_INET, NetworkingFFI::AF_INET6].include?(sock_addr[:sa_family]) &&
-               !::Resolvers::Utils::Networking.ignored_ip_address(addr))
+               !::Facter::Util::Resolvers::Networking.ignored_ip_address(addr))
               @fact_list[:primary_interface] = name.to_s
             end
           end
+
+          def retrieve_domain_from_registry
+            ::Win32::Registry::HKEY_LOCAL_MACHINE.open('SYSTEM\\CurrentControlSet\\Services\\Tcpip\\Parameters') do |rg|
+              rg.each do |name, _value|
+                @fact_list[:domain] = rg[name] if name == 'Domain'
+              end
+            end
+          rescue Win32::Registry::Error
+            @log.debug('Could not read TCPIP Parameters from registry')
+            nil
+          end
         end
       end
     end

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

@@ -3,7 +3,8 @@
 module Facter
   module Resolvers
     class Processors < BaseResolver
-      @fact_list = {}
+      init_resolver
+
       class << self
         # Count
         # Isa
@@ -12,12 +13,12 @@ module Facter
 
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_fact_from_win32_processor(fact_name) }
         end
 
         def read_fact_from_win32_processor(fact_name)
-          win = Win32Ole.new
+          win = Facter::Util::Windows::Win32Ole.new
           proc = win.exec_query('SELECT Name,Architecture,NumberOfLogicalProcessors FROM Win32_Processor')
           unless proc
             log.debug 'WMI query returned no results'\

data/lib/facter/resolvers/windows/{product_release_resolver.rb → product_release.rb}

@@ -5,11 +5,12 @@ require 'win32/registry'
 module Facter
   module Resolvers
     class ProductRelease < BaseResolver
-      @fact_list ||= {}
+      init_resolver
+
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_fact_from_registry(fact_name) }
         end
 

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

@@ -5,13 +5,15 @@ module Facter
     module Windows
       class Ssh < BaseResolver
         @log = Facter::Log.new(self)
-        @fact_list ||= {}
+
+        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
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { retrieve_info(fact_name) }
           end
 
@@ -22,11 +24,11 @@ module Facter
             ssh_list = []
 
             FILE_NAMES.each do |file_name|
-              output = Util::FileHelper.safe_read(File.join(ssh_dir, file_name))
+              output = Facter::Util::FileHelper.safe_read(File.join(ssh_dir, file_name))
               next if output.empty?
 
               key_type, key = output.split(' ')
-              ssh_list << ::Resolvers::Utils::SshHelper.create_ssh(key_type, key)
+              ssh_list << Facter::Util::Resolvers::SshHelper.create_ssh(key_type, key)
             end
             @fact_list[:ssh] = ssh_list.empty? ? nil : ssh_list
             @fact_list[fact_name]

data/lib/facter/resolvers/windows/{system32_resolver.rb → system32.rb}

@@ -4,11 +4,13 @@ module Facter
   module Resolvers
     class System32 < BaseResolver
       @log = Facter::Log.new(self)
-      @fact_list ||= {}
+
+      init_resolver
+
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { retrieve_windows_binaries_path }
         end
 

data/lib/facter/resolvers/windows/{uptime_resolver.rb → uptime.rb}

@@ -7,17 +7,18 @@ module Facter
     module Windows
       class Uptime < BaseResolver
         @log = Facter::Log.new(self)
-        @fact_list ||= {}
+
+        init_resolver
 
         class << self
           private
 
-          def post_resolve(fact_name)
+          def post_resolve(fact_name, _options)
             @fact_list.fetch(fact_name) { calculate_system_uptime(fact_name) }
           end
 
           def substract_system_uptime_from_ole
-            win = Win32Ole.new
+            win = Facter::Util::Windows::Win32Ole.new
             opsystem = win.return_first('SELECT LocalDateTime,LastBootUpTime FROM Win32_OperatingSystem')
             unless opsystem
               @log.debug 'WMI query returned no results'\

data/lib/facter/resolvers/windows/{virtualization_resolver.rb → virtualization.rb}

@@ -4,7 +4,8 @@ module Facter
   module Resolvers
     class Virtualization < BaseResolver
       @log = Facter::Log.new(self)
-      @fact_list ||= {}
+
+      init_resolver
 
       class << self
         # Virtual
@@ -15,12 +16,12 @@ module Facter
 
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_fact_from_computer_system(fact_name) }
         end
 
         def read_fact_from_computer_system(fact_name)
-          win = Win32Ole.new
+          win = Facter::Util::Windows::Win32Ole.new
           comp = win.exec_query('SELECT Manufacturer,Model,OEMStringArray FROM Win32_ComputerSystem')
           unless comp
             @log.debug 'WMI query returned no results for Win32_ComputerSystem with values'\

data/lib/facter/resolvers/windows/{win_os_description_resolver.rb → win_os_description.rb}

@@ -4,16 +4,18 @@ module Facter
   module Resolvers
     class WinOsDescription < BaseResolver
       @log = Facter::Log.new(self)
-      @fact_list ||= {}
+
+      init_resolver
+
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_from_ole(fact_name) }
         end
 
         def read_from_ole(fact_name)
-          win = Win32Ole.new
+          win = Facter::Util::Windows::Win32Ole.new
           op_sys = win.return_first('SELECT ProductType,OtherTypeDescription FROM Win32_OperatingSystem')
           unless op_sys
             @log.debug 'WMI query returned no results for Win32_OperatingSystem'\

data/lib/facter/resolvers/{wpar_resolver.rb → wpar.rb}

@@ -3,12 +3,12 @@
 module Facter
   module Resolvers
     class Wpar < BaseResolver
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { read_wpar(fact_name) }
         end
 

data/lib/facter/resolvers/xen.rb

@@ -3,7 +3,7 @@
 module Facter
   module Resolvers
     class Xen < BaseResolver
-      @fact_list ||= {}
+      init_resolver
 
       XEN_PATH = '/proc/xen/capabilities'
       XEN_TOOLSTACK = '/usr/lib/xen-common/bin/xen-toolstack'
@@ -12,7 +12,7 @@ module Facter
       class << self
         private
 
-        def post_resolve(fact_name)
+        def post_resolve(fact_name, _options)
           @fact_list.fetch(fact_name) { detect_xen(fact_name) }
         end
 
@@ -32,7 +32,7 @@ module Facter
         end
 
         def privileged?(xen_type)
-          content = Util::FileHelper.safe_read(XEN_PATH, nil)
+          content = Facter::Util::FileHelper.safe_read(XEN_PATH, nil)
           content&.strip == 'control_d' || xen_type == 'xen0'
         end