puppet 7.6.1 → 7.7.0

data/lib/puppet/type/tidy.rb

@@ -1,8 +1,8 @@
-require 'puppet/parameter/boolean'
+require_relative '../../puppet/parameter/boolean'
 
 Puppet::Type.newtype(:tidy) do
-  require 'puppet/file_serving/fileset'
-  require 'puppet/file_bucket/dipper'
+  require_relative '../../puppet/file_serving/fileset'
+  require_relative '../../puppet/file_bucket/dipper'
 
   @doc = "Remove unwanted files based on specific criteria.  Multiple
     criteria are OR'd together, so a file that is too large but is not
@@ -50,6 +50,22 @@ Puppet::Type.newtype(:tidy) do
     end
   end
 
+  newparam(:max_files) do
+    desc "In case the resource is a directory and the recursion is enabled, puppet will
+      generate a new resource for each file file found, possible leading to
+      an excessive number of resources generated without any control.
+
+      Setting `max_files` will check the number of file resources that
+      will eventually be created and will raise a resource argument error if the
+      limit will be exceeded.
+
+      Use value `0` to disable the check. In this case, a warning is logged if
+      the number of files exceeds 1000."
+
+    defaultto 0
+    newvalues(/^[0-9]+$/)
+  end
+
   newparam(:matches) do
     desc <<-'EOT'
       One or more (shell type) file glob patterns, which restrict
@@ -256,9 +272,12 @@ Puppet::Type.newtype(:tidy) do
 
     case self[:recurse]
     when Integer, /^\d+$/
-      parameter = { :recurse => true, :recurselimit => self[:recurse] }
+      parameter = { :max_files => self[:max_files],
+                    :recurse => true,
+                    :recurselimit => self[:recurse] }
     when true, :true, :inf
-      parameter = { :recurse => true }
+      parameter = { :max_files => self[:max_files],
+                    :recurse => true }
     end
 
     if parameter

data/lib/puppet/type/user.rb

@@ -1,9 +1,9 @@
 require 'etc'
 require 'facter'
-require 'puppet/parameter/boolean'
-require 'puppet/property/list'
-require 'puppet/property/ordered_list'
-require 'puppet/property/keyvalue'
+require_relative '../../puppet/parameter/boolean'
+require_relative '../../puppet/property/list'
+require_relative '../../puppet/property/ordered_list'
+require_relative '../../puppet/property/keyvalue'
 
 module Puppet
   Type.newtype(:user) do

data/lib/puppet/util.rb

@@ -1,28 +1,28 @@
 # A module to collect utility functions.
 
 require 'English'
-require 'puppet/error'
-require 'puppet/util/execution_stub'
+require_relative '../puppet/error'
+require_relative 'util/execution_stub'
 require 'uri'
 require 'pathname'
 require 'ostruct'
-require 'puppet/util/platform'
-require 'puppet/util/symbolic_file_mode'
-require 'puppet/file_system/uniquefile'
+require_relative 'util/platform'
+require_relative 'util/symbolic_file_mode'
+require_relative '../puppet/file_system/uniquefile'
 require 'securerandom'
-require 'puppet/util/character_encoding'
+require_relative 'util/character_encoding'
 
 module Puppet
 module Util
-  require 'puppet/util/monkey_patches'
+  require_relative 'util/monkey_patches'
   require 'benchmark'
 
   # These are all for backward compatibility -- these are methods that used
   # to be in Puppet::Util but have been moved into external modules.
-  require 'puppet/util/posix'
+  require_relative 'util/posix'
   extend Puppet::Util::POSIX
 
-  require 'puppet/util/windows/process' if Puppet::Util::Platform.windows?
+  require_relative 'util/windows/process' if Puppet::Util::Platform.windows?
 
   extend Puppet::Util::SymbolicFileMode
 
@@ -466,17 +466,7 @@ module Util
     # URI::parse and URI::Generic.build don't like paths encoded with CGI.escape
     # URI.escape does not change / to %2F and : to %3A like CGI.escape
     #
