puppet 7.6.1 → 7.7.0

data/lib/puppet/util/monkey_patches.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/platform'
+require_relative '../../puppet/util/platform'
 
 module Puppet::Util::MonkeyPatches
 end
@@ -30,7 +30,7 @@ class Object
 end
 
 # (#19151) Reject all SSLv2 ciphers and handshakes
-require 'puppet/ssl/openssl_loader'
+require_relative '../../puppet/ssl/openssl_loader'
 unless Puppet::Util::Platform.jruby_fips?
   unless defined?(OpenSSL::SSL::TLS1_VERSION)
     module OpenSSL::SSL
@@ -64,7 +64,7 @@ unless Puppet::Util::Platform.jruby_fips?
 end
 
 if Puppet::Util::Platform.windows?
-  require 'puppet/util/windows'
+  require_relative '../../puppet/util/windows'
 
   class OpenSSL::X509::Store
     @puppet_certs_loaded = false
@@ -90,6 +90,10 @@ if Puppet::Util::Platform.windows?
 end
 
 unless Puppet::Util::Platform.jruby_fips?
+  unless OpenSSL::X509.const_defined?(:V_ERR_HOSTNAME_MISMATCH)
+    OpenSSL::X509.const_set(:V_ERR_HOSTNAME_MISMATCH, 62)
+  end
+
   unless OpenSSL::X509::Name.instance_methods.include?(:to_utf8)
     class OpenSSL::X509::Name
       # https://github.com/openssl/openssl/blob/OpenSSL_1_1_0j/include/openssl/asn1.h#L362

data/lib/puppet/util/network_device/base.rb

@@ -1,7 +1,7 @@
-require 'puppet/util/autoload'
+require_relative '../../../puppet/util/autoload'
 require 'uri'
-require 'puppet/util/network_device/transport'
-require 'puppet/util/network_device/transport/base'
+require_relative '../../../puppet/util/network_device/transport'
+require_relative '../../../puppet/util/network_device/transport/base'
 
 class Puppet::Util::NetworkDevice::Base
 

data/lib/puppet/util/network_device/config.rb

@@ -1,6 +1,6 @@
 require 'ostruct'
-require 'puppet/util/watched_file'
-require 'puppet/util/network_device'
+require_relative '../../../puppet/util/watched_file'
+require_relative '../../../puppet/util/network_device'
 
 class Puppet::Util::NetworkDevice::Config
 

data/lib/puppet/util/network_device/transport.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/network_device'
+require_relative '../../../puppet/util/network_device'
 
 # stub
 module Puppet::Util::NetworkDevice::Transport

data/lib/puppet/util/network_device/transport/base.rb

@@ -1,6 +1,6 @@
 
-require 'puppet/util/network_device'
-require 'puppet/util/network_device/transport'
+require_relative '../../../../puppet/util/network_device'
+require_relative '../../../../puppet/util/network_device/transport'
 
 class Puppet::Util::NetworkDevice::Transport::Base
   attr_accessor :user, :password, :host, :port

data/lib/puppet/util/package/version/range.rb

@@ -1,9 +1,9 @@
-require 'puppet/util/package/version/range/lt'
-require 'puppet/util/package/version/range/lt_eq'
-require 'puppet/util/package/version/range/gt'
-require 'puppet/util/package/version/range/gt_eq'
-require 'puppet/util/package/version/range/eq'
-require 'puppet/util/package/version/range/min_max'
+require_relative 'range/lt'
+require_relative 'range/lt_eq'
+require_relative 'range/gt'
+require_relative 'range/gt_eq'
+require_relative 'range/eq'
+require_relative 'range/min_max'
 
 module Puppet::Util::Package::Version
   class Range

data/lib/puppet/util/package/version/range/eq.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/package/version/range/simple'
+require_relative '../../../../../puppet/util/package/version/range/simple'
 
 module Puppet::Util::Package::Version
   class Range

data/lib/puppet/util/package/version/range/gt.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/package/version/range/simple'
+require_relative '../../../../../puppet/util/package/version/range/simple'
 
 module Puppet::Util::Package::Version
   class Range

