facter 4.0.51 → 4.0.52

data/lib/facter/util/resolvers/ffi/hostname.rb

@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require 'ffi'
+
+module Facter
+  module Util
+    module Resolvers
+      module Ffi
+        class AddrInfo < ::FFI::Struct
+          layout  :ai_flags, :int,
+                  :ai_family, :int,
+                  :ai_socketype, :int,
+                  :ai_protocol, :int,
+                  :ai_addrlen, :uint,
+                  :ai_addr, :pointer,
+                  :ai_canonname, :string,
+                  :ai_next, :pointer
+        end
+
+        module Hostname
+          HOST_NAME_MAX = 64
+
+          extend ::FFI::Library
+          ffi_lib ::FFI::Library::LIBC
+
+          attach_function :getaddrinfo, %i[string string pointer pointer], :int
+          attach_function :gethostname, %i[pointer int], :int
+          attach_function :freeaddrinfo, [:pointer], :void
+
+          def self.getffihostname
+            raw_hostname = ::FFI::MemoryPointer.new(:char, HOST_NAME_MAX)
+
+            res = Hostname.gethostname(raw_hostname, HOST_NAME_MAX)
+            return unless res.zero?
+
+            raw_hostname.read_string
+          end
+
+          def self.getffiaddrinfo(hostname) # rubocop:disable  Metrics/AbcSize
+            ret = FFI::MemoryPointer.new(:pointer)
+
+            hints = Facter::Util::Resolvers::Ffi::AddrInfo.new
+            hints[:ai_family] = Socket::AF_UNSPEC
+            hints[:ai_socketype] = Socket::SOCK_STREAM
+            hints[:ai_flags] = Socket::AI_CANONNAME
+
+            res = Hostname.getaddrinfo(hostname, '', hints.to_ptr, ret)
+            log = Log.new(self)
+            log.debug("FFI Getaddrinfo finished with exit status: #{res}")
+            log.debug("FFI Getaddrinfo returned an AddrInfo struct at address: #{ret}")
+            return unless res.zero?
+
+            return if ret == FFI::Pointer::NULL || ret.read_pointer == FFI::Pointer::NULL
+
+            begin
+              addr = Facter::Util::Resolvers::Ffi::AddrInfo.new(ret.read_pointer)
+              name = addr[:ai_canonname]
+              log.debug("FFI AddrInfo struct has the fqdn: #{name}")
+              return if !name || hostname == name
+
+              name
+            ensure
+              Hostname.freeaddrinfo(ret.read_pointer)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Facter
-  VERSION = '4.0.51' unless defined?(VERSION)
+  VERSION = '4.0.52' unless defined?(VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.0.51
+  version: 4.0.52
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-05 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -166,6 +166,7 @@ extra_rdoc_files: []
 files:
 - bin/facter
 - lib/docs/generate.rb
+- lib/docs/generate_cli.rb
 - lib/docs/template.erb
 - lib/facter.rb
 - lib/facter/config.rb
@@ -277,6 +278,13 @@ files:
 - lib/facter/facts/aix/system_uptime/uptime.rb
 - lib/facter/facts/aix/timezone.rb
 - lib/facter/facts/alpine/os/release.rb
+- lib/facter/facts/amzn/lsbdistcodename.rb
+- lib/facter/facts/amzn/lsbdistdescription.rb
+- lib/facter/facts/amzn/lsbdistid.rb
+- lib/facter/facts/amzn/os/distro/codename.rb
+- lib/facter/facts/amzn/os/distro/description.rb
+- lib/facter/facts/amzn/os/distro/id.rb
+- lib/facter/facts/amzn/os/distro/release.rb
 - lib/facter/facts/amzn/os/release.rb
 - lib/facter/facts/bsd/kernelmajversion.rb
 - lib/facter/facts/bsd/kernelversion.rb
@@ -379,7 +387,8 @@ files:
 - lib/facter/facts/gentoo/os/release.rb
 - lib/facter/facts/linux/aio_agent_version.rb
 - lib/facter/facts/linux/augeas/version.rb
-- lib/facter/facts/linux/cloud.rb
+- lib/facter/facts/linux/az_metadata.rb
+- lib/facter/facts/linux/cloud/provider.rb
 - lib/facter/facts/linux/dhcp_servers.rb
 - lib/facter/facts/linux/disks.rb
 - lib/facter/facts/linux/dmi/bios/release_date.rb
@@ -613,6 +622,9 @@ files:
 - lib/facter/facts/openwrt/os/release.rb
 - lib/facter/facts/ovs/os/release.rb
 - lib/facter/facts/photon/os/release.rb
+- lib/facter/facts/rhel/lsbdistcodename.rb
+- lib/facter/facts/rhel/lsbdistdescription.rb
+- lib/facter/facts/rhel/lsbdistid.rb
 - lib/facter/facts/rhel/os/distro/codename.rb
 - lib/facter/facts/rhel/os/distro/description.rb
 - lib/facter/facts/rhel/os/distro/id.rb
@@ -621,6 +633,9 @@ files:
 - lib/facter/facts/rhel/os/name.rb
 - lib/facter/facts/rhel/os/release.rb
 - lib/facter/facts/slackware/os/release.rb
+- lib/facter/facts/sles/lsbdistcodename.rb
+- lib/facter/facts/sles/lsbdistdescription.rb
+- lib/facter/facts/sles/lsbdistid.rb
 - lib/facter/facts/sles/os/distro/codename.rb
 - lib/facter/facts/sles/os/distro/description.rb
 - lib/facter/facts/sles/os/distro/id.rb
@@ -729,6 +744,8 @@ files:
 - lib/facter/facts/ubuntu/os/release.rb
 - lib/facter/facts/windows/aio_agent_version.rb
 - lib/facter/facts/windows/augeas/version.rb
+- lib/facter/facts/windows/az_metadata.rb
+- lib/facter/facts/windows/cloud/provider.rb
 - lib/facter/facts/windows/dhcp_servers.rb
 - lib/facter/facts/windows/dmi/manufacturer.rb
 - lib/facter/facts/windows/dmi/product/name.rb
@@ -867,10 +884,10 @@ files:
 - lib/facter/resolvers/aix/processors.rb
 - lib/facter/resolvers/aix/serialnumber.rb
 - lib/facter/resolvers/augeas.rb
+- lib/facter/resolvers/az.rb
 - lib/facter/resolvers/base_resolver.rb
 - lib/facter/resolvers/bsd/ffi/ffi_helper.rb
 - lib/facter/resolvers/bsd/processors.rb
-- lib/facter/resolvers/cloud.rb
 - lib/facter/resolvers/containers.rb
 - lib/facter/resolvers/debian_version.rb
 - lib/facter/resolvers/disk.rb
@@ -893,7 +910,9 @@ files:
 - lib/facter/resolvers/hostname.rb
 - lib/facter/resolvers/identity.rb
 - lib/facter/resolvers/linux/docker_uptime.rb
+- lib/facter/resolvers/linux/hostname.rb
 - lib/facter/resolvers/linux/load_averages.rb
+- lib/facter/resolvers/linux/networking.rb
 - lib/facter/resolvers/load_averages.rb
 - lib/facter/resolvers/lpar.rb
 - lib/facter/resolvers/lsb_release.rb
@@ -909,7 +928,6 @@ files:
 - lib/facter/resolvers/memory.rb
 - lib/facter/resolvers/mountpoints.rb
 - lib/facter/resolvers/networking.rb
-- lib/facter/resolvers/networking_linux.rb
 - lib/facter/resolvers/open_vz.rb
 - lib/facter/resolvers/os_release.rb
 - lib/facter/resolvers/partitions.rb
@@ -987,8 +1005,12 @@ files:
 - lib/facter/util/facts/virtual_detector.rb
 - lib/facter/util/facts/windows_release_finder.rb
 - lib/facter/util/file_helper.rb
+- lib/facter/util/linux/dhcp.rb
+- lib/facter/util/linux/routing_table.rb
+- lib/facter/util/linux/socket_parser.rb
 - lib/facter/util/macosx/system_profile_executor.rb
 - lib/facter/util/resolvers/aws_token.rb
+- lib/facter/util/resolvers/ffi/hostname.rb
 - lib/facter/util/resolvers/ffi/load_averages.rb
 - lib/facter/util/resolvers/filesystem_helper.rb
 - lib/facter/util/resolvers/fingerprint.rb
@@ -1002,7 +1024,7 @@ files:
 - lib/facter/util/utils.rb
 - lib/facter/util/windows/win32ole.rb
 - lib/facter/version.rb
-homepage: 
+homepage: https://github.com/puppetlabs/facter
 licenses:
 - MIT
 metadata: {}
@@ -1021,7 +1043,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.0
 signing_key: 
 specification_version: 4
 summary: New version of Facter

data/lib/facter/facts/linux/cloud.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module Facts
-  module Linux
-    class Cloud
-      FACT_NAME = 'cloud'
-
-      def call_the_resolver
-        cloud_provider = Facter::Resolvers::Cloud.resolve(:cloud_provider)
-
-        Facter::ResolvedFact.new(FACT_NAME, cloud_provider)
-      end
-    end
-  end
-end

data/lib/facter/resolvers/cloud.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module Facter
-  module Resolvers
-    class Cloud < BaseResolver
-      # cloud_provider
-
-      init_resolver
-
-      class << self
-        private
-
-        def post_resolve(fact_name, _options)
-          @fact_list.fetch(fact_name) { detect_azure(fact_name) }
-        end
-
-        def detect_azure(fact_name)
-          search_dirs = %w[/var/lib/dhcp /var/lib/NetworkManager]
-          search_dirs.each do |path|
-            next if !File.readable?(path) || !File.directory?(path)
-
-            files = Dir.entries(path)
-            files.select! { |filename| filename =~ /^dhclient.*lease.*$/ }
-            files.each do |file|
-              path = File.join([path, file])
-              output = Facter::Util::FileHelper.safe_read(path)
-
-              if output.include?('option unknown-245') || output.include?('option 245')
-                @fact_list[:cloud_provider] = 'azure'
-                return @fact_list[fact_name]
-              end
-            end
-          end
-          nil
-        end
-      end
-    end
-  end
-end

data/lib/facter/resolvers/networking_linux.rb

@@ -1,296 +0,0 @@
-# frozen_string_literal: true
-
-module Facter
-  module Resolvers
-    class NetworkingLinux < BaseResolver
-      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
-
-        def post_resolve(fact_name, _options)
-          @fact_list.fetch(fact_name) { retrieve_network_info(fact_name) }
-
-          @fact_list[fact_name]
-        end
-
-        def retrieve_network_info(fact_name)
-          mtu_and_indexes = interfaces_mtu_and_index
-          retrieve_interfaces_with_socket(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 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')
-
-            parse_ip_command_line(line, mtu_and_indexes)
-          end
-          log.debug("Associated MTU and index in ip command: #{mtu_and_indexes}")
-          mtu_and_indexes
-        end
-
-        def parse_ip_command_line(line, mtu_and_indexes)
-          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: index, mtu: mtu }
-        end
-
-        def retrieve_interfaces_with_socket(mtu_and_indexes)
-          require 'socket'
-          interfaces = {}
-          Socket.getifaddrs.each do |ifaddr|
-            populate_interface_info(ifaddr, interfaces, mtu_and_indexes)
-          end
-
-          @fact_list[:interfaces] = interfaces
-        end
-
-        def populate_interface_info(ifaddr, interfaces, mtu_and_indexes)
-          interface_name = ifaddr.name
-          interfaces[interface_name] = {} if interfaces[interface_name].nil?
-          interface_data = interfaces[interface_name]
-
-          mac(ifaddr, interfaces)
-          mtu(ifaddr, interfaces, mtu_and_indexes)
-          ip, netmask, ipv4_type = ip_info_of(ifaddr)
-          add_binding(interface_data, interface_name, ip, netmask, ipv4_type)
-          dhcp(interface_name, mtu_and_indexes[interface_name], interface_data) if interface_data[:dhcp].nil?
-          log.debug("Found interface #{interface_name} with #{interface_data}")
-        end
-
-        def mac(ifaddr, interfaces)
-          return unless interfaces[ifaddr.name][:mac].nil?
-
-          mac = search_for_mac(ifaddr)
-          interfaces[ifaddr.name][:mac] = mac if mac
-        end
-
-        def search_for_mac(ifaddr)
-          mac = mac_from_bonded_interface(ifaddr.name)
-          mac ||= mac_from(ifaddr)
-          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 mac_from_bonded_interface(interface_name)
-          master = bond_master_of(interface_name)
-          return unless master
-
-          output = Facter::Util::FileHelper.safe_read("/proc/net/bonding/#{master}", nil)
-          return unless output
-
-          found_match = false
-          output.each_line do |line|
-            if line.strip == "Slave Interface: #{interface_name}"
-              found_match = true
-            elsif line.include? 'Slave Interface'
-              # if we reached the data block of another interface belonging to the bonded interface
-              found_match = false
-            end
-            return Regexp.last_match(1) if found_match && line =~ /Permanent HW addr: (\S*)/
-          end
-        end
-
-        def bond_master_of(interface_name)
-          content = Facter::Core::Execution.execute("ip link show #{interface_name}", logger: log)
-          content.match(/master (\S*) /)&.captures&.first
-        end
-
-        def mac_from(ifaddr)
-          if Socket.const_defined? :PF_LINK
-            ifaddr.addr&.getnameinfo&.first # sometimes it returns localhost or ip
-          elsif Socket.const_defined? :PF_PACKET
-            return if ifaddr.addr.nil?
-
-            search_mac_in_sockaddr(ifaddr)
-          end
-        rescue StandardError => e
-          log.debug("Could not read mac, got #{e}")
-        end
-
-        def search_mac_in_sockaddr(ifaddr)
-          result = ifaddr.addr.inspect_sockaddr
-          result&.match(/hwaddr=([\h:]+)/)&.captures&.first
-        end
-
-        def mtu(ifaddr, interfaces, mtu_and_indexes)
-          return unless interfaces[ifaddr.name][:mtu].nil?
-
-          mtu = mtu_and_indexes.dig(ifaddr.name, :mtu)
-          interfaces[ifaddr.name][:mtu] = mtu unless mtu.nil?
-        end
-
-        def ip_info_of(ifaddr)
-          return if ifaddr.addr.nil? || ifaddr.netmask.nil?
-
-          # ipv6 ips are retrieved as <ip>%<interface_name>
-          ip = ifaddr.addr.ip_address.split('%').first
-          netmask = ifaddr.netmask.ip_address
-          [ip, netmask, ifaddr.addr.ipv4?]
-        rescue StandardError => e
-          log.debug("Could not read binding data, got #{e}")
-        end
-
-        def add_binding(interface_data, interface_name, ip, netmask, ip_v4_type)
-          binding = Facter::Util::Resolvers::Networking.build_binding(ip, netmask)
-          return if binding.nil?
-
-          log.debug("Adding to interface #{interface_name}, binding:\n#{binding}")
-          binding_key = ip_v4_type == true ? :bindings : :bindings6
-          interface_data[binding_key] = [] if interface_data[binding_key].nil?
-          interface_data[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, true)
-          routes6 = parse_routes(ipv6_output, false)
-          [routes4, routes6]
-        end
-
-        def parse_routes(output, ipv4_type)
-          routes = []
-          output.each_line do |line|
-            parts = line.split(' ').compact
-            next if parts.include?('linkdown')
-
-            delete_invalid_route_type(parts)
-            next if !ipv4_type && !parts[0].include?(':')
-
-            route = construct_route(parts)
-            routes << route unless route[:ip].nil?
-          end
-          routes.uniq
-        end
-
-        def delete_invalid_route_type(parts)
-          route_type = parts[0]
-          parts.delete_at(0) if ROUTE_TYPES.include?(route_type)
-        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
-
-        def compare_ips(routes, binding_key)
-          routes.each do |route|
-            next unless @fact_list[:interfaces].key?(route[:interface])
-
-            interface_data = @fact_list[:interfaces][route[:interface]]
-            add_binding_if_missing(interface_data, binding_key, route)
-          end
-        end
-
-        def add_binding_if_missing(interface_data, binding_key, route)
-          interface_binding = interface_data[binding_key]
-
-          if interface_binding.nil?
-            interface_data[binding_key] = [{ address: route[:ip] }]
-          elsif interface_binding.none? { |binding| binding[:address] == route[:ip] }
-            interface_binding << { address: route[:ip] }
-          end
-        end
-
-        def dhcp(interface_name, index_and_mtu, interface_data)
-          log.debug("Get DHCP for interface #{interface_name}")
-
-          search_systemd_netif_leases(interface_data, index_and_mtu)
-          search_dhclient_leases(interface_data, interface_name)
-          search_internal_leases(interface_data, interface_name)
-          search_with_dhcpcd_command(interface_data, interface_name)
-        end
-
-        def search_systemd_netif_leases(interface_data, index_and_mtu)
-          return if index_and_mtu.nil?
-
-          index = index_and_mtu[:index]
-          file_content = Facter::Util::FileHelper.safe_read("/run/systemd/netif/leases/#{index}", nil)
-          dhcp = file_content.match(/SERVER_ADDRESS=(.*)/) if file_content
-          interface_data[:dhcp] = dhcp[1] if dhcp
-        end
-
-        def search_dhclient_leases(interface_data, interface_name)
-          return unless interface_data[:dhcp].nil?
-
-          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 = Facter::Util::FileHelper.safe_read("#{dir}#{file}", nil)
-              next unless content =~ /interface.*#{interface_name}/
-
-              dhcp = content.match(/dhcp-server-identifier ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/)
-              return interface_data[:dhcp] = dhcp[1] if dhcp
-            end
-          end
-        end
-
-        def search_internal_leases(interface_data, interface_name)
-          return if !interface_data[:dhcp].nil? || !File.readable?('/var/lib/NetworkManager/')
-
-          files = Dir.entries('/var/lib/NetworkManager/').reject { |dir| dir =~ /^\.+$/ }
-          lease_file = files.find { |file| file =~ /internal.*#{interface_name}\.lease/ }
-          return unless lease_file
-
-          dhcp = Facter::Util::FileHelper.safe_read("/var/lib/NetworkManager/#{lease_file}", nil)
-
-          return unless dhcp
-
-          dhcp = dhcp.match(/SERVER_ADDRESS=(.*)/)
-          interface_data[:dhcp] = dhcp[1] if dhcp
-        end
-
-        def search_with_dhcpcd_command(interface_data, interface_name)
-          return unless interface_data[:dhcp].nil?
-
-          output = Facter::Core::Execution.execute("dhcpcd -U #{interface_name}", logger: log)
-          dhcp = output.match(/dhcp_server_identifier='(.*)'/)
-          interface_data[:dhcp] = dhcp[1] if dhcp
-        end
-
-        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])
-
-          @fact_list[:primary_interface] = primary_interface
-        end
-      end
-    end
-  end
-end