-    # URI.escape is obsolete in Ruby 2.7. Ignore this error until we're able to
-    # switch to a different escape mechanism. If this is JRuby, we can't mask
-    # the error message, because this isn't thread safe. JRuby shouldn't be
-    # using Ruby 2.7 or raising the warning anyway.
-    orig_verbose = $VERBOSE
-    $VERBOSE = nil unless Puppet::Util::Platform.jruby?
-    begin
-      encoded += URI.escape(parts[:path]) unless parts[:path].nil?
-    ensure
-      $VERBOSE = orig_verbose unless Puppet::Util::Platform.jruby?
-    end
+    encoded += rfc2396_escape(parts[:path]) unless parts[:path].nil?
 
     # each query parameter
     if !parts[:query].nil?
@@ -495,12 +485,31 @@ module Util
   end
   module_function :uri_encode
 
-  def uri_unescape(path)
-    orig_verbose = $VERBOSE
-    $VERBOSE = nil unless Puppet::Util::Platform.jruby?
-    return URI.unescape(path)
-  ensure
-    $VERBOSE = orig_verbose unless Puppet::Util::Platform.jruby?
+  # From https://github.com/ruby/ruby/blob/v2_7_3/lib/uri/rfc2396_parser.rb#L24-L46
+  ALPHA = "a-zA-Z".freeze
+  ALNUM = "#{ALPHA}\\d".freeze
+  UNRESERVED = "\\-_.!~*'()#{ALNUM}".freeze
+  RESERVED = ";/?:@&=+$,\\[\\]".freeze
+  UNSAFE = Regexp.new("[^#{UNRESERVED}#{RESERVED}]").freeze
+
+  HEX = "a-fA-F\\d".freeze
+  ESCAPED = Regexp.new("%[#{HEX}]{2}").freeze
+
+  def rfc2396_escape(str)
+    str.gsub(UNSAFE) do |match|
+      tmp = ''
+      match.each_byte do |uc|
+        tmp << sprintf('%%%02X', uc)
+      end
+      tmp
+    end.force_encoding(Encoding::US_ASCII)
+  end
+  module_function :rfc2396_escape
+
+  def uri_unescape(str)
+    enc = str.encoding
+    enc = Encoding::UTF_8 if enc == Encoding::US_ASCII
+    str.gsub(ESCAPED) { [$&[1, 2]].pack('H2').force_encoding(enc) }
   end
   module_function :uri_unescape
 
@@ -776,11 +785,11 @@ end
 end
 
 
-require 'puppet/util/errors'
-require 'puppet/util/metaid'
-require 'puppet/util/classgen'
-require 'puppet/util/docs'
-require 'puppet/util/execution'
-require 'puppet/util/logging'
-require 'puppet/util/package'
-require 'puppet/util/warnings'
+require_relative 'util/errors'
+require_relative 'util/metaid'
+require_relative 'util/classgen'
+require_relative 'util/docs'
+require_relative 'util/execution'
+require_relative 'util/logging'
+require_relative 'util/package'
+require_relative 'util/warnings'

data/lib/puppet/util/at_fork.rb

@@ -1,4 +1,4 @@
-require 'puppet'
+require_relative '../../puppet'
 
 # A module for building AtFork handlers. These handlers are objects providing
 # pre/post fork callbacks modeled after those registered by the `pthread_atfork`
@@ -15,7 +15,7 @@ module Puppet::Util::AtFork
   @handler_class = loop do
     if Puppet::Util::Platform.solaris?
       begin
-        require 'puppet/util/at_fork/solaris'
+        require_relative 'at_fork/solaris'
         # using break to return a value from the loop block
         break Puppet::Util::AtFork::Solaris
       rescue LoadError => detail
@@ -24,7 +24,7 @@ module Puppet::Util::AtFork
       end
     end
 
-    require 'puppet/util/at_fork/noop'
+    require_relative 'at_fork/noop'
     # using break to return a value from the loop block
     break Puppet::Util::AtFork::Noop
   end

data/lib/puppet/util/at_fork/solaris.rb

@@ -1,4 +1,4 @@
-require 'puppet'
+require_relative '../../../puppet'
 require 'fiddle'
 
 # Early versions of Fiddle relied on the deprecated DL module and used

data/lib/puppet/util/autoload.rb

@@ -1,8 +1,8 @@
 require 'pathname'
-require 'puppet/util/rubygems'
-require 'puppet/util/warnings'
-require 'puppet/pops/adaptable'
-require 'puppet/concurrent/synchronized'
+require_relative '../../puppet/util/rubygems'
+require_relative '../../puppet/util/warnings'
+require_relative '../../puppet/pops/adaptable'
+require_relative '../../puppet/concurrent/synchronized'
 
 # An adapter that ties the module_directories cache to the environment where the modules are parsed. This
 # adapter ensures that the life-cycle of this cache doesn't exceed  the life-cycle of the environment.

data/lib/puppet/util/checksums.rb

@@ -154,7 +154,7 @@ module Puppet::Util::Checksums
 
   # Calculate a checksum using Digest::SHA224.
   def sha224(content)
-    require 'puppet/ssl/openssl_loader'
+    require_relative '../../puppet/ssl/openssl_loader'
     OpenSSL::Digest::SHA224.new.hexdigest(content)
   end
 
@@ -163,14 +163,14 @@ module Puppet::Util::Checksums
   end
 
   def sha224_file(filename, lite = false)
-    require 'puppet/ssl/openssl_loader'
+    require_relative '../../puppet/ssl/openssl_loader'
 
     digest = OpenSSL::Digest::SHA224.new
     checksum_file(digest, filename,  lite)
   end
 
   def sha224_stream(lite = false, &block)
-    require 'puppet/ssl/openssl_loader'
+    require_relative '../../puppet/ssl/openssl_loader'
     digest = OpenSSL::Digest::SHA224.new
     checksum_stream(digest, block, lite)
   end

data/lib/puppet/util/colors.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/platform'
+require_relative '../../puppet/util/platform'
 
 module Puppet::Util::Colors
   BLACK       = {:console => "\e[0;30m", :html => "color: #FFA0A0"     }

data/lib/puppet/util/command_line.rb

@@ -9,12 +9,12 @@ if not defined? ::Bundler
   end
 end
 
-require 'puppet'
-require 'puppet/util'
-require "puppet/util/rubygems"
-require "puppet/util/limits"
-require 'puppet/util/colors'
-require 'puppet/gettext/module_translations'
+require_relative '../../puppet'
+require_relative '../../puppet/util'
+require_relative '../../puppet/util/rubygems'
+require_relative '../../puppet/util/limits'
+require_relative '../../puppet/util/colors'
+require_relative '../../puppet/gettext/module_translations'
 
 module Puppet
   module Util

data/lib/puppet/util/command_line/puppet_option_parser.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/command_line/trollop'
+require_relative '../../../puppet/util/command_line/trollop'
 
 module Puppet
   module Util
@@ -16,7 +16,7 @@ module Puppet
 
       class PuppetOptionParser
         def initialize(usage_msg = nil)
-          require "puppet/util/command_line/trollop"
+          require_relative '../../../puppet/util/command_line/trollop'
 
           @create_default_short_options = false
 

data/lib/puppet/util/execution.rb

@@ -1,10 +1,10 @@
 require 'timeout'
-require 'puppet/file_system/uniquefile'
+require_relative '../../puppet/file_system/uniquefile'
 
 module Puppet
   require 'rbconfig'
 
-  require 'puppet/error'
+  require_relative '../../puppet/error'
   # A command failed to execute.
   # @api public
   class ExecutionFailure < Puppet::Error

data/lib/puppet/util/feature.rb

@@ -1,5 +1,5 @@
-require 'puppet'
-require 'puppet/util/warnings'
+require_relative '../../puppet'
+require_relative '../../puppet/util/warnings'
 
 class Puppet::Util::Feature
   include Puppet::Util::Warnings

data/lib/puppet/util/filetype.rb

@@ -1,7 +1,7 @@
 # Basic classes for reading, writing, and emptying files.  Not much
 # to see here.
 
-require 'puppet/util/selinux'
+require_relative '../../puppet/util/selinux'
 require 'tempfile'
 require 'fileutils'
 

data/lib/puppet/util/http_proxy.rb

@@ -1,4 +1,4 @@
-require 'puppet/http'
+require_relative '../../puppet/http'
 
 # for backwards compatibility
 Puppet::Util::HttpProxy = Puppet::HTTP::Proxy

data/lib/puppet/util/inifile.rb

@@ -8,8 +8,8 @@
 #
 # The parsing tries to stay close to python's ConfigParser
 
-require 'puppet/util/filetype'
-require 'puppet/error'
+require_relative '../../puppet/util/filetype'
+require_relative '../../puppet/error'
 
 module Puppet::Util::IniConfig
   # A section in a .ini file

data/lib/puppet/util/instance_loader.rb

@@ -1,6 +1,6 @@
-require 'puppet/util/autoload'
-require 'puppet/util'
-require 'puppet/concurrent/lock'
+require_relative '../../puppet/util/autoload'
+require_relative '../../puppet/util'
+require_relative '../../puppet/concurrent/lock'
 
 # A module that can easily autoload things for us.  Uses an instance
 # of Puppet::Util::Autoload

data/lib/puppet/util/json_lockfile.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/lockfile'
+require_relative '../../puppet/util/lockfile'
 
 # This class provides a simple API for managing a lock file
 # whose contents are a serialized JSON object.  In addition

data/lib/puppet/util/ldap/connection.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/ldap'
+require_relative '../../../puppet/util/ldap'
 
 class Puppet::Util::Ldap::Connection
   attr_accessor :host, :port, :user, :password, :reset, :ssl

data/lib/puppet/util/ldap/generator.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/ldap'
+require_relative '../../../puppet/util/ldap'
 
 class Puppet::Util::Ldap::Generator
   # Declare the attribute we'll use to generate the value.

data/lib/puppet/util/ldap/manager.rb

@@ -1,6 +1,6 @@
-require 'puppet/util/ldap'
-require 'puppet/util/ldap/connection'
-require 'puppet/util/ldap/generator'
+require_relative '../../../puppet/util/ldap'
+require_relative '../../../puppet/util/ldap/connection'
+require_relative '../../../puppet/util/ldap/generator'
 
 # The configuration class for LDAP providers, plus
 # connection handling for actually interacting with ldap.

data/lib/puppet/util/limits.rb

@@ -1,4 +1,4 @@
-require 'puppet/util'
+require_relative '../../puppet/util'
 
 module Puppet::Util::Limits
   # @api private

data/lib/puppet/util/log.rb

@@ -1,7 +1,7 @@
-require 'puppet/util/tagging'
-require 'puppet/util/classgen'
-require 'puppet/util/psych_support'
-require 'puppet/network/format_support'
+require_relative '../../puppet/util/tagging'
+require_relative '../../puppet/util/classgen'
+require_relative '../../puppet/util/psych_support'
+require_relative '../../puppet/network/format_support'
 require 'facter'
 
 # Pass feedback to the user.  Log levels are modeled after syslog's, and it is
@@ -35,8 +35,8 @@ class Puppet::Util::Log
     dest
   end
 
-  require 'puppet/util/log/destination'
-  require 'puppet/util/log/destinations'
+  require_relative 'log/destination'
+  require_relative 'log/destinations'
 
   @destinations = {}
 

data/lib/puppet/util/log/destinations.rb

@@ -135,7 +135,7 @@ Puppet::Util::Log.newdesttype :logstash_event do
 end
 
 Puppet::Util::Log.newdesttype :console do
-  require 'puppet/util/colors'
+  require_relative '../../../puppet/util/colors'
   include Puppet::Util::Colors
 
   def initialize

data/lib/puppet/util/logging.rb

@@ -1,6 +1,6 @@
 # A module to make logging a bit easier.
-require 'puppet/util/log'
-require 'puppet/error'
+require_relative '../../puppet/util/log'
+require_relative '../../puppet/error'
 
 require 'facter'
 

data/lib/puppet/util/metric.rb

@@ -1,6 +1,6 @@
 # included so we can test object types
-require 'puppet'
-require 'puppet/network/format_support'
+require_relative '../../puppet'
+require_relative '../../puppet/network/format_support'
 
 # A class for handling metrics.  This is currently ridiculously hackish.
 class Puppet::Util::Metric