data/lib/puppet/util/package/version/range/gt_eq.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/package/version/range/simple'
+require_relative '../../../../../puppet/util/package/version/range/simple'
 
 module Puppet::Util::Package::Version
   class Range

data/lib/puppet/util/package/version/range/lt.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/package/version/range/simple'
+require_relative '../../../../../puppet/util/package/version/range/simple'
 
 module Puppet::Util::Package::Version
   class Range

data/lib/puppet/util/package/version/range/lt_eq.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/package/version/range/simple'
+require_relative '../../../../../puppet/util/package/version/range/simple'
 
 module Puppet::Util::Package::Version
   class Range

data/lib/puppet/util/package/version/range/min_max.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/package/version/range'
+require_relative '../../../../../puppet/util/package/version/range'
 
 module Puppet::Util::Package::Version
   class Range

data/lib/puppet/util/package/version/range/simple.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/package/version/range'
+require_relative '../../../../../puppet/util/package/version/range'
 
 module Puppet::Util::Package::Version
   class Range

data/lib/puppet/util/package/version/rpm.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require 'puppet/util/rpm_compare'
+require_relative '../../../../puppet/util/rpm_compare'
 
 module Puppet::Util::Package::Version
   class Rpm < Numeric

data/lib/puppet/util/pidlock.rb

@@ -1,5 +1,5 @@
 require 'fileutils'
-require 'puppet/util/lockfile'
+require_relative '../../puppet/util/lockfile'
 
 class Puppet::Util::Pidlock
 

data/lib/puppet/util/plist.rb

@@ -1,5 +1,5 @@
 require 'cfpropertylist' if Puppet.features.cfpropertylist?
-require 'puppet/util/execution'
+require_relative '../../puppet/util/execution'
 
 module Puppet::Util::Plist
 

data/lib/puppet/util/posix.rb

@@ -13,7 +13,7 @@ module Puppet::Util::POSIX
     # Returns an array of all the groups that the user's a member of.
     def groups_of(user)
       begin
-        require 'puppet/ffi/posix'
+        require_relative '../../puppet/ffi/posix'
         groups = get_groups_list(user)
       rescue StandardError, LoadError => e
         Puppet.debug("Falling back to Puppet::Etc.group: #{e.message}")

data/lib/puppet/util/profiler.rb

@@ -4,9 +4,9 @@ require 'benchmark'
 #
 # @api public
 module Puppet::Util::Profiler
-  require 'puppet/util/profiler/wall_clock'
-  require 'puppet/util/profiler/object_counts'
-  require 'puppet/util/profiler/around_profiler'
+  require_relative 'profiler/wall_clock'
+  require_relative 'profiler/object_counts'
+  require_relative 'profiler/around_profiler'
 
   @profiler = Puppet::Util::Profiler::AroundProfiler.new
 

data/lib/puppet/util/profiler/aggregate.rb

@@ -1,5 +1,5 @@
-require 'puppet/util/profiler'
-require 'puppet/util/profiler/wall_clock'
+require_relative '../../../puppet/util/profiler'
+require_relative '../../../puppet/util/profiler/wall_clock'
 
 class Puppet::Util::Profiler::Aggregate < Puppet::Util::Profiler::WallClock
   def initialize(logger, identifier)

data/lib/puppet/util/profiler/object_counts.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/profiler/logging'
+require_relative '../../../puppet/util/profiler/logging'
 
 class Puppet::Util::Profiler::ObjectCounts < Puppet::Util::Profiler::Logging
   def start

data/lib/puppet/util/profiler/wall_clock.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/profiler/logging'
+require_relative '../../../puppet/util/profiler/logging'
 
 # A profiler implementation that measures the number of seconds a segment of
 # code takes to execute and provides a callback with a string representation of

data/lib/puppet/util/provider_features.rb

@@ -1,6 +1,6 @@
 # Provides feature definitions.
