puppet 7.6.1-universal-darwin → 7.7.0-universal-darwin

data/lib/puppet/ssl/state_machine.rb

@@ -1,5 +1,5 @@
-require 'puppet/ssl'
-require 'puppet/util/pidlock'
+require_relative '../../puppet/ssl'
+require_relative '../../puppet/util/pidlock'
 
 # This class implements a state machine for bootstrapping a host's CA and CRL
 # bundles, private key and signed client certificate. Each state has a frozen

data/lib/puppet/ssl/verifier.rb

@@ -1,4 +1,4 @@
-require 'puppet/ssl'
+require_relative '../../puppet/ssl'
 
 # Verify an SSL connection.
 #
@@ -117,6 +117,10 @@ class Puppet::SSL::Verifier
         return false
       end
 
+    when OpenSSL::X509::V_ERR_HOSTNAME_MISMATCH # new in ruby-openssl 2.2.0/ruby 3.0
+      @last_error = Puppet::SSL::CertMismatchError.new(peer_cert, @hostname)
+      return false
+
     when OpenSSL::X509::V_ERR_CRL_NOT_YET_VALID
       crl = store_context.current_crl
       if crl && crl.last_update && crl.last_update < Time.now + FIVE_MINUTES_AS_SECONDS

data/lib/puppet/syntax_checkers/base64.rb

@@ -1,6 +1,6 @@
 # A syntax checker for Base64.
 # @api public
-require 'puppet/syntax_checkers'
+require_relative '../../puppet/syntax_checkers'
 require 'base64'
 class Puppet::SyntaxCheckers::Base64 < Puppet::Plugins::SyntaxCheckers::SyntaxChecker
 

data/lib/puppet/syntax_checkers/epp.rb

@@ -1,6 +1,6 @@
 # A syntax checker for JSON.
 # @api public
-require 'puppet/syntax_checkers'
+require_relative '../../puppet/syntax_checkers'
 class Puppet::SyntaxCheckers::EPP < Puppet::Plugins::SyntaxCheckers::SyntaxChecker
 
   # Checks the text for Puppet Language EPP syntax issues and reports them to the given acceptor.

data/lib/puppet/syntax_checkers/json.rb

@@ -1,6 +1,6 @@
 # A syntax checker for JSON.
 # @api public
-require 'puppet/syntax_checkers'
+require_relative '../../puppet/syntax_checkers'
 class Puppet::SyntaxCheckers::Json < Puppet::Plugins::SyntaxCheckers::SyntaxChecker
 
   # Checks the text for JSON syntax issues and reports them to the given acceptor.

data/lib/puppet/syntax_checkers/pp.rb

@@ -1,6 +1,6 @@
 # A syntax checker for JSON.
 # @api public
-require 'puppet/syntax_checkers'
+require_relative '../../puppet/syntax_checkers'
 class Puppet::SyntaxCheckers::PP < Puppet::Plugins::SyntaxCheckers::SyntaxChecker
 
   # Checks the text for Puppet Language syntax issues and reports them to the given acceptor.

data/lib/puppet/transaction.rb

@@ -1,7 +1,7 @@
-require 'puppet'
-require 'puppet/util/tagging'
-require 'puppet/util/skip_tags'
-require 'puppet/application'
+require_relative '../puppet'
+require_relative '../puppet/util/tagging'
+require_relative '../puppet/util/skip_tags'
+require_relative '../puppet/application'
 require 'digest/sha1'
 require 'set'
 
@@ -10,12 +10,12 @@ require 'set'
 #
 # @api private
 class Puppet::Transaction
-  require 'puppet/transaction/additional_resource_generator'
-  require 'puppet/transaction/event'
-  require 'puppet/transaction/event_manager'
-  require 'puppet/transaction/resource_harness'
-  require 'puppet/resource/status'
-  require 'puppet/transaction/persistence'
+  require_relative 'transaction/additional_resource_generator'
+  require_relative 'transaction/event'
+  require_relative 'transaction/event_manager'
+  require_relative 'transaction/resource_harness'
+  require_relative '../puppet/resource/status'
+  require_relative 'transaction/persistence'
 
   attr_accessor :catalog, :ignoreschedules, :for_network_device
 
@@ -466,4 +466,4 @@ class Puppet::Transaction
 
 end
 
-require 'puppet/transaction/report'
+require_relative 'transaction/report'

data/lib/puppet/transaction/event.rb

@@ -1,7 +1,7 @@
-require 'puppet/transaction'
-require 'puppet/util/tagging'
-require 'puppet/util/logging'
-require 'puppet/network/format_support'
+require_relative '../../puppet/transaction'
+require_relative '../../puppet/util/tagging'
+require_relative '../../puppet/util/logging'
+require_relative '../../puppet/network/format_support'
 
 # A simple struct for storing what happens on the system.
 class Puppet::Transaction::Event

