facter 4.2.13 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deba395892bb9b2ded975e2c3a1ea31668e63a0e4229fcf77a2f711cfc1bb9ef
-  data.tar.gz: 73d37ac458df2e0d19a48000b7340bb63eb54b184a6cb564c461257e05a3a893
+  metadata.gz: dfe2a8c1919132580a093c795105a288f6ffd88b926f1b11630cfce66f931174
+  data.tar.gz: b310aa4bad3a152a6e99d329137ffc0f1373d56906ba4e7d786fd96145d54a40
 SHA512:
-  metadata.gz: acccf421fa6ed4b819120e8b8baf643188871216ade1c7484cf01ec4f19b93e397d55e3338f776de35d04120ed86dfcd6ca12318965819d023ff55fb7ad0e515
-  data.tar.gz: b31c2ea4220672766d4f4a3a3c615105395b2680fec1c60449b506b398345d4f8678dd9ef88a89ab1956ceb395bd225f9a4695cb6fe4c54d943464d3b943a01f
+  metadata.gz: 2f83dae81deed77eb2058cb82ce4fc7a226dc2934b5708af7632cc7d9fbe8c7106826517ec4e2326a02c18b4bb6ad81733c77219eff02b2da235d03eb58295ac
+  data.tar.gz: 48aa7b6bb3a2fc26268458890f2147163cc6f61bec799dd0e8c3b0c78364744f849bb3125f60967cc92761edc3e8bb57e3309cc4b3f66c03608d1ab21f334404

data/lib/facter/util/linux/socket_parser.rb

@@ -88,6 +88,7 @@ module Facter
             end
           rescue StandardError => e
             @log.debug("Could not read mac for interface #{ifaddr.name}, got #{e}")
+            nil
           end
 
           def mac_from_sockaddr_of(ifaddr)

data/lib/facter/util/resolvers/networking/networking.rb

@@ -64,8 +64,25 @@ module Facter
             bindings.empty? ? nil : bindings.first
           end
 
+          IPV4_LINK_LOCAL_ADDR = IPAddr.new('169.254.0.0/16').freeze # RFC5735
+          IPV6_LINK_LOCAL_ADDR = IPAddr.new('fe80::/10').freeze # RFC4291
+          IPV6_UNIQUE_LOCAL_ADDR = IPAddr.new('fc00::/7').freeze # RFC4193
+
           def ignored_ip_address(addr)
-            addr.empty? || addr.start_with?('127.', '169.254.') || addr.start_with?('fe80') || addr.eql?('::1')
+            return true if addr.empty?
+
+            ip = IPAddr.new(addr)
+            return true if ip.loopback?
+
+            [
+              IPV4_LINK_LOCAL_ADDR,
+              IPV6_LINK_LOCAL_ADDR,
+              IPV6_UNIQUE_LOCAL_ADDR
+            ].each do |range|
+              return true if range.include?(ip)
+            end
+
+            false
           end
 
           def calculate_mask_length(netmask)

data/lib/facter/version.rb

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

data/lib/facter.rb

@@ -18,7 +18,7 @@ module Facter
     # Method used by puppet-agent to retrieve facts
     # @param args_as_string [string] facter cli arguments
     #
-    # @return query result
+    # @return [Hash<String, Object>]
     #
     # @api private
     def resolve(args_as_string)
@@ -42,7 +42,7 @@ module Facter
       cli_options[:show_legacy] ||= false
       Facter::Options.store(cli_options)
 
-      queried_facts(cli.args)
+      Hash[queried_facts(cli.args)]
     end
 
     # Method used by cli to set puppet paths
@@ -370,7 +370,7 @@ module Facter
     # Retrieves a fact's value. Returns `nil` if no such fact exists.
     #
     # @param user_query [String] the fact name
-    # @return [String] the value of the fact, or nil if no fact is found
+    # @return [Hash<String, Object>]
     #
     # @api public
     def to_hash
@@ -410,7 +410,7 @@ module Facter
     # @api public
     def value(user_query)
       user_query = user_query.to_s.downcase
-      resolve_fact(user_query)
+      resolve_fact(user_query) unless @already_searched.include?(user_query)
 
       @already_searched[user_query]&.value
     end
@@ -427,7 +427,7 @@ module Facter
     # @api public
     def fact(user_query)
       user_query = user_query.to_s.downcase
-      resolve_fact(user_query)
+      resolve_fact(user_query) unless @already_searched.include?(user_query)
 
       @already_searched[user_query]
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.2.13
+  version: 4.3.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-06 00:00:00.000000000 Z
+date: 2023-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -1089,7 +1089,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
   - - "<"
     - !ruby/object:Gem::Version
       version: '4.0'