facter 4.0.41 → 4.0.47

data/lib/facter/resolvers/mountpoints_resolver.rb

@@ -3,20 +3,37 @@
 module Facter
   module Resolvers
     class Mountpoints < BaseResolver
-      include Facter::FilesystemHelper
-      @fact_list ||= {}
+      include Facter::Util::Resolvers::FilesystemHelper
+
+      init_resolver
+
       @log = Facter::Log.new(self)
+
       class << self
         private
 
         def post_resolve(fact_name)
-          @fact_list.fetch(fact_name) { read_mounts }
+          @fact_list.fetch(fact_name) { read_mounts(fact_name) }
         end
 
         def root_device
-          cmdline = Util::FileHelper.safe_read('/proc/cmdline')
+          cmdline = Facter::Util::FileHelper.safe_read('/proc/cmdline')
           match = cmdline.match(/root=([^\s]+)/)
-          match&.captures&.first
+          root = match&.captures&.first
+
+          if !root.nil? && root.include?('=')
+            # We are dealing with the PARTUUID of the partition. Need to extract partition path.
+            root_partition_path = convert_partuuid_to_path(root)
+            root = root_partition_path unless root_partition_path.nil?
+          end
+          root
+        end
+
+        def convert_partuuid_to_path(root)
+          blkid_content = Facter::Core::Execution.execute('blkid', logger: log)
+          partuuid = root.split('=').last
+          match = blkid_content.match(/(.+)#{partuuid}/)
+          match&.captures&.first&.split(':')&.first
         end
 
         def compute_device(device)
@@ -26,32 +43,46 @@ module Facter
           device
         end
 
-        def read_mounts # rubocop:disable Metrics/AbcSize
+        def read_mounts(fact_name)
           mounts = []
-          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)
+          Facter::Util::Resolvers::FilesystemHelper.read_mountpoints.each do |file_system|
+            mount = {}
+            get_mount_data(file_system, mount)
+
+            next if mount[:path] =~ %r{^/(proc|sys)} && mount[:filesystem] != 'tmpfs' || mount[:filesystem] == 'autofs'
+
+            get_mount_sizes(mount)
+            mounts << mount
+          end
 
-            next if path =~ %r{^/(proc|sys)} && filesystem != 'tmpfs' || filesystem == 'autofs'
+          @fact_list[:mountpoints] = mounts
+          @fact_list[fact_name]
+        end
 
-            stats = FilesystemHelper.read_mountpoint_stats(path)
-            size_bytes = stats.bytes_total.abs
-            available_bytes = stats.bytes_available.abs
+        def get_mount_data(file_system, mount)
+          mount[:device] = compute_device(file_system.name)
+          mount[:filesystem] = file_system.mount_type
+          mount[:path] = file_system.mount_point
+          mount[:options] = file_system.options.split(',').map(&:strip)
+        end
 
-            used_bytes = stats.bytes_used.abs
-            total_bytes = used_bytes + available_bytes
-            capacity = FilesystemHelper.compute_capacity(used_bytes, total_bytes)
+        def get_mount_sizes(mount)
+          stats = Facter::Util::Resolvers::FilesystemHelper.read_mountpoint_stats(mount[:path])
 
-            size = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(size_bytes)
-            available = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(available_bytes)
-            used = Facter::FactsUtils::UnitConverter.bytes_to_human_readable(used_bytes)
+          get_bytes_data(mount, stats)
 
-            mounts << Hash[FilesystemHelper::MOUNT_KEYS.zip(FilesystemHelper::MOUNT_KEYS
-              .map { |v| binding.local_variable_get(v) })]
-          end
-          @fact_list[:mountpoints] = mounts
+          total_bytes = mount[:used_bytes] + mount[:available_bytes]
+          mount[:capacity] = Facter::Util::Resolvers::FilesystemHelper.compute_capacity(mount[:used_bytes], total_bytes)
+
+          mount[:size] = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(mount[:size_bytes])
+          mount[:available] = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(mount[:available_bytes])
+          mount[:used] = Facter::Util::Facts::UnitConverter.bytes_to_human_readable(mount[:used_bytes])
+        end
+
+        def get_bytes_data(mount, stats)
+          mount[:size_bytes] = stats.bytes_total.abs
+          mount[:available_bytes] = stats.bytes_available.abs
+          mount[:used_bytes] = stats.bytes_used.abs
         end
       end
     end

