puppet 8.3.1-universal-darwin → 8.4.0-universal-darwin

data/lib/puppet/util/windows/service.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 # frozen_string_literal: true
+
 require_relative '../../../puppet/ffi/windows'
 
 module Puppet::Util::Windows
@@ -28,6 +29,7 @@ module Puppet::Util::Windows
       end
     rescue Puppet::Util::Windows::Error => e
       return false if e.code == ERROR_SERVICE_DOES_NOT_EXIST
+
       raise e
     end
     module_function :exists?
@@ -111,6 +113,7 @@ module Puppet::Util::Windows
       if state.nil?
         raise Puppet::Error.new(_("Unknown Service state '%{current_state}' for '%{service_name}'") % { current_state: state.to_s, service_name: service_name})
       end
+
       state
     end
     module_function :service_state
@@ -138,6 +141,7 @@ module Puppet::Util::Windows
       if start_type.nil?
         raise Puppet::Error.new(_("Unknown start type '%{start_type}' for '%{service_name}'") % { start_type: start_type.to_s, service_name: service_name})
       end
+
       start_type
     end
     module_function :service_start_type
@@ -253,6 +257,7 @@ module Puppet::Util::Windows
                 if success == FFI::WIN32_FALSE
                   raise Puppet::Util::Windows::Error.new(_("Failed to fetch services"))
                 end
+
                 # Now that the buffer is populated with services
                 # we pull the data from memory using pointer arithmetic:
                 # the number of services returned by the function is
@@ -301,6 +306,7 @@ module Puppet::Util::Windows
         open_scm(scm_access) do |scm|
           service = OpenServiceW(scm, wide_string(service_name), service_access)
           raise Puppet::Util::Windows::Error.new(_("Failed to open a handle to the service")) if service == FFI::Pointer::NULL_HANDLE
+
           result = yield service
         end
 
@@ -318,6 +324,7 @@ module Puppet::Util::Windows
       def open_scm(scm_access, &block)
         scm = OpenSCManagerW(FFI::Pointer::NULL, FFI::Pointer::NULL, scm_access)
         raise Puppet::Util::Windows::Error.new(_("Failed to open a handle to the service control manager")) if scm == FFI::Pointer::NULL_HANDLE
+
         yield scm
       ensure
         CloseServiceHandle(scm)
@@ -363,7 +370,7 @@ module Puppet::Util::Windows
               FINAL_STATES[pending_state] == final_state
             end
             if possible_pending_states.include?(initial_state)
-              Puppet.debug _("There is already a pending transition to the %{final_state} state for the %{service_name} service.")  % { final_state: SERVICE_STATES[final_state], service_name: service_name }
+              Puppet.debug _("There is already a pending transition to the %{final_state} state for the %{service_name} service.") % { final_state: SERVICE_STATES[final_state], service_name: service_name }
               wait_on_pending_state(service, initial_state, timeout)
 
               next
@@ -434,6 +441,7 @@ module Puppet::Util::Windows
             if success == FFI::WIN32_FALSE
               raise Puppet::Util::Windows::Error.new(_("Service query failed"))
             end
+
             yield status
           end
         end
@@ -470,6 +478,7 @@ module Puppet::Util::Windows
             if success == FFI::WIN32_FALSE
               raise Puppet::Util::Windows::Error.new(_("Service query failed"))
             end
+
             yield config
           end
         end
@@ -513,6 +522,7 @@ module Puppet::Util::Windows
             if success == FFI::WIN32_FALSE
               raise Puppet::Util::Windows::Error.new(_("Service query for %{parameter_name} failed") % { parameter_name: SERVICE_CONFIG_TYPES[info_level] } )
             end
+
             yield config
           end
         end
@@ -595,6 +605,7 @@ module Puppet::Util::Windows
           query_status(service) do |status|
             state = status[:dwCurrentState]
             return if state == final_state
