facter 4.2.10 → 4.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72df8d4e967960151a122eb609784efda469ec7eeffd57fcd0ccac160b8e0fcd
-  data.tar.gz: 57f7131294d62d0fa7a36d49e5f722f78aea2d9f9400720d651d896347ec8f67
+  metadata.gz: b94d35e70448fb5efde799119e0bcfe508e4097133b44939c453fcbd0f39983a
+  data.tar.gz: 6f97201f2619f853c2a66ff15cb4538b67dc3d843ff48629ca65d7b0bfc626d3
 SHA512:
-  metadata.gz: ef543fee67eeff6371587b5c16fc1cb4dfbfee9647a41bb844ca0554111de6499dab5bf16fe3a8e3025489c6ebcfd88f9ccc3ffe2b14f514897066740bb979c6
-  data.tar.gz: 33fbe62bc7d09ed9c8f564f4727a7058c94439eeeb69396be5209d28656d6b4d34577eb271c62c9f93de38b585cab805de56b8d2e7971fca28d6121c6cae9a6c
+  metadata.gz: 3ad5f88e1d7e8517c6cae2687fbf74a05ebcd2a92e54baef7276b08d6e0bee0e4af77e4f908951acf2e956d9e9ff9ced4773fff260639e2e1db3b230da75700a
+  data.tar.gz: 6a3e65102fd483807f3d67fa17eda71f7cdce61f59cc7e512c81990d9b02a29389c2c582ae3ccf187d3450918c28f9efc0a7a50c31314950f4109d3492e9c21d

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

@@ -12,6 +12,8 @@ module Facts
                        'azure' unless Facter::Resolvers::Az.resolve(:metadata).empty?
                      when 'kvm', 'xen'
                        'aws' unless Facter::Resolvers::Ec2.resolve(:metadata).empty?
+                     when 'gce'
+                       'gce' unless Facter::Resolvers::Gce.resolve(:metadata).empty?
                      end
 
           Facter::ResolvedFact.new(FACT_NAME, provider)

data/lib/facter/facts/windows/cloud/provider.rb

@@ -13,6 +13,8 @@ module Facts
                        'azure' unless Facter::Resolvers::Az.resolve(:metadata).empty?
                      when 'kvm', 'xen'
                        'aws' unless Facter::Resolvers::Ec2.resolve(:metadata).empty?
+                     when 'gce'
+                       'gce' unless Facter::Resolvers::Gce.resolve(:metadata).empty?
                      end
 
           Facter::ResolvedFact.new(FACT_NAME, provider)

data/lib/facter/resolvers/windows/ffi/ffi.rb

@@ -24,26 +24,33 @@ MAX_PATH = 32_767
 
 module FFI
   WIN32FALSE = 0
-  END_OF_WCHAR_STRING = "\0\0".encode('UTF-16LE')
+  END_OF_WCHAR_STRING = (+"\0\0").force_encoding(Encoding::UTF_16LE).freeze
 
   class Pointer
     def read_wide_string_with_length(char_length)
       # char_length is number of wide chars (typically excluding NULLs), *not* bytes
-      str = get_bytes(0, char_length * 2).force_encoding('UTF-16LE')
-      str.encode('UTF-8', str.encoding)
+      str = get_bytes(0, char_length * 2).force_encoding(Encoding::UTF_16LE)
+      str.encode(Encoding::UTF_8, str.encoding)
     end
 
-    def read_wide_string_without_length
+    def read_wide_string_without_length(replace_invalid_chars: false)
       wide_character = get_bytes(0, 2)
+      wide_character.force_encoding(Encoding::UTF_16LE)
       i = 2
       str = []
 
-      while wide_character.encode('UTF-16LE') != END_OF_WCHAR_STRING
+      while wide_character != END_OF_WCHAR_STRING
         str << wide_character
         wide_character = get_bytes(i, 2)
+        wide_character.force_encoding(Encoding::UTF_16LE)
         i += 2
       end
-      str.join.force_encoding('UTF-16LE').encode('UTF-8')
+
+      if replace_invalid_chars
+        str.join.force_encoding(Encoding::UTF_16LE).encode(Encoding::UTF_8, Encoding::UTF_16LE, invalid: :replace)
+      else
+        str.join.force_encoding(Encoding::UTF_16LE).encode(Encoding::UTF_8)
+      end
     end
 
     def read_win32_bool

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

@@ -71,12 +71,11 @@ module Facter
                 adapter_address = IpAdapterAddressesLh.new(adapter_address[:Next])
                 next
               end
-
               if !@fact_list[:domain] || @fact_list[:domain].empty?
-                @fact_list[:domain] = adapter_address[:DnsSuffix].read_wide_string_without_length
+                @fact_list[:domain] = adapter_address[:DnsSuffix]
+                                      .read_wide_string_without_length(replace_invalid_chars: true)
               end
-
-              name = adapter_address[:FriendlyName].read_wide_string_without_length
+              name = adapter_address[:FriendlyName].read_wide_string_without_length(replace_invalid_chars: true)
               net_interface[name] = build_interface_info(adapter_address, name)
             end
 

data/lib/facter/util/file_helper.rb

@@ -9,14 +9,14 @@ module Facter
         DEBUG_MESSAGE = 'File at: %s is not accessible.'
 
         def safe_read(path, default_return = '')
-          return File.read(path) if File.readable?(path)
+          return File.read(path, encoding: Encoding::UTF_8) if File.readable?(path)
 
           log_failed_to_read(path)
           default_return
         end
 
         def safe_readlines(path, default_return = [])
-          return File.readlines(path) if File.readable?(path)
+          return File.readlines(path, encoding: Encoding::UTF_8) if File.readable?(path)
 
           log_failed_to_read(path)
           default_return

data/lib/facter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 4.2.10
+  version: 4.2.11
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-24 00:00:00.000000000 Z
+date: 2022-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake