facter 4.0.32 → 4.0.37

data/lib/facter/resolvers/utils/uptime_helper.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Utils
+      module UptimeHelper
+        class << self
+          def create_uptime_hash(seconds)
+            results = {}
+            minutes = (seconds / 60) % 60
+
+            results[:seconds] = seconds
+            results[:hours]   = seconds / (60 * 60)
+            results[:days]    = results[:hours] / 24
+            results[:uptime]  = build_uptime_text(results[:days], results[:hours], minutes)
+
+            results
+          end
+
+          def build_uptime_text(days, hours, minutes)
+            case days
+            when 0 then "#{hours}:#{format('%<minutes>02d', minutes: minutes)} hours"
+            when 1 then '1 day'
+            else
+              "#{days} days"
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/virt_what.rb

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

data/lib/facter/resolvers/vmware.rb

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

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

@@ -5,7 +5,6 @@ module Facter
     module Windows
       class AioAgentVersion < BaseResolver
         REGISTRY_PATH = 'SOFTWARE\\Puppet Labs\\Puppet'
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

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

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

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

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

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

@@ -30,7 +30,7 @@ module FFI
     def read_wide_string_with_length(char_length)
       # char_length is number of wide chars (typically excluding NULLs), *not* bytes
       str = get_bytes(0, char_length * 2).force_encoding('UTF-16LE')
-      str.encode('UTF-8', str.encoding, {})
+      str.encode('UTF-8', str.encoding)
     end
 
     def read_wide_string_without_length

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

@@ -7,7 +7,6 @@ module Facter
     module Windows
       class Fips < BaseResolver
         # :fips_enabled
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private

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

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

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

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

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

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

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

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

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

@@ -5,7 +5,6 @@ require 'win32/registry'
 module Facter
   module Resolvers
     class NetKVM < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
       class << self
         private

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

@@ -1,134 +1,133 @@
 # frozen_string_literal: true
 
-require 'ipaddr'
-
 module Facter
   module Resolvers
-    class Networking < BaseResolver
-      @log = Facter::Log.new(self)
-      @semaphore = Mutex.new
-      @fact_list ||= {}
-      class << self
-        private
-
-        def post_resolve(fact_name)
-          @fact_list.fetch(fact_name) { read_network_information(fact_name) }
-        end
-
-        def read_network_information(fact_name)
-          require 'facter/resolvers/windows/ffi/networking_ffi'
+    module Windows
+      class Networking < BaseResolver
+        @log = Facter::Log.new(self)
+        @fact_list ||= {}
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { read_network_information(fact_name) }
+          end
 
-          size_ptr = FFI::MemoryPointer.new(NetworkingFFI::BUFFER_LENGTH)
-          adapter_addresses = FFI::MemoryPointer.new(IpAdapterAddressesLh.size, NetworkingFFI::BUFFER_LENGTH)
-          flags = NetworkingFFI::GAA_FLAG_SKIP_ANYCAST |
-                  NetworkingFFI::GAA_FLAG_SKIP_MULTICAST | NetworkingFFI::GAA_FLAG_SKIP_DNS_SERVER
+          def read_network_information(fact_name)
+            require 'facter/resolvers/windows/ffi/networking_ffi'
 
-          return unless (adapter_addresses = get_adapter_addresses(size_ptr, adapter_addresses, flags))
+            size_ptr = FFI::MemoryPointer.new(NetworkingFFI::BUFFER_LENGTH)
+            adapter_addresses = FFI::MemoryPointer.new(IpAdapterAddressesLh.size, NetworkingFFI::BUFFER_LENGTH)
+            flags = NetworkingFFI::GAA_FLAG_SKIP_ANYCAST |
+                    NetworkingFFI::GAA_FLAG_SKIP_MULTICAST | NetworkingFFI::GAA_FLAG_SKIP_DNS_SERVER
 
-          iterate_list(adapter_addresses)
+            return unless (adapter_addresses = get_adapter_addresses(size_ptr, adapter_addresses, flags))
 
-          ::Resolvers::Utils::Networking.expand_main_bindings(@fact_list)
+            iterate_list(adapter_addresses)
 
-          @fact_list[fact_name]
-        end
+            ::Resolvers::Utils::Networking.expand_main_bindings(@fact_list)
 
-        def get_adapter_addresses(size_ptr, adapter_addresses, flags)
-          error = nil
-          3.times do
-            error = NetworkingFFI::GetAdaptersAddresses(NetworkingFFI::AF_UNSPEC, flags,
-                                                        FFI::Pointer::NULL, adapter_addresses, size_ptr)
-            break if error == NetworkingFFI::ERROR_SUCCES
-
-            if error == NetworkingFFI::ERROR_BUFFER_OVERFLOW
-              adapter_addresses = FFI::MemoryPointer.new(IpAdapterAddressesLh.size, NetworkingFFI::BUFFER_LENGTH)
-            else
-              @log.debug 'Unable to retrieve networking facts!'
-              return nil
-            end
+            @fact_list[fact_name]
           end
-          return nil unless error.zero?
 
-          adapter_addresses
-        end
+          def get_adapter_addresses(size_ptr, adapter_addresses, flags)
+            error = nil
+            3.times do
+              error = NetworkingFFI::GetAdaptersAddresses(NetworkingFFI::AF_UNSPEC, flags,
+                                                          FFI::Pointer::NULL, adapter_addresses, size_ptr)
+              break if error == NetworkingFFI::ERROR_SUCCES
+
+              if error == NetworkingFFI::ERROR_BUFFER_OVERFLOW
+                adapter_addresses = FFI::MemoryPointer.new(IpAdapterAddressesLh.size, NetworkingFFI::BUFFER_LENGTH)
+              else
+                @log.debug 'Unable to retrieve networking facts!'
+                return nil
+              end
+            end
+            return nil unless error.zero?
 
-        def adapter_down?(adapter)
-          adapter[:OperStatus] != NetworkingFFI::IF_OPER_STATUS_UP ||
-            ![NetworkingFFI::IF_TYPE_ETHERNET_CSMACD, NetworkingFFI::IF_TYPE_IEEE80211].include?(adapter[:IfType])
-        end
+            adapter_addresses
+          end
 
-        def retrieve_dhcp_server(adapter)
-          if !(adapter[:Flags] & NetworkingFFI::IP_ADAPTER_DHCP_ENABLED).zero? &&
-             adapter[:Union][:Struct][:Length] >= IpAdapterAddressesLh.size
-            NetworkUtils.address_to_string(adapter[:Dhcpv4Server])
+          def adapter_down?(adapter)
+            adapter[:OperStatus] != NetworkingFFI::IF_OPER_STATUS_UP ||
+              ![NetworkingFFI::IF_TYPE_ETHERNET_CSMACD, NetworkingFFI::IF_TYPE_IEEE80211].include?(adapter[:IfType])
           end
-        end
 
-        def iterate_list(adapter_addresses)
-          net_interface = {}
-          IpAdapterAddressesLh.read_list(adapter_addresses) do |adapter_address|
-            if adapter_down?(adapter_address)
-              adapter_address = IpAdapterAddressesLh.new(adapter_address[:Next])
-              next
+          def retrieve_dhcp_server(adapter)
+            if !(adapter[:Flags] & NetworkingFFI::IP_ADAPTER_DHCP_ENABLED).zero? &&
+               adapter[:Union][:Struct][:Length] >= IpAdapterAddressesLh.size
+              NetworkUtils.address_to_string(adapter[:Dhcpv4Server])
             end
-            @fact_list[:domain] ||= adapter_address[:DnsSuffix].read_wide_string_without_length
-            name = adapter_address[:FriendlyName].read_wide_string_without_length
-            net_interface[name] = build_interface_info(adapter_address, name)
           end
 
-          @fact_list[:interfaces] = net_interface unless net_interface.empty?
-        end
+          def iterate_list(adapter_addresses)
+            net_interface = {}
+            IpAdapterAddressesLh.read_list(adapter_addresses) do |adapter_address|
+              if adapter_down?(adapter_address)
+                adapter_address = IpAdapterAddressesLh.new(adapter_address[:Next])
+                next
+              end
+              @fact_list[:domain] ||= adapter_address[:DnsSuffix].read_wide_string_without_length
+              name = adapter_address[:FriendlyName].read_wide_string_without_length
+              net_interface[name] = build_interface_info(adapter_address, name)
+            end
 
-        def build_interface_info(adapter_address, name)
-          hash = {}
+            @fact_list[:interfaces] = net_interface unless net_interface.empty?
+          end
 
-          hash[:dhcp] = retrieve_dhcp_server(adapter_address)
-          hash[:mtu] = adapter_address[:Mtu]
+          def build_interface_info(adapter_address, name)
+            hash = {}
 
-          bindings = find_ip_addresses(adapter_address[:FirstUnicastAddress], name)
-          hash[:bindings] = bindings[:ipv4] unless bindings[:ipv4].empty?
-          hash[:bindings6] = bindings[:ipv6] unless bindings[:ipv6].empty?
-          hash[:mac] = NetworkUtils.find_mac_address(adapter_address)
-          hash
-        end
+            hash[:dhcp] = retrieve_dhcp_server(adapter_address)
+            hash[:mtu] = adapter_address[:Mtu]
 