-require 'puppet/util/docs'
-require 'puppet/util'
+require_relative '../../puppet/util/docs'
+require_relative '../../puppet/util'
 # This module models provider features and handles checking whether the features
 # are present.
 # @todo Unclear what is api and what is private in this module.

data/lib/puppet/util/rdoc.rb

@@ -1,4 +1,4 @@
-require 'puppet/util'
+require_relative '../../puppet/util'
 module Puppet::Util::RDoc
   module_function
 
@@ -11,7 +11,7 @@ module Puppet::Util::RDoc
     require 'rdoc/options'
 
     # load our parser
-    require 'puppet/util/rdoc/parser'
+    require_relative 'rdoc/parser'
 
     r = RDoc::RDoc.new
 

data/lib/puppet/util/rdoc/generators/puppet_generator.rb

@@ -1,5 +1,5 @@
 require 'rdoc/generators/html_generator'
-require 'puppet/util/rdoc/code_objects'
+require_relative '../../../../puppet/util/rdoc/code_objects'
 require 'digest/md5'
 
 module Generators
@@ -70,7 +70,7 @@ module Generators
 
     # loads our own html template file
     def load_html_template
-        require 'puppet/util/rdoc/generators/template/puppet/puppet'
+        require_relative '../../../../puppet/util/rdoc/generators/template/puppet/puppet'
         extend RDoc::Page
     rescue LoadError
         $stderr.puts "Could not find Puppet template '#{template}'"

data/lib/puppet/util/rdoc/parser.rb

@@ -4,9 +4,9 @@
 # either custom facts or puppet plugins (functions, types...)
 
 # rdoc2 includes
-require "rdoc/code_objects"
-require "puppet/util/rdoc/code_objects"
-require "rdoc/token_stream"
-require "rdoc/markup/pre_process"
-require "rdoc/parser"
-require "puppet/util/rdoc/parser/puppet_parser_rdoc2.rb"
+require 'rdoc/code_objects'
+require_relative '../../../puppet/util/rdoc/code_objects'
+require 'rdoc/token_stream'
+require 'rdoc/markup/pre_process'
+require 'rdoc/parser'
+require_relative 'parser/puppet_parser_rdoc2.rb'

data/lib/puppet/util/rdoc/parser/puppet_parser_rdoc2.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/rdoc/parser/puppet_parser_core.rb'
+require_relative '../../../../puppet/util/rdoc/parser/puppet_parser_core.rb'
 
 module RDoc
   PUPPET_RDOC_VERSION = 2

data/lib/puppet/util/reference.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/instance_loader'
+require_relative '../../puppet/util/instance_loader'
 require 'fileutils'
 
 # Manage Reference Documentation.

data/lib/puppet/util/resource_template.rb

@@ -1,5 +1,5 @@
-require 'puppet/util'
-require 'puppet/util/logging'
+require_relative '../../puppet/util'
+require_relative '../../puppet/util/logging'
 require 'erb'
 
 # A template wrapper that evaluates a template in the

data/lib/puppet/util/rubygems.rb

@@ -1,4 +1,4 @@
-require 'puppet/util'
+require_relative '../../puppet/util'
 
 module Puppet::Util::RubyGems
 

data/lib/puppet/util/selinux.rb

@@ -13,6 +13,10 @@ require 'pathname'
 
 module Puppet::Util::SELinux
 
+  S_IFREG = 0100000
+  S_IFDIR = 0040000
+  S_IFLNK = 0120000
+
   def self.selinux_support?
     return false unless defined?(Selinux)
     if Selinux.is_selinux_enabled == 1
@@ -38,7 +42,7 @@ module Puppet::Util::SELinux
 
   # Retrieve and return the default context of the file.  If we don't have
   # SELinux support or if the SELinux call fails to file a default then return nil.
-  def get_selinux_default_context(file)
+  def get_selinux_default_context(file, resource_ensure=nil)
     return nil unless selinux_support?
     # If the filesystem has no support for SELinux labels, return a default of nil
     # instead of what matchpathcon would return
@@ -48,8 +52,14 @@ module Puppet::Util::SELinux
     begin
       filestat = file_lstat(file)
       mode = filestat.mode