+
             if state == pending_state
               Puppet.debug _("The service transitioned to the %{pending_state} state.") % { pending_state: SERVICE_STATES[pending_state] }
               wait_on_pending_state(service, pending_state, timeout)

data/lib/puppet/util/windows/sid.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/util/windows'
 
 module Puppet::Util::Windows
@@ -117,6 +118,7 @@ module Puppet::Util::Windows
         !ads_object.ole_respond_to?(:objectSID) || !ads_object.ole_respond_to?(:Name)
         raise Puppet::Error.new("ads_object must be an IAdsUser or IAdsGroup instance")
       end
+
       octet_string_to_principal(ads_object.objectSID)
     rescue Puppet::Util::Windows::Error => e
       # if the error is not a lookup / mapping problem, immediately re-raise
@@ -137,7 +139,6 @@ module Puppet::Util::Windows
     # e.g. 'BUILTIN\Administrators'. Returns nil if an account
     # for that SID does not exist.
     def sid_to_name(value)
-
       sid_bytes = []
       begin
         string_to_sid_ptr(value) do |ptr|
@@ -188,7 +189,6 @@ module Puppet::Util::Windows
     def string_to_sid_ptr(string_sid, &block)
       FFI::MemoryPointer.from_string_to_wide_string(string_sid) do |lpcwstr|
         FFI::MemoryPointer.new(:pointer, 1) do |sid_ptr_ptr|
-
           if ConvertStringSidToSidW(lpcwstr, sid_ptr_ptr) == FFI::WIN32_FALSE
             raise Puppet::Util::Windows::Error.new(_("Failed to convert string SID: %{string_sid}") % { string_sid: string_sid })
           end
@@ -246,7 +246,7 @@ module Puppet::Util::Windows
         name, # account
         sid_bytes, # sid_bytes
         name, # sid string
-        nil, #domain
+        nil, # domain
         # https://msdn.microsoft.com/en-us/library/cc245534.aspx?f=255&MSPPError=-2147217396
         # Indicates that the type of object could not be determined. For example, no object with that SID exists.
         :SidTypeUnknown)
@@ -260,7 +260,7 @@ module Puppet::Util::Windows
     # );
     ffi_lib :advapi32
     attach_function_private :IsValidSid,
-      [:pointer], :win32_bool
+                            [:pointer], :win32_bool
 
     # https://msdn.microsoft.com/en-us/library/windows/desktop/aa376399(v=vs.85).aspx
     # BOOL ConvertSidToStringSid(
@@ -269,7 +269,7 @@ module Puppet::Util::Windows
     # );
     ffi_lib :advapi32
     attach_function_private :ConvertSidToStringSidW,
-      [:pointer, :pointer], :win32_bool
+                            [:pointer, :pointer], :win32_bool
 
     # https://msdn.microsoft.com/en-us/library/windows/desktop/aa376402(v=vs.85).aspx
     # BOOL WINAPI ConvertStringSidToSid(
@@ -278,7 +278,7 @@ module Puppet::Util::Windows
     # );
     ffi_lib :advapi32
     attach_function_private :ConvertStringSidToSidW,
-      [:lpcwstr, :pointer], :win32_bool
+                            [:lpcwstr, :pointer], :win32_bool
 
     # https://msdn.microsoft.com/en-us/library/windows/desktop/aa446642(v=vs.85).aspx
     # DWORD WINAPI GetLengthSid(

data/lib/puppet/util/windows/string.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet
   module Util
     module Windows

data/lib/puppet/util/windows/user.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../../puppet/util/windows'
 
 require 'ffi'
@@ -77,7 +78,6 @@ module Puppet::Util::Windows::User
     begin
       logon_user(name, password, domain) { |token| }
     rescue Puppet::Util::Windows::Error => detail