-        def find_ip_addresses(unicast_addresses, name)
-          bindings = {}
-          bindings[:ipv6] = []
-          bindings[:ipv4] = []
+            bindings = find_ip_addresses(adapter_address[:FirstUnicastAddress], name)
+            hash[:bindings] = bindings[:ipv4] unless bindings[:ipv4].empty?
+            hash[:bindings6] = bindings[:ipv6] unless bindings[:ipv6].empty?
+            hash[:mac] = NetworkUtils.find_mac_address(adapter_address)
+            hash
+          end
 
-          IpAdapterUnicastAddressLH.read_list(unicast_addresses) do |unicast|
-            addr = NetworkUtils.address_to_string(unicast[:Address])
-            unless addr
-              unicast = IpAdapterUnicastAddressLH.new(unicast[:Next])
-              next
+          def find_ip_addresses(unicast_addresses, name)
+            bindings = {}
+            bindings[:ipv6] = []
+            bindings[:ipv4] = []
+
+            IpAdapterUnicastAddressLH.read_list(unicast_addresses) do |unicast|
+              addr = NetworkUtils.address_to_string(unicast[:Address])
+              unless addr
+                unicast = IpAdapterUnicastAddressLH.new(unicast[:Next])
+                next
+              end
+
+              sock_addr = SockAddr.new(unicast[:Address][:lpSockaddr])
+              add_ip_data(addr, unicast, sock_addr, bindings)
+              find_primary_interface(sock_addr, name, addr)
             end
-
-            sock_addr = SockAddr.new(unicast[:Address][:lpSockaddr])
-            add_ip_data(addr, unicast, sock_addr, bindings)
-            find_primary_interface(sock_addr, name, addr)
+            bindings
           end
-          bindings
-        end
 
-        def add_ip_data(addr, unicast, sock_addr, bindings)
-          result = find_bindings(sock_addr, unicast, addr)
-          return unless result
+          def add_ip_data(addr, unicast, sock_addr, bindings)
+            result = find_bindings(sock_addr, unicast, addr)
+            return unless result
 
-          bindings[:ipv6] << result if sock_addr[:sa_family] == NetworkingFFI::AF_INET6
-          bindings[:ipv4] << result if sock_addr[:sa_family] == NetworkingFFI::AF_INET
-        end
+            bindings[:ipv6] << result if sock_addr[:sa_family] == NetworkingFFI::AF_INET6
+            bindings[:ipv4] << result if sock_addr[:sa_family] == NetworkingFFI::AF_INET
+          end
 
-        def find_bindings(sock_addr, unicast, addr)
-          return unless [NetworkingFFI::AF_INET, NetworkingFFI::AF_INET6].include?(sock_addr[:sa_family])
+          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])
-        end
+            ::Resolvers::Utils::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))
-            @fact_list[:primary_interface] = name.to_s
+          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))
+              @fact_list[:primary_interface] = name.to_s
+            end
           end
         end
       end

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

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

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

@@ -5,7 +5,6 @@ require 'win32/registry'
 module Facter
   module Resolvers
     class ProductRelease < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
       class << self
         private

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

@@ -5,7 +5,6 @@ module Facter
     module Windows
       class Ssh < BaseResolver
         @log = Facter::Log.new(self)
-        @semaphore = Mutex.new
         @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].freeze

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

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

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

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

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

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

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

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

data/lib/facter/resolvers/wpar_resolver.rb

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

data/lib/facter/resolvers/xen.rb

@@ -3,10 +3,11 @@
 module Facter
   module Resolvers
     class Xen < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       XEN_PATH = '/proc/xen/capabilities'
+      XEN_TOOLSTACK = '/usr/lib/xen-common/bin/xen-toolstack'
+      XEN_COMMANDS = ['/usr/sbin/xl', '/usr/sbin/xm'].freeze
 
       class << self
         private
@@ -18,6 +19,7 @@ module Facter
         def detect_xen(fact_name)
           @fact_list[:vm] = detect_xen_type
           @fact_list[:privileged] = privileged?(@fact_list[:vm])
+          @fact_list[:domains] = detect_domains
 
           @fact_list[fact_name]
         end
@@ -33,6 +35,31 @@ module Facter
           content = Util::FileHelper.safe_read(XEN_PATH, nil)
           content&.strip == 'control_d' || xen_type == 'xen0'
         end
+
+        def detect_domains
+          domains = []
+          xen_command = find_command
+          return unless xen_command
+
+          output = Facter::Core::Execution.execute("#{xen_command} list", logger: log)
+          return if output.empty?
+
+          output.each_line do |line|
+            next if line =~ /Domain-0|Name/
+
+            domain = line.match(/^([^\s]*)\s/)
+            domain = domain&.captures&.first
+            domains << domain if domain
+          end
+
+          domains
+        end
+
+        def find_command
+          return XEN_TOOLSTACK if File.exist?(XEN_TOOLSTACK)
+
+          XEN_COMMANDS.each { |command| return command if File.exist?(command) }
+        end
       end
     end
   end