-    rescue Errno::EACCES, Errno::ENOENT
+    rescue Errno::EACCES
       mode = 0
+    rescue Errno::ENOENT
+      if resource_ensure
+        mode = get_create_mode(resource_ensure)
+      else
+        mode = 0
+      end
     end
 
     retval = Selinux.matchpathcon(file, mode)
@@ -136,8 +146,8 @@ module Puppet::Util::SELinux
   # Puppet uses.  This will set the file's SELinux context to the policy's
   # default context (if any) if it differs from the context currently on
   # the file.
-  def set_selinux_default_context(file)
-    new_context = get_selinux_default_context(file)
+  def set_selinux_default_context(file, resource_ensure=nil)
+    new_context = get_selinux_default_context(file, resource_ensure)
     return nil unless new_context
     cur_context = get_selinux_current_context(file)
     if new_context != cur_context
@@ -198,6 +208,22 @@ module Puppet::Util::SELinux
     filesystems.include?(fstype)
   end
 
+  # Get mode file type bits set based on ensure on
+  # the file resource. This helps SELinux determine
+  # what context a new resource being created should have.
+  def get_create_mode(resource_ensure)
+    mode = 0
+    case resource_ensure
+    when :present, :file
+      mode |= S_IFREG
+    when :directory
+      mode |= S_IFDIR
+    when :link
+      mode |= S_IFLNK
+    end
+    mode
+  end
+
   # Internal helper function to read and parse /proc/mounts
   def read_mounts
     mounts = ""

data/lib/puppet/util/skip_tags.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/tagging'
+require_relative '../../puppet/util/tagging'
 
 class Puppet::Util::SkipTags
   include Puppet::Util::Tagging

data/lib/puppet/util/storage.rb

@@ -1,6 +1,6 @@
 require 'yaml'
 require 'singleton'
-require 'puppet/util/yaml'
+require_relative '../../puppet/util/yaml'
 
 # a class for storing state
 class Puppet::Util::Storage

data/lib/puppet/util/suidmanager.rb

@@ -1,5 +1,5 @@
 require 'facter'
-require 'puppet/util/warnings'
+require_relative '../../puppet/util/warnings'
 require 'forwardable'
 require 'etc'
 
@@ -48,7 +48,7 @@ module Puppet::Util::SUIDManager
 
   def self.root?
     if Puppet::Util::Platform.windows?
-      require 'puppet/util/windows/user'
+      require_relative '../../puppet/util/windows/user'
       Puppet::Util::Windows::User.admin?
     else
       Process.uid == 0

data/lib/puppet/util/symbolic_file_mode.rb

@@ -1,4 +1,4 @@
-require 'puppet/util'
+require_relative '../../puppet/util'
 
 module Puppet
 module Util

data/lib/puppet/util/tag_set.rb

@@ -1,5 +1,5 @@
 require 'set'
-require 'puppet/network/format_support'
+require_relative '../../puppet/network/format_support'
 
 class Puppet::Util::TagSet < Set
   include Puppet::Network::FormatSupport

data/lib/puppet/util/tagging.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/tag_set'
+require_relative '../../puppet/util/tag_set'
 
 module Puppet::Util::Tagging
   ValidTagRegex = /\A[[:alnum:]_][[:alnum:]_:.-]*\Z/u

data/lib/puppet/util/watched_file.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/watcher'
+require_relative '../../puppet/util/watcher'
 
 # Monitor a given file for changes on a periodic interval. Changes are detected
 # by looking for a change in the file ctime.

data/lib/puppet/util/watcher.rb

@@ -1,7 +1,7 @@
 module Puppet::Util::Watcher
-  require 'puppet/util/watcher/timer'
-  require 'puppet/util/watcher/change_watcher'
-  require 'puppet/util/watcher/periodic_watcher'
+  require_relative 'watcher/timer'
+  require_relative 'watcher/change_watcher'
+  require_relative 'watcher/periodic_watcher'
 
   module Common
     def self.file_ctime_change_watcher(filename)