facter 4.0.34 → 4.0.39

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Solaris
+      class ZoneName < BaseResolver
+        @fact_list ||= {}
+
+        class << self
+          private
+
+          def post_resolve(fact_name)
+            @fact_list.fetch(fact_name) { build_current_zone_name_fact(fact_name) }
+          end
+
+          def build_current_zone_name_fact(fact_name)
+            zone_name_output = Facter::Core::Execution.execute('/bin/zonename', logger: log)
+
+            if zone_name_output.empty?
+              log.debug("Command #{command} returned an empty result")
+              return
+            end
+            @fact_list[:current_zone_name] = zone_name_output.chomp
+            @fact_list[fact_name]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/ssh_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     class SshResolver < 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]
       @file_paths = %w[/etc/ssh /usr/local/etc/ssh /etc /usr/local/etc /etc/opt/ssh]

data/lib/facter/resolvers/suse_release_resolver.rb

@@ -7,7 +7,6 @@ module Facter
       # :version
       # :codename
 
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/sw_vers_resolver.rb

@@ -7,7 +7,6 @@ module Facter
       # :productversion
       # :buildversion
       #
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/timezone_resolver.rb

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

data/lib/facter/resolvers/uname_resolver.rb

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

data/lib/facter/resolvers/uptime_resolver.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class Uptime < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self
@@ -23,33 +22,7 @@ module Facter
         def build_fact_list(seconds)
           return @fact_list[:uptime] = 'unknown' unless seconds
 
-          uptime_hash = create_uptime_hash(seconds)
-
-          @fact_list[:seconds] = uptime_hash[:seconds]
-          @fact_list[:hours]   = uptime_hash[:hours]
-          @fact_list[:days]    = uptime_hash[:days]
-          @fact_list[:uptime]  = uptime_hash[:uptime]
-        end
-
-        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
+          @fact_list = Utils::UptimeHelper.create_uptime_hash(seconds)
         end
       end
     end

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

@@ -7,7 +7,9 @@ module Facter
                     size_bytes used used_bytes capacity].freeze
     class << self
       def read_mountpoints
-        require 'sys/filesystem'
+        # TODO: this require must be replaced with "require 'sys/filesystem'" when a new release of
+        # djberg96/sys-filesystem gem is available
+        require_relative '../../patches/sysfilesystem/sys/statvfs.rb'
         force_utf(Sys::Filesystem.mounts)
       end
 

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

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Utils
+      module Http
+        @log = Facter::Log.new(self)
+
+        class << self
+          CONNECTION_TIMEOUT = 0.6
+          SESSION_TIMEOUT = 5
+
+          # Makes a GET http request and returns it's response.
+          #
+          # Params:
+          # url: String which contains the address to which the request will be made
+          # headers: Hash which contains the headers you need to add to your request.
+          #          Default headers is an empty hash
+          #          Example: { "Accept": 'application/json' }
+          # timeouts: Hash that includes the values for the session and connection timeouts.
+          #          Example: { session: 2.4. connection: 5 }
+          #
+          # Return value:
+          # is a string with the response body if the response code is 200.
+          # If the response code is not 200, an empty string is returned.
+          def get_request(url, headers = {}, timeouts = {})
+            make_request(url, headers, timeouts, 'GET')
+          end
+
+          private
+
+          def make_request(url, headers, timeouts, request_type)
+            require 'net/http'
+
+            uri = URI.parse(url)
+            http = http_obj(uri, timeouts)
+            request = request_obj(headers, uri, request_type)
+
+            # Make the request
+            resp = http.request(request)
+            response_code_valid?(resp.code.to_i) ? resp.body : ''
+          rescue StandardError => e
+            @log.debug("Trying to connect to #{url} but got: #{e.message}")
+            ''
+          end
+
+          def http_obj(parsed_url, timeouts)
+            http = Net::HTTP.new(parsed_url.host)
+            http.read_timeout = timeouts[:session] || SESSION_TIMEOUT
+            http.open_timeout = timeouts[:connection] || CONNECTION_TIMEOUT
+            http
+          end
+
+          def request_obj(headers, parsed_url, request_type)
+            return Net::HTTP::Get.new(parsed_url.request_uri, headers) if request_type == 'GET'
+
+            raise StandardError("Unknown http request type: #{request_type}")
+          end
+
+          def response_code_valid?(http_code)
+            @log.debug("Request failed with error code #{http_code}") unless http_code.equal?(200)
+            http_code.equal?(200)
+          end
+        end
+      end
+    end
+  end
+end

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/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

@@ -2,131 +2,132 @@
 
 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