data/lib/puppet/transaction/event_manager.rb

@@ -1,4 +1,4 @@
-require 'puppet/transaction'
+require_relative '../../puppet/transaction'
 
 # This class stores, routes, and responds to events generated while evaluating
 # a transaction.

data/lib/puppet/transaction/persistence.rb

@@ -1,5 +1,5 @@
 require 'yaml'
-require 'puppet/util/yaml'
+require_relative '../../puppet/util/yaml'
 
 # A persistence store implementation for storing information between
 # transaction runs for the purposes of information inference (such

data/lib/puppet/transaction/report.rb

@@ -1,5 +1,5 @@
-require 'puppet'
-require 'puppet/indirector'
+require_relative '../../puppet'
+require_relative '../../puppet/indirector'
 
 # This class is used to report what happens on a client.
 # There are two types of data in a report; _Logs_ and _Metrics_.

data/lib/puppet/transaction/resource_harness.rb

@@ -1,4 +1,4 @@
-require 'puppet/resource/status'
+require_relative '../../puppet/resource/status'
 
 class Puppet::Transaction::ResourceHarness
   NO_ACTION = Object.new

data/lib/puppet/type.rb

@@ -1,16 +1,16 @@
 # -*- coding: utf-8 -*-
-require 'puppet'
-require 'puppet/util/log'
-require 'puppet/util/metric'
-require 'puppet/property'
-require 'puppet/parameter'
-require 'puppet/util'
-require 'puppet/util/autoload'
-require 'puppet/metatype/manager'
-require 'puppet/util/errors'
-require 'puppet/util/logging'
-require 'puppet/util/tagging'
-require 'puppet/concurrent/lock'
+require_relative '../puppet'
+require_relative '../puppet/util/log'
+require_relative '../puppet/util/metric'
+require_relative '../puppet/property'
+require_relative '../puppet/parameter'
+require_relative '../puppet/util'
+require_relative '../puppet/util/autoload'
+require_relative '../puppet/metatype/manager'
+require_relative '../puppet/util/errors'
+require_relative '../puppet/util/logging'
+require_relative '../puppet/util/tagging'
+require_relative '../puppet/concurrent/lock'
 
 # see the bottom of the file for the rest of the inclusions
 
@@ -1699,8 +1699,8 @@ class Type
 
   ###############################
   # All of the provider plumbing for the resource types.
-  require 'puppet/provider'
-  require 'puppet/util/provider_features'
+  require_relative '../puppet/provider'
+  require_relative '../puppet/util/provider_features'
 
   # Add the feature handling module.
   extend Puppet::Util::ProviderFeatures

data/lib/puppet/type/component.rb

@@ -1,7 +1,7 @@
 
-require 'puppet'
-require 'puppet/type'
-require 'puppet/transaction'
+require_relative '../../puppet'
+require_relative '../../puppet/type'
+require_relative '../../puppet/transaction'
 
 Puppet::Type.newtype(:component) do
   include Enumerable

data/lib/puppet/type/file.rb

@@ -6,11 +6,11 @@ require 'uri'
 require 'fileutils'
 require 'enumerator'
 require 'pathname'
-require 'puppet/parameter/boolean'
-require 'puppet/util/diff'
-require 'puppet/util/checksums'
-require 'puppet/util/backups'
-require 'puppet/util/symbolic_file_mode'
+require_relative '../../puppet/parameter/boolean'
+require_relative '../../puppet/util/diff'
+require_relative '../../puppet/util/checksums'
+require_relative '../../puppet/util/backups'
+require_relative '../../puppet/util/symbolic_file_mode'
 
 Puppet::Type.newtype(:file) do
   include Puppet::Util::Checksums
@@ -218,6 +218,23 @@ Puppet::Type.newtype(:file) 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 log a warning instead of raising an error.
+
+      Use value `-1` to disable errors and warnings due to max files."
+
+    defaultto 0
+    newvalues(/^[0-9]+$/, /^-1$/)
+  end
+
   newparam(:replace, :boolean => true, :parent => Puppet::Parameter::Boolean) do
     desc "Whether to replace a file or symlink that already exists on the local system but
       whose content doesn't match what the `source` or `content` attribute
@@ -574,7 +591,7 @@ Puppet::Type.newtype(:file) do
     options = @original_parameters.merge(:path => full_path).reject { |param, value| value.nil? }
 
     # These should never be passed to our children.
-    [:parent, :ensure, :recurse, :recurselimit, :target, :alias, :source].each do |param|
+    [:parent, :ensure, :recurse, :recurselimit, :max_files, :target, :alias, :source].each do |param|
       options.delete(param) if options.include?(param)
     end
 
