facter 4.2.14 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe38d4eae3ec0102efa7f30f927e7d70b3a0140a80931f10425b262447e3f43f
-  data.tar.gz: ab672ee4ac865a36bb027692040d2f9b9fe6a8a07db0ecace87b155f7f231c98
+  metadata.gz: d3dd94ae85f9b9327eac3cbcc63794f202f4eea27d7b8c2c80b8a5b354aca94a
+  data.tar.gz: a179d9b63edb75738a22d5ed2061c0b2b4313da80dad43af2ad9eb4b1e3bee27
 SHA512:
-  metadata.gz: ab358318877365772cd5cdb39ee17ab3d88363eaf27bc44719580c11927f43be5ce5d0b4201db10bd689456039dfdfb724efe102e42aa74a9f07f179765c7fd4
-  data.tar.gz: 984bc438d40536f5aee1f54c33c21cb8cbed9d7bbc1f62fa86cd068848f6c8fc20b1271be62c5e894d97baf9e6503c4ceaf3f95d146f40c219f2f9ca4936c5f9
+  metadata.gz: 33fd39d071e0033316518b51310290694d869c7b8f3b7d006c66f20629999cbcc549df6ed58b28d46c092664ba3a89c7f5813117bf5bff50c555202e79c99476
+  data.tar.gz: c824262cd5cdcb601b203bc4675c832348dce77ca9867f008a23cb8f8677812ab858cc3f11012b80deec949515d6419876b5480d25587e2a7df52c9df1c15540

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.14' unless defined?(VERSION)
+  VERSION = '4.3.1' 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.14
+  version: 4.3.1
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-08 00:00:00.000000000 Z
+date: 2023-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -114,20 +114,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -1089,7 +1075,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'