-
       authenticated_error_codes = Set[
         ERROR_ACCOUNT_RESTRICTION,
         ERROR_INVALID_LOGON_HOURS,
@@ -98,7 +98,7 @@ module Puppet::Util::Windows::User
     token = nil
     begin
       FFI::MemoryPointer.new(:handle, 1) do |token_pointer|
-        #try logon using network else try logon using interactive mode
+        # try logon using network else try logon using interactive mode
         if logon_user_by_logon_type(name, domain, password, fLOGON32_LOGON_NETWORK, fLOGON32_PROVIDER_DEFAULT, token_pointer) == FFI::WIN32_FALSE
           if logon_user_by_logon_type(name, domain, password, fLOGON32_LOGON_INTERACTIVE, fLOGON32_PROVIDER_DEFAULT, token_pointer) == FFI::WIN32_FALSE
             raise Puppet::Util::Windows::Error.new(_("Failed to logon user %{name}") % {name: name.inspect})
@@ -248,17 +248,17 @@ module Puppet::Util::Windows::User
     error_code = LsaNtStatusToWinError(status)
 
     error_reason = case error_code.to_s(16)
-    when '0' # ERROR_SUCCESS
-      return # Method call succeded
-    when '2' # ERROR_FILE_NOT_FOUND
-      return # No rights/privilleges assigned to given user
-    when '5' # ERROR_ACCESS_DENIED
-      "Access is denied. Please make sure that puppet is running as administrator."
-    when '521' # ERROR_NO_SUCH_PRIVILEGE
-      "One or more of the given rights/privilleges are incorrect."
-    when '6ba' # RPC_S_SERVER_UNAVAILABLE
-      "The RPC server is unavailable or given domain name is invalid."
-    end
+                   when '0' # ERROR_SUCCESS
+                     return # Method call succeded
+                   when '2' # ERROR_FILE_NOT_FOUND
+                     return # No rights/privilleges assigned to given user
+                   when '5' # ERROR_ACCESS_DENIED
+                     "Access is denied. Please make sure that puppet is running as administrator."
+                   when '521' # ERROR_NO_SUCH_PRIVILEGE
+                     "One or more of the given rights/privilleges are incorrect."
+                   when '6ba' # RPC_S_SERVER_UNAVAILABLE
+                     "The RPC server is unavailable or given domain name is invalid."
+                   end
 
     raise Puppet::Error.new("Calling `#{method_name}` returned 'Win32 Error Code 0x%08X'. #{error_reason}" % error_code)
   end
@@ -277,7 +277,7 @@ module Puppet::Util::Windows::User
   # );
   ffi_lib :advapi32
   attach_function_private :LogonUserW,
-    [:lpwstr, :lpwstr, :lpwstr, :dword, :dword, :phandle], :win32_bool
+                          [:lpwstr, :lpwstr, :lpwstr, :dword, :dword, :phandle], :win32_bool
 
   # https://msdn.microsoft.com/en-us/library/windows/desktop/bb773378(v=vs.85).aspx
   # typedef struct _PROFILEINFO {
@@ -310,7 +310,7 @@ module Puppet::Util::Windows::User
   # );
   ffi_lib :userenv
   attach_function_private :LoadUserProfileW,
-    [:handle, :pointer], :win32_bool
+                          [:handle, :pointer], :win32_bool
 
   # https://msdn.microsoft.com/en-us/library/windows/desktop/bb762282(v=vs.85).aspx
   # BOOL WINAPI UnloadUserProfile(
@@ -319,7 +319,7 @@ module Puppet::Util::Windows::User
   # );
   ffi_lib :userenv
   attach_function_private :UnloadUserProfile,
-    [:handle, :handle], :win32_bool
+                          [:handle, :handle], :win32_bool
 
   # https://msdn.microsoft.com/en-us/library/windows/desktop/aa376389(v=vs.85).aspx
   # BOOL WINAPI CheckTokenMembership(
@@ -329,7 +329,7 @@ module Puppet::Util::Windows::User
   # );
   ffi_lib :advapi32
   attach_function_private :CheckTokenMembership,
-    [:handle, :pointer, :pbool], :win32_bool
+                          [:handle, :pointer, :pbool], :win32_bool
 
   # https://msdn.microsoft.com/en-us/library/windows/desktop/aa379650(v=vs.85).aspx
   WELL_KNOWN_SID_TYPE = enum(
@@ -439,7 +439,7 @@ module Puppet::Util::Windows::User
   # );
   ffi_lib :advapi32
   attach_function_private :CreateWellKnownSid,
-    [WELL_KNOWN_SID_TYPE, :pointer, :pointer, :lpdword], :win32_bool
+                          [WELL_KNOWN_SID_TYPE, :pointer, :pointer, :lpdword], :win32_bool
 
   # https://msdn.microsoft.com/en-us/library/windows/desktop/aa379151(v=vs.85).aspx
   # BOOL WINAPI IsValidSid(
@@ -447,7 +447,7 @@ module Puppet::Util::Windows::User
   # );
   ffi_lib :advapi32
   attach_function_private :IsValidSid,
-    [:pointer], :win32_bool
+                          [:pointer], :win32_bool
 
   # https://docs.microsoft.com/en-us/windows/win32/api/lsalookup/ns-lsalookup-lsa_object_attributes
   # typedef struct _LSA_OBJECT_ATTRIBUTES {
@@ -460,11 +460,11 @@ module Puppet::Util::Windows::User
   # } LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES;
   class LSA_OBJECT_ATTRIBUTES < FFI::Struct
     layout :Length, :ulong,
-      :RootDirectory, :handle,
-      :ObjectName, :plsa_unicode_string,
-      :Attributes, :ulong,
-      :SecurityDescriptor, :pvoid,
-      :SecurityQualityOfService, :pvoid
+           :RootDirectory, :handle,
+           :ObjectName, :plsa_unicode_string,
+           :Attributes, :ulong,
+           :SecurityDescriptor, :pvoid,
+           :SecurityQualityOfService, :pvoid
   end
 
   # https://docs.microsoft.com/en-us/windows/win32/api/lsalookup/ns-lsalookup-lsa_unicode_string
@@ -475,8 +475,8 @@ module Puppet::Util::Windows::User
   # } LSA_UNICODE_STRING, *PLSA_UNICODE_STRING;
   class LSA_UNICODE_STRING < FFI::Struct
     layout :Length, :ushort,
-      :MaximumLength, :ushort,
-      :Buffer, :pwstr
+           :MaximumLength, :ushort,
+           :Buffer, :pwstr
   end
 
   # https://docs.microsoft.com/en-us/windows/win32/api/ntsecapi/nf-ntsecapi-lsaenumerateaccountrights
@@ -489,7 +489,7 @@ module Puppet::Util::Windows::User
   # );
   ffi_lib :advapi32
   attach_function_private :LsaEnumerateAccountRights,
-    [:lsa_handle, :psid, :plsa_unicode_string, :pulong], :ntstatus
+                          [:lsa_handle, :psid, :plsa_unicode_string, :pulong], :ntstatus
 
   # https://docs.microsoft.com/en-us/windows/win32/api/ntsecapi/nf-ntsecapi-lsaaddaccountrights
   # NTSTATUS LsaAddAccountRights(
@@ -500,7 +500,7 @@ module Puppet::Util::Windows::User
   # );
   ffi_lib :advapi32
   attach_function_private :LsaAddAccountRights,
-    [:lsa_handle, :psid, :plsa_unicode_string, :ulong], :ntstatus
+                          [:lsa_handle, :psid, :plsa_unicode_string, :ulong], :ntstatus
 
   # https://docs.microsoft.com/en-us/windows/win32/api/ntsecapi/nf-ntsecapi-lsaremoveaccountrights
   # NTSTATUS LsaRemoveAccountRights(
@@ -512,7 +512,7 @@ module Puppet::Util::Windows::User
   # );
   ffi_lib :advapi32
   attach_function_private :LsaRemoveAccountRights,
-    [:lsa_handle, :psid, :bool, :plsa_unicode_string, :ulong], :ntstatus
+                          [:lsa_handle, :psid, :bool, :plsa_unicode_string, :ulong], :ntstatus
 
   # https://docs.microsoft.com/en-us/windows/win32/api/ntsecapi/nf-ntsecapi-lsaopenpolicy
   # NTSTATUS LsaOpenPolicy(
@@ -523,7 +523,7 @@ module Puppet::Util::Windows::User
   # );
   ffi_lib :advapi32
   attach_function_private :LsaOpenPolicy,
-    [:plsa_unicode_string, :plsa_object_attributes, :access_mask, :plsa_handle], :ntstatus
+                          [:plsa_unicode_string, :plsa_object_attributes, :access_mask, :plsa_handle], :ntstatus
 
   # https://docs.microsoft.com/en-us/windows/win32/api/ntsecapi/nf-ntsecapi-lsaclose
   # NTSTATUS LsaClose(
@@ -531,7 +531,7 @@ module Puppet::Util::Windows::User
   # );
   ffi_lib :advapi32
   attach_function_private :LsaClose,
-    [:lsa_handle], :ntstatus
+                          [:lsa_handle], :ntstatus
 
   # https://docs.microsoft.com/en-us/windows/win32/api/ntsecapi/nf-ntsecapi-lsafreememory
   # NTSTATUS LsaFreeMemory(
@@ -539,7 +539,7 @@ module Puppet::Util::Windows::User
   # );
   ffi_lib :advapi32
   attach_function_private :LsaFreeMemory,
-    [:pvoid], :ntstatus
+                          [:pvoid], :ntstatus
 
   # https://docs.microsoft.com/en-us/windows/win32/api/ntsecapi/nf-ntsecapi-lsantstatustowinerror
   # ULONG LsaNtStatusToWinError(
@@ -547,5 +547,5 @@ module Puppet::Util::Windows::User
   # );
   ffi_lib :advapi32
   attach_function_private :LsaNtStatusToWinError,
-    [:ntstatus], :ulong
+                          [:ntstatus], :ulong
 end

data/lib/puppet/util/windows.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/util/platform'
 
 module Puppet::Util::Windows
@@ -8,15 +9,20 @@ module Puppet::Util::Windows
     class UserProfile; end
     class Group < ADSIObject; end
   end
+
   module File; end
+
   module Registry
   end
+
   module Service
     DEFAULT_TIMEOUT = 30
   end
+
   module SID
     class Principal; end
   end
+
   class EventLog; end
 
   if Puppet::Util::Platform.windows?

data/lib/puppet/util/yaml.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'yaml'
 
 module Puppet::Util::Yaml

data/lib/puppet/util.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # A module to collect utility functions.
 
 require 'English'
@@ -102,7 +103,6 @@ module Util
     end
   end
 
-
   # Change the process to a different user
   def self.chuser
     group = Puppet[:group]
@@ -115,7 +115,7 @@ module Util
 
         # Don't exit on failed group changes, since it's
         # not fatal
-        #exit(74)
+        # exit(74)
       end
     end
 
@@ -177,7 +177,7 @@ module Util
                args.pop
              end
 
-    #TRANSLATORS 'benchmark' is a method name and should not be translated
+    # TRANSLATORS 'benchmark' is a method name and should not be translated
     raise Puppet::DevError, _("Failed to provide level to benchmark") unless level
 
     unless level == :none or object.respond_to? level
@@ -220,11 +220,11 @@ module Util
           if e.to_s =~ /HOME/ and (ENV['HOME'].nil? || ENV['HOME'] == "")
             # if we get here they have a tilde in their PATH.  We'll issue a single warning about this and then
             # ignore this path element and carry on with our lives.
-            #TRANSLATORS PATH and HOME are environment variables and should not be translated
+            # TRANSLATORS PATH and HOME are environment variables and should not be translated
             Puppet::Util::Warnings.warnonce(_("PATH contains a ~ character, and HOME is not set; ignoring PATH element '%{dir}'.") % { dir: dir })
           elsif e.to_s =~ /doesn't exist|can't find user/
             # ...otherwise, we just skip the non-existent entry, and do nothing.
-            #TRANSLATORS PATH is an environment variable and should not be translated
+            # TRANSLATORS PATH is an environment variable and should not be translated
             Puppet::Util::Warnings.warnonce(_("Couldn't expand PATH containing a ~ character; ignoring PATH element '%{dir}'.") % { dir: dir })
           else
             raise
@@ -332,7 +332,7 @@ module Util
   end
   module_function :uri_to_path
 
-  RFC_3986_URI_REGEX = /^(?<scheme>([^:\/?#]+):)?(?<authority>\/\/([^\/?#]*))?(?<path>[^?#]*)(\?(?<query>[^#]*))?(#(?<fragment>.*))?$/
+  RFC_3986_URI_REGEX = /^(?<scheme>(?:[^:\/?#]+):)?(?<authority>\/\/(?:[^\/?#]*))?(?<path>[^?#]*)(?:\?(?<query>[^#]*))?(?:#(?<fragment>.*))?$/
 
   # Percent-encodes a URI query parameter per RFC3986 - https://tools.ietf.org/html/rfc3986
   #
@@ -609,19 +609,18 @@ module Util
         tempfile = Puppet::FileSystem::Uniquefile.new(Puppet::FileSystem.basename_string(file), Puppet::FileSystem.dir_string(file))
       end
 
-
       effective_mode =
-      if !Puppet::Util::Platform.windows?
-        # Grab the current file mode, and fall back to the defaults.
+        if !Puppet::Util::Platform.windows?
+          # Grab the current file mode, and fall back to the defaults.
 
-        if Puppet::FileSystem.exist?(file)
-          stat = Puppet::FileSystem.lstat(file)
-          tempfile.chown(stat.uid, stat.gid)
-          stat.mode
-        else
-          mode
+          if Puppet::FileSystem.exist?(file)
+            stat = Puppet::FileSystem.lstat(file)
+            tempfile.chown(stat.uid, stat.gid)
+            stat.mode
+          else
+            mode
+          end
         end
-      end
 
       # OK, now allow the caller to write the content of the file.
       yield tempfile
@@ -670,6 +669,7 @@ module Util
         if Puppet::FileSystem.exist?(file) && Puppet::FileSystem.directory?(file)
           raise Errno::EISDIR, _("Is a directory: %{directory}") % { directory: file }
         end
+
         File.rename(tempfile.path, Puppet::FileSystem.path_string(file))
       end
     ensure
@@ -680,7 +680,6 @@ module Util
       end
     end
 
-
     # Ideally, we would now fsync the directory as well, but Ruby doesn't
     # have support for that, and it doesn't matter /that/ much...
 
@@ -707,8 +706,8 @@ module Util
   #  code (e.g. webrick), and we have no idea what they might throw.
   rescue Exception => err
     ## NOTE: when debugging spec failures, these two lines can be very useful
-    #puts err.inspect
-    #puts Puppet::Util.pretty_backtrace(err.backtrace)
+    # puts err.inspect
+    # puts Puppet::Util.pretty_backtrace(err.backtrace)
     Puppet.log_exception(err, "#{message}: #{err}")
     Puppet::Util::Log.force_flushqueue()
     exit(code)
@@ -741,7 +740,6 @@ module Util
 end
 end
 
-
 require_relative 'util/errors'
 require_relative 'util/metaid'
 require_relative 'util/classgen'

data/lib/puppet/vendor.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet
   # Simple module to manage vendored code.
   #
@@ -32,7 +33,7 @@ module Puppet
 
       # @api private
       def load_entry(entry)
-        Puppet.debug("Loading vendored #{$1}")
+        Puppet.debug("Loading vendored #{entry}")
         load "#{vendor_dir}/#{entry}"
       end
 

data/lib/puppet/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # The version method and constant are isolated in puppet/version.rb so that a
 # simple `require 'puppet/version'` allows a rubygems gemspec or bundler
 # Gemfile to get the Puppet version of the gem install.
@@ -7,7 +8,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 
 module Puppet
-  PUPPETVERSION = '8.3.1'
+  PUPPETVERSION = '8.4.0'
 
   ##
   # version is a public API method intended to always provide a fast and
@@ -62,6 +63,7 @@ module Puppet
   def self.version
     version_file = File.join(File.dirname(__FILE__), 'VERSION')
     return @puppet_version if @puppet_version
+
     @puppet_version = read_version_file(version_file) || PUPPETVERSION
   end
 

data/lib/puppet/x509/cert_provider.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/x509'
 
 # Class for loading and saving cert related objects. By default the provider
@@ -58,6 +59,7 @@ class Puppet::X509::CertProvider
     if !pem && required
       raise Puppet::Error, _("The CA certificates are missing from '%{path}'") % { path: @capath }
     end
+
     pem ? load_cacerts_from_pem(pem) : nil
   rescue SystemCallError => e
     raise Puppet::Error.new(_("Failed to load CA certificates from '%{capath}'") % {capath: @capath}, e)
@@ -104,6 +106,7 @@ class Puppet::X509::CertProvider
     if !pem && required
       raise Puppet::Error, _("The CRL is missing from '%{path}'") % { path: @crlpath }
     end
+
     pem ? load_crls_from_pem(pem) : nil
   rescue SystemCallError => e
     raise Puppet::Error.new(_("Failed to load CRLs from '%{crlpath}'") % {crlpath: @crlpath}, e)
@@ -182,7 +185,7 @@ class Puppet::X509::CertProvider
   # @api private
   def save_private_key(name, key, password: nil)
     pem = if password
-            cipher = OpenSSL::Cipher::AES.new(128, :CBC)
+            cipher = OpenSSL::Cipher.new('aes-128-cbc')
             key.export(cipher, password)
           else
             key.to_pem
@@ -212,6 +215,7 @@ class Puppet::X509::CertProvider
     if !pem && required
       raise Puppet::Error, _("The private key is missing from '%{path}'") % { path: path }
     end
+
     pem ? load_private_key_from_pem(pem, password: password) : nil
   rescue SystemCallError => e
     raise Puppet::Error.new(_("Failed to load private key for '%{name}'") % {name: name}, e)
@@ -275,6 +279,7 @@ class Puppet::X509::CertProvider
     if !pem && required
       raise Puppet::Error, _("The client certificate is missing from '%{path}'") % { path: path }
     end
+
     pem ? load_client_cert_from_pem(pem) : nil
   rescue SystemCallError => e
     raise Puppet::Error.new(_("Failed to load client certificate for '%{name}'") % {name: name}, e)
@@ -382,6 +387,7 @@ class Puppet::X509::CertProvider
   # @param name [String] the name associated with the cert related object
   def to_path(base, name)
     raise _("Certname %{name} must not contain unprintable or non-ASCII characters") % { name: name.inspect } unless name =~ VALID_CERTNAME
+
     File.join(base, "#{name.downcase}.pem")
   end
 

data/lib/puppet/x509/pem_store.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/x509'
 
 # Methods for managing PEM encoded files. While PEM encoded strings are

data/lib/puppet/x509.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../puppet'
 require_relative '../puppet/ssl/openssl_loader'
 

data/lib/puppet.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative 'puppet/version'
 require_relative 'puppet/concurrent/synchronized'
 

data/lib/puppet_pal.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Puppet as a Library "PAL"
 # This is the entry point when using PAL as a standalone library.
 #

data/lib/puppet_x.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # The Puppet Extensions Module.
 #
 # Submodules of this module should be named after the publisher (e.g.