@@ -751,6 +768,7 @@ Puppet::Type.newtype(:file) do
       :links => self[:links],
       :recurse => (self[:recurse] == :remote ? true : self[:recurse]),
       :recurselimit => self[:recurselimit],
+      :max_files => self[:max_files],
       :source_permissions => self[:source_permissions],
       :ignore => self[:ignore],
       :checksum_type => (self[:source] || self[:content]) ? self[:checksum] : :none,
@@ -1100,16 +1118,16 @@ end
 # We put all of the properties in separate files, because there are so many
 # of them.  The order these are loaded is important, because it determines
 # the order they are in the property lit.
-require 'puppet/type/file/checksum'
-require 'puppet/type/file/content'     # can create the file
-require 'puppet/type/file/source'      # can create the file
-require 'puppet/type/file/checksum_value' # can create the file, in place of content
-require 'puppet/type/file/target'      # creates a different type of file
-require 'puppet/type/file/ensure'      # can create the file
-require 'puppet/type/file/owner'
-require 'puppet/type/file/group'
-require 'puppet/type/file/mode'
-require 'puppet/type/file/type'
-require 'puppet/type/file/selcontext'  # SELinux file context
-require 'puppet/type/file/ctime'
-require 'puppet/type/file/mtime'
+require_relative 'file/checksum'
+require_relative 'file/content'     # can create the file
+require_relative 'file/source'      # can create the file
+require_relative 'file/checksum_value' # can create the file, in place of content
+require_relative 'file/target'      # creates a different type of file
+require_relative 'file/ensure'      # can create the file
+require_relative 'file/owner'
+require_relative 'file/group'
+require_relative 'file/mode'
+require_relative 'file/type'
+require_relative 'file/selcontext'  # SELinux file context
+require_relative 'file/ctime'
+require_relative 'file/mtime'

data/lib/puppet/type/file/checksum.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/checksums'
+require_relative '../../../puppet/util/checksums'
 
 # Specify which checksum algorithm to use when checksumming
 # files.

data/lib/puppet/type/file/checksum_value.rb

@@ -1,5 +1,5 @@
-require 'puppet/util/checksums'
-require 'puppet/type/file/data_sync'
+require_relative '../../../puppet/util/checksums'
+require_relative '../../../puppet/type/file/data_sync'
 
 module Puppet
   Puppet::Type.type(:file).newproperty(:checksum_value) do

data/lib/puppet/type/file/content.rb

@@ -2,8 +2,8 @@ require 'net/http'
 require 'uri'
 require 'tempfile'
 
-require 'puppet/util/checksums'
-require 'puppet/type/file/data_sync.rb'
+require_relative '../../../puppet/util/checksums'
+require_relative '../../../puppet/type/file/data_sync.rb'
 
 module Puppet
   Puppet::Type.type(:file).newproperty(:content) do

data/lib/puppet/type/file/data_sync.rb

@@ -1,5 +1,5 @@
-require 'puppet/util/checksums'
-require 'puppet/util/diff'
+require_relative '../../../puppet/util/checksums'
+require_relative '../../../puppet/util/diff'
 require 'date'
 require 'tempfile'
 

data/lib/puppet/type/file/ensure.rb

@@ -2,7 +2,7 @@
 module Puppet
   Puppet::Type.type(:file).ensurable do
     require 'etc'
-    require 'puppet/util/symbolic_file_mode'
+    require_relative '../../../puppet/util/symbolic_file_mode'
     include Puppet::Util::SymbolicFileMode
 
     desc <<-EOT

data/lib/puppet/type/file/group.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/posix'
+require_relative '../../../puppet/util/posix'
 
 module Puppet
   # Manage file group ownership.

data/lib/puppet/type/file/mode.rb

@@ -5,7 +5,7 @@
 
 module Puppet
   Puppet::Type.type(:file).newproperty(:mode) do
-    require 'puppet/util/symbolic_file_mode'
+    require_relative '../../../puppet/util/symbolic_file_mode'
     include Puppet::Util::SymbolicFileMode
 
     desc <<-'EOT'

data/lib/puppet/type/file/selcontext.rb

@@ -21,7 +21,7 @@
 
 
 module Puppet
-  require 'puppet/util/selinux'
+  require_relative '../../../puppet/util/selinux'
 
   class SELFileContext < Puppet::Property
     include Puppet::Util::SELinux
@@ -42,7 +42,7 @@ module Puppet
         return nil
       end
 
-      context = self.get_selinux_default_context(@resource[:path])
+      context = self.get_selinux_default_context(@resource[:path], @resource[:ensure])
       unless context
         return nil
       end

data/lib/puppet/type/file/source.rb

