facter 4.0.20 → 4.0.21

data/lib/resolvers/macosx/dmi_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Macosx
       class DmiBios < BaseResolver
-        @log = Facter::Log.new(self)
         @semaphore = Mutex.new
         @fact_list ||= {}
 
@@ -19,7 +18,7 @@ module Facter
 
           def read_facts
             # OSX only supports the product name
-            output, _status = Open3.capture2('sysctl -n hw.model')
+            output = Facter::Core::Execution.execute('sysctl -n hw.model', logger: log)
             @fact_list[:macosx_model] = output&.strip
           end
         end

data/lib/resolvers/macosx/filesystems_resolver.rb

@@ -7,7 +7,6 @@ module Facter
         # :macosx_filesystems
         @semaphore = Mutex.new
         @fact_list ||= {}
-        @log = Facter::Log.new(self)
 
         class << self
           private
@@ -17,7 +16,7 @@ module Facter
           end
 
           def read_filesystems(fact_name)
-            output, _status = Open3.capture2('mount')
+            output = Facter::Core::Execution.execute('mount', logger: log)
             filesystems = []
             output.each_line do |line|
               filesystem = line.match(/\(([a-z]+)\,*/).to_s

data/lib/resolvers/macosx/ipaddress_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Macosx
       class Ipaddress < BaseResolver
-        @log = Facter::Log.new(self)
         @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
@@ -19,7 +18,7 @@ module Facter
             primary_interface = read_primary_interface
             unless primary_interface.nil?
               @fact_list[:primary] = primary_interface
-              output, _status = Open3.capture2("ipconfig getifaddr #{primary_interface}")
+              output = Facter::Core::Execution.execute("ipconfig getifaddr #{primary_interface}", logger: log)
               ip = output.strip
             end
             find_all_interfaces
@@ -29,7 +28,7 @@ module Facter
 
           def read_primary_interface
             iface = nil
-            output, _status = Open3.capture2('route -n get default')
+            output = Facter::Core::Execution.execute('route -n get default', logger: log)
             output.split(/^\S/).each do |str|
               iface = Regexp.last_match(1) if str.strip =~ /interface: (\S+)/
             end
@@ -37,7 +36,7 @@ module Facter
           end
 
           def find_all_interfaces
-            output, _status = Open3.capture2('ifconfig -a 2>/dev/null')
+            output = Facter::Core::Execution.execute('ifconfig -a', logger: log)
 
             data_hash = Hash[*output.split(/^([A-Za-z0-9_]+): /)[1..-1]]
 

data/lib/resolvers/macosx/load_averages_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Macosx
       class LoadAverages < BaseResolver
-        @log = Facter::Log.new(self)
         @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
@@ -15,7 +14,7 @@ module Facter
           end
 
           def read_load_averages_file(fact_name)
-            output, _status = Open3.capture2('sysctl -n vm.loadavg')
+            output = Facter::Core::Execution.execute('sysctl -n vm.loadavg', logger: log)
             @fact_list[:load_averages] = {}.tap { |h| _, h['1m'], h['5m'], h['15m'], = output.split.map(&:to_f) }
 
             @fact_list[fact_name]

data/lib/resolvers/macosx/mountpoints_resolver.rb

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

data/lib/resolvers/macosx/processor_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Macosx
       class Processors < BaseResolver
-        @log = Facter::Log.new(self)
         @semaphore = Mutex.new
         @fact_list = {}
         ITEMS = { logical_count: 'hw.logicalcpu_max',
@@ -24,7 +23,7 @@ module Facter
           end
 
           def read_processor_data(fact_name)
-            output, _status = Open3.capture2("sysctl #{ITEMS.values.join(' ')}")
+            output = Facter::Core::Execution.execute("sysctl #{ITEMS.values.join(' ')}", logger: log)
             build_fact_list(output.split("\n"))
             @fact_list[fact_name]
           end

data/lib/resolvers/macosx/swap_memory_resolver.rb

@@ -6,7 +6,6 @@ module Facter
       class SwapMemory < BaseResolver
         @semaphore = Mutex.new
         @fact_list ||= {}
-        @log = Facter::Log.new(self)
         class << self
           private
 
@@ -15,7 +14,7 @@ module Facter
           end
 
           def read_swap_memory(fact_name) # rubocop:disable Metrics/AbcSize
-            output = Open3.capture2('sysctl -n vm.swapusage').first
+            output = Facter::Core::Execution.execute('sysctl -n vm.swapusage', logger: log)
             data = output.match(/^total = ([\d.]+)M  used = ([\d.]+)M  free = ([\d.]+)M  (\(encrypted\))$/)
 
             if data[1].to_f.positive?
@@ -34,7 +33,7 @@ module Facter
           end
 
           def compute_capacity(used, total)
-            format('%.2f', (used / total.to_f * 100)) + '%'
+            "#{format('%<value>.2f', value: (used / total.to_f * 100))}%"
           end
         end
       end

data/lib/resolvers/macosx/system_memory_resolver.rb

@@ -6,7 +6,6 @@ module Facter
       class SystemMemory < BaseResolver
         @semaphore = Mutex.new
         @fact_list ||= {}
-        @log = Facter::Log.new(self)
         class << self
           private
 
@@ -25,7 +24,7 @@ module Facter
           end
 
           def read_available_memory_in_bytes
-            output, _status = Open3.capture2('vm_stat')
+            output = Facter::Core::Execution.execute('vm_stat', logger: log)
             page_size = output.match(/page size of (\d+) bytes/)[1].to_i
             pages_free = output.match(/Pages free:\s+(\d+)/)[1].to_i
 
@@ -33,11 +32,11 @@ module Facter
           end
 
           def read_total_memory_in_bytes
-            @fact_list[:total_bytes] = Open3.capture2('sysctl -n hw.memsize').first.to_i
+            @fact_list[:total_bytes] = Facter::Core::Execution.execute('sysctl -n hw.memsize', logger: log).to_i
           end
 
           def compute_capacity(used, total)
-            format('%.2f', (used / total.to_f * 100)) + '%'
+            "#{format('%<value>.2f', value: (used / total.to_f * 100))}%"
           end
         end
       end

data/lib/resolvers/macosx/system_profiler_resolver.rb

@@ -42,7 +42,9 @@ module Facter
           @fact_list ||= {}
 
           log.debug 'Executing command: system_profiler SPSoftwareDataType SPHardwareDataType'
-          output, _status = Open3.capture2('system_profiler SPHardwareDataType SPSoftwareDataType')
+          output = Facter::Core::Execution.execute(
+            'system_profiler SPHardwareDataType SPSoftwareDataType', logger: log
+          )
           @fact_list = output.scan(/.*:[ ].*$/).map { |e| e.strip.match(/(.*?): (.*)/).captures }.to_h
           normalize_factlist
 

data/lib/resolvers/mountpoints_resolver.rb

@@ -39,10 +39,10 @@ module Facter
               next if path =~ %r{^/(proc|sys)} && filesystem != 'tmpfs' || filesystem == 'autofs'
 
               stats = FilesystemHelper.read_mountpoint_stats(path)
-              size_bytes = stats.bytes_total
-              available_bytes = stats.bytes_available
+              size_bytes = stats.bytes_total.abs
+              available_bytes = stats.bytes_available.abs
 
-              used_bytes = stats.bytes_used
+              used_bytes = stats.bytes_used.abs
               total_bytes = used_bytes + available_bytes
               capacity = FilesystemHelper.compute_capacity(used_bytes, total_bytes)
 

data/lib/resolvers/networking_linux_resolver.rb

@@ -5,6 +5,7 @@ module Facter
     class NetworkingLinux < BaseResolver
       @semaphore = Mutex.new
       @fact_list = {}
+      DIRS = ['/var/lib/dhclient/', '/var/lib/dhcp/', '/var/lib/dhcp3/', '/var/lib/NetworkManager/', '/var/db/'].freeze
 
       class << self
         private
@@ -18,20 +19,23 @@ module Facter
         def retrieve_network_info(fact_name)
           @fact_list ||= {}
 
-          retrieve_default_interface_and_ip
           retrieve_interface_info
-          retrieve_macaddress
+          retrieve_interfaces_mac_and_mtu
+          retrieve_default_interface
           @fact_list[fact_name]
         end
 
-        def retrieve_macaddress
-          output, _status = Open3.capture2("ip link show #{@fact_list[:primary_interface]}")
-          macaddress = */ether ([^ ]*) /.match(output)
-          @fact_list[:macaddress] = macaddress[1]
+        def retrieve_interfaces_mac_and_mtu
+          @fact_list[:interfaces].map do |name, info|
+            macaddress = Util::FileHelper.safe_read("/sys/class/net/#{name}/address", nil)
+            info[:mac] = macaddress.strip if macaddress && !macaddress.include?('00:00:00:00:00:00')
+            mtu = Util::FileHelper.safe_read("/sys/class/net/#{name}/mtu", nil)
+            info[:mtu] = mtu.strip.to_i if mtu
+          end
         end
 
         def retrieve_interface_info
-          output, _status = Open3.capture2('ip -o address')
+          output = Facter::Core::Execution.execute('ip -o address', logger: log)
           interfaces = {}
 
           output.each_line do |ip_line|
@@ -39,48 +43,103 @@ module Facter
 
             fill_ip_v4_info!(ip_tokens, interfaces)
             fill_io_v6_info!(ip_tokens, interfaces)
+            find_dhcp!(ip_tokens, interfaces)
           end
 
           @fact_list[:interfaces] = interfaces
         end
 
+        def find_dhcp!(tokens, network_info)
+          interface_name = tokens[1]
+          return if !network_info[interface_name] || network_info[interface_name][:dhcp]
+
+          index = tokens[0].delete(':')
+          dhcp = Util::FileHelper.safe_read("/run/systemd/netif/leases/#{index}", nil)
+          network_info[interface_name][:dhcp] = dhcp.match(/SERVER_ADDRESS=(.*)/)[1] if dhcp
+          network_info[interface_name][:dhcp] ||= retrieve_from_other_directories(interface_name)
+        end
+
+        def retrieve_from_other_directories(interface_name)
+          DIRS.each do |dir|
+            next unless File.readable?(dir)
+
+            lease_files = Dir.entries(dir).select { |file| file =~ /dhclient.*\.lease/ }
+            next if lease_files.empty?
+
+            lease_files.select do |file|
+              content = Util::FileHelper.safe_read("#{dir}#{file}", nil)
+              next unless content =~ /interface.*#{interface_name}/
+
+              return content.match(/dhcp-server-identifier ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/)[1]
+            end
+          end
+          return unless File.readable?('/var/lib/NetworkManager/')
+
+          search_internal_leases(interface_name)
+        end
+
+        def search_internal_leases(interface_name)
+          files = Dir.entries('/var/lib/NetworkManager/').reject { |dir| dir =~ /^\.+$/ }
+          lease_file = files.find { |file| file =~ /internal.*#{interface_name}\.lease/ }
+          return unless lease_file
+
+          dhcp = Util::FileHelper.safe_read("/var/lib/NetworkManager/#{lease_file}", nil)
+          dhcp ? dhcp.match(/SERVER_ADDRESS=(.*)/)[1] : nil
+        end
+
         def fill_ip_v4_info!(ip_tokens, network_info)
           return unless ip_tokens[2].casecmp('inet').zero?
 
-          interface_name = ip_tokens[1]
-          ip4_info = ip_tokens[3].split('/')
-          ip4_address = ip4_info[0]
-          ip4_mask_length = ip4_info[1]
+          interface_name, ip4_address, ip4_mask_length = retrieve_name_and_ip_info(ip_tokens)
 
           binding = build_binding(ip4_address, ip4_mask_length)
           build_network_info_structure!(network_info, interface_name, 'bindings')
 
+          populate_other_ipv4_facts(network_info, interface_name, binding)
+        end
+
+        def populate_other_ipv4_facts(network_info, interface_name, binding)
           network_info[interface_name]['bindings'] << binding
+          network_info[interface_name][:ip] ||= binding[:address]
+          network_info[interface_name][:network] ||= binding[:network]
+          network_info[interface_name][:netmask] ||= binding[:netmask]
+        end
+
+        def retrieve_name_and_ip_info(tokens)
+          interface_name = tokens[1]
+          ip_info = tokens[3].split('/')
+          ip_address = ip_info[0]
+          ip_mask_length = ip_info[1]
+
+          [interface_name, ip_address, ip_mask_length]
         end
 
         def fill_io_v6_info!(ip_tokens, network_info)
           return unless ip_tokens[2].casecmp('inet6').zero?
 
-          interface_name = ip_tokens[1]
-          ip6_info = ip_tokens[3].split('/')
-          ip6_address = ip6_info[0]
-          ip6_mask_length = ip6_info[1]
+          interface_name, ip6_address, ip6_mask_length = retrieve_name_and_ip_info(ip_tokens)
 
           binding = build_binding(ip6_address, ip6_mask_length)
 
           build_network_info_structure!(network_info, interface_name, 'bindings6')
 
+          network_info[interface_name][:scope6] ||= ip_tokens[5]
+          populate_other_ipv6_facts(network_info, interface_name, binding)
+        end
+
+        def populate_other_ipv6_facts(network_info, interface_name, binding)
           network_info[interface_name]['bindings6'] << binding
+          network_info[interface_name][:ip6] ||= binding[:address]
+          network_info[interface_name][:network6] ||= binding[:network]
+          network_info[interface_name][:netmask6] ||= binding[:netmask]
         end
 
-        def retrieve_default_interface_and_ip
-          output, _status = Open3.capture2('ip route get 1')
+        def retrieve_default_interface
+          output = Facter::Core::Execution.execute('ip route get 1', logger: log)
 
           ip_route_tokens = output.each_line.first.strip.split(' ')
           default_interface = ip_route_tokens[4]
-          default_ip = ip_route_tokens[6]
 
-          @fact_list[:ip] = default_ip
           @fact_list[:primary_interface] = default_interface
         end
 

data/lib/resolvers/os_level_resolver.rb

@@ -16,8 +16,9 @@ module Facter
         end
 
         def read_oslevel(fact_name)
-          output, _status = Open3.capture2('/usr/bin/oslevel -s 2>/dev/null')
-          @fact_list[:build] = output
+          output = Facter::Core::Execution.execute('/usr/bin/oslevel -s', logger: log)
+
+          @fact_list[:build] = output unless output.empty?
           @fact_list[:kernel] = 'AIX'
 
           @fact_list[fact_name]

data/lib/resolvers/partitions.rb

@@ -87,14 +87,17 @@ module Facter
         def blkid_command?
           return @blkid_exists unless @blkid_exists.nil?
 
-          stdout, _stderr, _status = Open3.capture3('which blkid')
-          @blkid_exists = stdout && !stdout.empty?
+          output = Facter::Core::Execution.execute('which blkid', logger: log)
+
+          @blkid_exists = !output.empty?
         end
 
         def execute_and_extract_blkid_info
-          stdout, _stderr, _status = Open3.capture3('blkid')
+          stdout = Facter::Core::Execution.execute('blkid', logger: log)
           output_hash = Hash[*stdout.split(/^([^:]+):/)[1..-1]]
-          output_hash.each { |key, value| output_hash[key] = Hash[*value.delete('"').chomp.split(/ ([^= ]+)=/)[1..-1]] }
+          output_hash.each do |key, value|
+            output_hash[key] = Hash[*value.delete('"').chomp.rstrip.split(/ ([^= ]+)=/)[1..-1]]
+          end
         end
 
         def browse_subdirectories(path)

data/lib/resolvers/processors_resolver.rb

@@ -25,6 +25,7 @@ module Facter
             read_processors(cpuinfo_output) # + model names
 
             @fact_list[:physical_count] = @fact_list[:physical_processors].uniq.length
+            @fact_list[:physical_count] = physical_devices_count if @fact_list[:physical_count].zero?
             @fact_list[fact_name]
           end
 
@@ -51,6 +52,10 @@ module Facter
           def count_physical_processors(tokens)
             @fact_list[:physical_processors] << tokens.last.strip.to_i if tokens.first.strip == 'physical id'
           end
+
+          def physical_devices_count
+            Dir.entries('/sys/devices/system/cpu').count { |dir| dir =~ /cpu[0-9]+$/ }
+          end
         end
       end
     end

data/lib/resolvers/selinux_resolver.rb

@@ -21,7 +21,7 @@ module Facter
         end
 
         def read_mounts_file
-          output, _s = Open3.capture2('cat /proc/self/mounts')
+          output = Facter::Core::Execution.execute('cat /proc/self/mounts', logger: log)
           @fact_list[:enabled] = false
           mountpoint = ''
 

data/lib/resolvers/solaris/filesystems_resolver.rb

@@ -17,7 +17,7 @@ module Facter
           def read_sysdef_file(fact_name)
             return unless File.executable?('/usr/sbin/sysdef')
 
-            file_content, _status = Open3.capture2('/usr/sbin/sysdef')
+            file_content = Facter::Core::Execution.execute('/usr/sbin/sysdef', logger: log)
             files = file_content.split("\n").map do |line|
               line.split('/').last if line =~ /^fs\.*/
             end

data/lib/resolvers/solaris/ipaddress_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Solaris
       class Ipaddress < BaseResolver
-        @log = Facter::Log.new(self)
         @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
@@ -18,7 +17,7 @@ module Facter
             ip = nil
             primary_interface = read_primary_interface
             unless primary_interface.nil?
-              output, _status = Open3.capture2("ifconfig #{primary_interface}")
+              output = Facter::Core::Execution.execute("ifconfig #{primary_interface}", logger: log)
               output.each_line do |str|
                 if str.strip =~ /inet\s(\d{1,3}.\d{1,3}.\d{1,3}.\d{1,3}) .+/
                   @fact_list[:ip] = ip = Regexp.last_match(1)
@@ -30,7 +29,7 @@ module Facter
           end
 
           def read_primary_interface
-            output, _status = Open3.capture2('route -n get default | grep interface')
+            output = Facter::Core::Execution.execute('route -n get default | grep interface', logger: log)
             output.strip =~ /interface:\s(\S+)/ ? Regexp.last_match(1) : nil
           end
         end