data/lib/facter/resolvers/networking_linux_resolver.rb

@@ -3,8 +3,18 @@
 module Facter
   module Resolvers
     class NetworkingLinux < BaseResolver
-      @fact_list = {}
+      init_resolver
+
       DIRS = ['/var/lib/dhclient/', '/var/lib/dhcp/', '/var/lib/dhcp3/', '/var/lib/NetworkManager/', '/var/db/'].freeze
+      ROUTE_TYPES = %w[anycast
+                       unicast
+                       broadcast
+                       local
+                       nat
+                       unreachable
+                       prohibit
+                       blackhole
+                       throw].freeze
 
       class << self
         private
@@ -16,52 +26,188 @@ module Facter
         end
 
         def retrieve_network_info(fact_name)
-          @fact_list ||= {}
-
-          retrieve_interface_info
-          retrieve_interfaces_mac_and_mtu
-          retrieve_default_interface
-          ::Resolvers::Utils::Networking.expand_main_bindings(@fact_list)
+          mtu_and_indexes = interfaces_mtu_and_index
+          retrieve_interface_info(mtu_and_indexes)
+          add_info_from_routing_table
+          retrieve_primary_interface
+          Facter::Util::Resolvers::Networking.expand_main_bindings(@fact_list)
           @fact_list[fact_name]
         end
 
-        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
+        def interfaces_mtu_and_index
+          mtu_and_indexes = {}
+          output = Facter::Core::Execution.execute("ip link show", logger: log)
+          output.each_line do |line|
+            next unless line.include?('mtu')
+
+            mtu = line.match(/mtu (\d+)/)&.captures&.first&.to_i
+            index_tokens = line.split(':')
+            index = index_tokens[0].strip
+            # vlans are displayed as <vlan_name>@<physical_interface>
+            name = index_tokens[1].split('@').first.strip
+            mtu_and_indexes[name] = [index, mtu]
           end
+          mtu_and_indexes
         end
 
-        def retrieve_interface_info
-          log.debug('retrieve_interface_info')
-          output = Facter::Core::Execution.execute('ip -o address', logger: log)
-          log.debug("ip -o address result is:\n#{output}")
-
+        def retrieve_interface_info(mtu_and_indexes)
+          require 'socket'
           interfaces = {}
+          Socket.getifaddrs.each do |interface|
+            interfaces[interface.name] = {} if interfaces[interface.name].nil?
+
+            if interfaces[interface.name][:mac].nil?
+              mac = extract_mac_address(interface)
+              interfaces[interface.name][:mac] = mac if mac
+            end
 
-          output.each_line do |ip_line|
-            ip_tokens = ip_line.split(' ')
+            if interfaces[interface.name][:mtu].nil?
+              mtu = mtu_and_indexes.dig(interface.name, 1)
+              interfaces[interface.name][:mtu] = mtu unless mtu.nil?
+            end
 
-            log.debug("ip_tokens = #{ip_tokens}")
-            log.debug("interfaces = #{interfaces}")
-            fill_ip_v4_info!(ip_tokens, interfaces)
-            fill_io_v6_info!(ip_tokens, interfaces)
-            find_dhcp!(ip_tokens, interfaces)
+            if !interface.addr.nil? && !interface.netmask.nil?
+              begin
+                # ipv6 ips are retrieved as <ip>%<interface_name>
+                ip = interface.addr.ip_address.split('%').first if interface.addr.ip?
+                netmask = interface.netmask.ip_address
+                add_binding(interfaces, interface.name, ip, netmask, interface.addr.ipv4?)
+              rescue SocketError => e
+              end
+            end
+            find_dhcp!(interface.name, mtu_and_indexes, 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]
+        def extract_mac_address(interface)
+          mac = get_bonded_interface_mac(interface.name)
+          begin
+            if mac.nil?
+              if Socket.const_defined? :PF_LINK
+                mac = interface.addr&.getnameinfo&.first #sometimes it returns localhost, ip but mac also
+              elsif Socket.const_defined? :PF_PACKET
+                return if interface.addr.nil? || interface.addr.inspect_sockaddr.nil?
+
+                mac = interface.addr&.inspect_sockaddr[/hwaddr=([\h:]+)/, 1]
+              end
+            end
+          rescue StandardError => e
+            log.debug("Could not read mac, got #{e}")
+          end
+          mac if !mac.nil? && mac != '00:00:00:00:00:00' && mac =~ /^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$/
+        end
+
+        def get_bonded_interface_mac(interface_name)
+          master = get_bond_master(interface_name)
+          return unless master
+
+          output = Facter::Util::FileHelper.safe_read("/proc/net/bonding/#{master}", nil)
+          return unless output
+
+          right_block = false
+          output.each_line do |line|
+            if line.strip == "Slave Interface: #{interface_name}"
+              right_block = true
+            elsif line.include? 'Slave Interface'
+              right_block = false
+            end
+            return Regexp.last_match(1) if right_block && line =~ /Permanent HW addr: (\S*)/
+          end
+        end
+
+        def get_bond_master(interface_name)
+          content = Facter::Core::Execution.execute("ip link show #{interface_name}", logger: log)
+          master = content.match(/master (\S*) /)
+          return master[1] if master
+
+          nil
+        end
+
+        def add_binding(interfaces, name, ip, netmask, ip_v4_type)
+          binding = Facter::Util::Resolvers::Networking.build_binding(ip, netmask)
+          return if binding.nil?
+
+          log.debug("Adding to interface #{name}, binding:\n#{binding}")
+          binding_key = ip_v4_type == true ? :bindings : :bindings6
+          interfaces[name][binding_key] = [] if interfaces[name][binding_key].nil?
+          interfaces[name][binding_key] << binding
+        end
+
+        def add_info_from_routing_table
+          routes4, routes6 = read_routing_table
+          compare_ips(routes4, :bindings)
+          compare_ips(routes6, :bindings6)
+        end
+
+
+        def read_routing_table
+          ipv4_output = Facter::Core::Execution.execute('ip route show', logger: log)
+          ipv6_output = Facter::Core::Execution.execute('ip -6 route show', logger: log)
+          routes4 = parse_routes(ipv4_output, 'ipv4')
+          routes6 = parse_routes(ipv6_output, 'ipv6')
+          [routes4, routes6]
+        end
+
+        def parse_routes(output, family)
+          routes = []
+          output.each_line do |line|
+            parts = line.split(' ').compact
+            next if parts.include?('linkdown')
+
+            route_type = parts[0]
+            parts.delete_at(0) if ROUTE_TYPES.include?(route_type)
+            next if family == 'ipv6' && !parts[0].include?(':')
+
+            route = construct_route(parts)
+            routes << route unless route[:ip].nil?
+          end
+          routes.uniq
+        end
+
+        def construct_route(parts)
+          route = {}
+          dev_index = parts.find_index { |elem| elem == 'dev' }
+          src_index = parts.find_index { |elem| elem == 'src' }
+          route[:interface] = parts[dev_index + 1] if dev_index
+          route[:ip] = parts[src_index + 1] if src_index
+          route
+        end
 
-          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)
+        def compare_ips(routes, binding_key)
+          routes.each do |route|
+            # TODO we should simplify this
+            if @fact_list[:interfaces].key?(route[:interface])
+              if @fact_list[:interfaces][route[:interface]][binding_key].nil?
+                @fact_list[:interfaces][route[:interface]][binding_key] = [{ address: route[:ip] }]
+              elsif @fact_list[:interfaces][route[:interface]][binding_key].none? { |binding| binding[:address] == route[:ip] }
+                @fact_list[:interfaces][route[:interface]][binding_key] << { address: route[:ip] }
+              end
+            end
+          end
+        end
+
+        def find_dhcp!(interface_name, interface_indexes, interfaces)
+          return if !interfaces[interface_name] || interfaces[interface_name][:dhcp]
+
+          log.debug("Get DHCP for interface #{interface_name}")
+          unless interface_indexes[interface_name].nil?
+            index = interface_indexes[interface_name][0]
+            file_content = Facter::Util::FileHelper.safe_read("/run/systemd/netif/leases/#{index}", nil)
+            dhcp = file_content.match(/SERVER_ADDRESS=(.*)/) if file_content
+            if dhcp
+              interfaces[interface_name][:dhcp] = dhcp[1]
+            else
+              alternate_dhcp = retrieve_from_other_directories(interface_name)
+              interfaces[interface_name][:dhcp] = alternate_dhcp if alternate_dhcp
+            end
+          end
+          return unless interfaces[interface_name][:dhcp].nil?
+
+          output = Facter::Core::Execution.execute("dhcpcd -U #{interface_name}", logger: log)
+          result = output.match(/dhcp_server_identifier='(.*)'/)&.captures&.first
+          interfaces[interface_name][:dhcp] = result if result
         end
 
         def retrieve_from_other_directories(interface_name)