@@ -1,8 +1,8 @@
-require 'puppet/file_serving/content'
-require 'puppet/file_serving/metadata'
-require 'puppet/file_serving/terminus_helper'
+require_relative '../../../puppet/file_serving/content'
+require_relative '../../../puppet/file_serving/metadata'
+require_relative '../../../puppet/file_serving/terminus_helper'
 
-require 'puppet/http'
+require_relative '../../../puppet/http'
 
 module Puppet
   # Copy files from a local or remote source.  This state *only* does any work

data/lib/puppet/type/filebucket.rb

@@ -1,5 +1,5 @@
 module Puppet
-  require 'puppet/file_bucket/dipper'
+  require_relative '../../puppet/file_bucket/dipper'
 
   Type.newtype(:filebucket) do
     @doc = <<-EOT

data/lib/puppet/type/group.rb

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

data/lib/puppet/type/package.rb

@@ -4,8 +4,8 @@
 # This allows packages to exist on the same machine using different packaging
 # systems.
 
-require 'puppet/parameter/package_options'
-require 'puppet/parameter/boolean'
+require_relative '../../puppet/parameter/package_options'
+require_relative '../../puppet/parameter/boolean'
 
 module Puppet
   Type.newtype(:package) do

data/lib/puppet/type/resources.rb

@@ -1,5 +1,5 @@
-require 'puppet'
-require 'puppet/parameter/boolean'
+require_relative '../../puppet'
+require_relative '../../puppet/parameter/boolean'
 
 Puppet::Type.newtype(:resources) do
   @doc = "This is a metatype that can manage other resource types.  Any

data/lib/puppet/type/service.rb

@@ -139,23 +139,9 @@ module Puppet
     newproperty(:logonaccount, :required_features => :manages_logon_credentials) do
       desc "Specify an account for service logon"
 
-      munge do |value|
-        return value unless Puppet::Util::Platform.windows?
-        return 'LocalSystem' if Puppet::Util::Windows::User::localsystem?(value)
-
-        value.sub!(/^\.\\/, "#{Puppet::Util::Windows::ADSI.computer_name}\\")
-        user_information = Puppet::Util::Windows::SID.name_to_principal(value)
-        raise Puppet::Error.new("\"#{value}\" is not a valid account") unless user_information && [:SidTypeUser, :SidTypeWellKnownGroup].include?(user_information.account_type)
-
-        user_rights = Puppet::Util::Windows::User::get_rights(user_information.domain_account) unless Puppet::Util::Windows::User::default_system_account?(value)
-        raise Puppet::Error.new("\"#{user_information.domain_account}\" has the 'Log On As A Service' right set to denied.") if user_rights =~ /SeDenyServiceLogonRight/
-        raise Puppet::Error.new("\"#{user_information.domain_account}\" is missing the 'Log On As A Service' right.") unless user_rights.nil? || user_rights =~ /SeServiceLogonRight/
-
-        if user_information.domain == Puppet::Util::Windows::ADSI.computer_name
-          ".\\#{user_information.account}"
-        else
-          user_information.domain_account
-        end
+      def insync?(current)
+        return provider.logonaccount_insync?(current) if provider.respond_to?(:logonaccount_insync?)
+        super(current)
       end
     end
 
@@ -163,18 +149,7 @@ module Puppet
       desc "Specify a password for service logon. Default value is an empty string (when logonaccount is specified)."
 
       validate do |value|
-        raise Puppet::Error.new(_"The 'logonaccount' parameter is mandatory when setting 'logonpassword'.") unless @resource[:logonaccount]
-        raise ArgumentError, _("Passwords cannot include ':'") if value.is_a?(String) and value.include?(":")
-        return unless Puppet::Util::Platform.windows?
-
-        is_a_predefined_local_account = Puppet::Util::Windows::User::default_system_account?(@resource[:logonaccount]) || @resource[:logonaccount] == 'LocalSystem'
-
-        account_info = @resource[:logonaccount].split("\\")
-        able_to_logon = Puppet::Util::Windows::User.password_is?(account_info[1], value, account_info[0]) unless is_a_predefined_local_account
-
-        raise Puppet::Error.new("The given password is invalid for user '#{@resource[:logonaccount]}'.") unless is_a_predefined_local_account || able_to_logon
-
-        provider.logonpassword=(value)
+        raise ArgumentError, _("Passwords cannot include ':'") if value.is_a?(String) && value.include?(":")
       end
 
       sensitive true
@@ -320,5 +295,11 @@ module Puppet
     def self.needs_ensure_retrieved
       false
     end
+
+    validate do
+      if @parameters[:logonpassword] && @parameters[:logonaccount].nil?
+        raise Puppet::Error.new(_"The 'logonaccount' parameter is mandatory when setting 'logonpassword'.")
+      end
+    end
   end
 end