puppet 7.4.0-universal-darwin → 7.8.0-universal-darwin

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

@@ -38,6 +38,12 @@ module Puppet
     feature :enableable, "The provider can enable and disable the service.",
       :methods => [:disable, :enable, :enabled?]
 
+    feature :delayed_startable, "The provider can set service to delayed start",
+      :methods => [:delayed_start]
+
+    feature :manual_startable, "The provider can set service to manual start",
+      :methods => [:manual_start]
+
     feature :controllable, "The provider uses a control variable."
 
     feature :flaggable, "The provider can pass flags to the service."
@@ -67,7 +73,7 @@ module Puppet
         provider.disable
       end
 
-      newvalue(:manual, :event => :service_manual_start) do
+      newvalue(:manual, :event => :service_manual_start, :required_features => :manual_startable) do
         provider.manual_start
       end
 
@@ -81,8 +87,7 @@ module Puppet
         provider.enabled?
       end
 
-      # This only works on Windows systems.
-      newvalue(:delayed, :event => :service_delayed_start) do
+      newvalue(:delayed, :event => :service_delayed_start, :required_features => :delayed_startable) do
         provider.delayed_start
       end
 
@@ -90,12 +95,6 @@ module Puppet
         return provider.enabled_insync?(current) if provider.respond_to?(:enabled_insync?)
         super(current)
       end
-
-      validate do |value|
-        if (value == :manual || value == :delayed) && !Puppet::Util::Platform.windows?
-          raise Puppet::Error.new(_("Setting enable to %{value} is only supported on Microsoft Windows.") % { value: value.to_s} )
-        end
-      end
     end
 
     # Handle whether the service should actually be running right now.
@@ -139,23 +138,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 +148,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 +294,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

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
@@ -67,6 +67,7 @@ module Puppet
     newproperty(:ensure, :parent => Puppet::Property::Ensure) do
       newvalue(:present, :event => :user_created) do
         provider.create
+        @resource.generate
       end
 
       newvalue(:absent, :event => :user_removed) do
@@ -695,6 +696,7 @@ module Puppet
 
     def generate
       if !self[:purge_ssh_keys].empty?
+        return [] if self[:ensure] == :present && !provider.exists? 
         if Puppet::Type.type(:ssh_authorized_key).nil?
           warning _("Ssh_authorized_key type is not available. Cannot purge SSH keys.")
         else
@@ -743,25 +745,6 @@ module Puppet
         end
         raise ArgumentError, _("purge_ssh_keys must be true, false, or an array of file names, not %{value}") % { value: value.inspect }
       end
-
-      munge do |value|
-        # Resolve string, boolean and symbol forms of true and false to a
-        # single representation.
-        test_sym = value.to_s.intern
-        value = test_sym if [:true, :false].include? test_sym
-
-        return [] if value == :false
-        home = resource[:home] || Dir.home(resource[:name])
-
-        return [ "#{home}/.ssh/authorized_keys" ] if value == :true
-        # value is an array - munge each value
-        [ value ].flatten.map do |entry|
-          # make sure frozen value is duplicated by using a gsub, second mutating gsub! is then ok
-          entry = entry.gsub(/^~\//, "#{home}/")
-          entry.gsub!(/^%h\//, "#{home}/")
-          entry
-        end
-      end
     end
 
     newproperty(:loginclass, :required_features => :manages_loginclass) do
@@ -783,7 +766,7 @@ module Puppet
     # @see generate
     # @api private
     def find_unmanaged_keys
-      self[:purge_ssh_keys].
+      munged_unmanaged_keys.
         select { |f| File.readable?(f) }.
         map { |f| unknown_keys_in_file(f) }.
         flatten.each do |res|
@@ -795,6 +778,41 @@ module Puppet
         end
     end
 
+    def munged_unmanaged_keys
+      value = self[:purge_ssh_keys]
+
+      # Resolve string, boolean and symbol forms of true and false to a
+      # single representation.
+      test_sym = value.to_s.intern
+      value = test_sym if [:true, :false].include? test_sym
+
+      return [] if value == :false
+
+      home = self[:home]
+      begin
+        home ||= provider.home
+      rescue
+        Puppet.debug("User '#{self[:name]}' does not exist")
+      end
+
+      if home.to_s.empty? || !Dir.exist?(home.to_s)
+        if value == :true || [ value ].flatten.any? { |v| v.start_with?('~/', '%h/') }
+          Puppet.debug("User '#{self[:name]}' has no home directory set to purge ssh keys from.")
+          return []
+        end
+      end
+
+      return [ "#{home}/.ssh/authorized_keys" ] if value == :true
+
+      # value is an array - munge each value
+      [ value ].flatten.map do |entry|
+        # make sure frozen value is duplicated by using a gsub, second mutating gsub! is then ok
+        entry = entry.gsub(/^~\//, "#{home}/")
+        entry.gsub!(/^%h\//, "#{home}/")
+        entry
+      end
+    end
+
     # Parse an ssh authorized keys file superficially, extract the comments
     # on the keys. These are considered names of possible ssh_authorized_keys
     # resources. Keys that are managed by the present catalog are ignored.

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