@@ -72,10 +218,11 @@ module Facter
             next if lease_files.empty?
 
             lease_files.select do |file|
-              content = Util::FileHelper.safe_read("#{dir}#{file}", nil)
+              content = Facter::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]
+              dhcp = content.match(/dhcp-server-identifier ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/)
+              return dhcp[1] if dhcp
             end
           end
           return unless File.readable?('/var/lib/NetworkManager/')
@@ -88,7 +235,7 @@ module Facter
           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 = Facter::Util::FileHelper.safe_read("/var/lib/NetworkManager/#{lease_file}", nil)
 
           return unless dhcp
 
@@ -96,57 +243,15 @@ module Facter
           dhcp[1] if dhcp
         end
 
-        def fill_ip_v4_info!(ip_tokens, network_info)
-          log.debug('fill_ip_v4_info!')
-          return unless ip_tokens[2].casecmp('inet').zero?
-
-          interface_name, ip4_address, ip4_mask_length = retrieve_name_and_ip_info(ip_tokens)
-
-          log.debug("interface_name = #{interface_name}\n" \
-                      "ip4_address = #{ip4_address}\n" \
-                      "ip4_mask_length = #{ip4_mask_length}")
-
-          binding = ::Resolvers::Utils::Networking.build_binding(ip4_address, ip4_mask_length)
-          build_network_info_structure!(network_info, interface_name, :bindings)
+        def retrieve_primary_interface
+          primary_helper = Facter::Util::Resolvers::Networking::PrimaryInterface
+          primary_interface = primary_helper.read_from_proc_route
+          primary_interface ||= primary_helper.read_from_ip_route
+          primary_interface ||= primary_helper.find_in_interfaces(@fact_list[:interfaces])
 
-          network_info[interface_name][:bindings] << binding
+          @fact_list[:primary_interface] = primary_interface
         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, ip6_address, ip6_mask_length = retrieve_name_and_ip_info(ip_tokens)
-
-          binding = ::Resolvers::Utils::Networking.build_binding(ip6_address, ip6_mask_length)
-
-          build_network_info_structure!(network_info, interface_name, :bindings6)
-
-          network_info[interface_name][:scope6] ||= ip_tokens[5]
-          network_info[interface_name][:bindings6] << binding
-        end
-
-        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]
-
-          @fact_list[:primary_interface] = default_interface
-        end
-
-        def build_network_info_structure!(network_info, interface_name, binding)
-          network_info[interface_name] = {} unless network_info.dig(interface_name)
-          network_info[interface_name][binding] = [] unless network_info.dig(interface_name, binding)
-        end
       end
     end
   end

data/lib/facter/resolvers/networking_resolver.rb

@@ -3,7 +3,7 @@
 module Facter
   module Resolvers
     class Networking < BaseResolver
-      @fact_list ||= {}
+      init_resolver
 
       class << self
         private
@@ -13,16 +13,19 @@ module Facter
         end
 
         def read_facts(fact_name)
-          primary_interface
           interfaces_data
-          ::Resolvers::Utils::Networking.expand_main_bindings(@fact_list)
+          primary_interface
+          Facter::Util::Resolvers::Networking.expand_main_bindings(@fact_list)
           @fact_list[fact_name]
         end
 
         def primary_interface
-          result = Facter::Core::Execution.execute('route -n get default', logger: log)
+          primary_helper = Facter::Util::Resolvers::Networking::PrimaryInterface
+          primary_interface ||= primary_helper.read_from_route
+
+          primary_interface ||= primary_helper.find_in_interfaces(@fact_list[:interfaces])
 
-          @fact_list[:primary_interface] = result.match(/interface: (.+)/)&.captures&.first
+          @fact_list[:primary_interface] = primary_interface
         end
 
         def interfaces_data
@@ -95,7 +98,7 @@ module Facter
         def create_bindings(ips, masks)
           bindings = []
           ips.zip(masks).each do |ip, mask|
-            bindings << ::Resolvers::Utils::Networking.build_binding(ip, mask)
+            bindings << Facter::Util::Resolvers::Networking.build_binding(ip, mask)
           end
           bindings
         end