puppet 6.28.0-universal-darwin → 7.0.0-universal-darwin

data/lib/puppet/util/log.rb

@@ -2,6 +2,7 @@ require 'puppet/util/tagging'
 require 'puppet/util/classgen'
 require 'puppet/util/psych_support'
 require 'puppet/network/format_support'
+require 'facter'
 
 # Pass feedback to the user.  Log levels are modeled after syslog's, and it is
 # expected that that will be the most common log destination.  Supports
@@ -105,17 +106,12 @@ class Puppet::Util::Log
   def Log.level=(level)
     level = level.intern unless level.is_a?(Symbol)
 
-    # loglevel is a 0-based index
-    loglevel = @levels.index(level)
-    raise Puppet::DevError, _("Invalid loglevel %{level}") % { level: level } unless loglevel
+    raise Puppet::DevError, _("Invalid loglevel %{level}") % { level: level } unless @levels.include?(level)
 
-    return if @loglevel == loglevel
-
-    # loglevel changed
-    @loglevel = loglevel
+    @loglevel = @levels.index(level)
 
     # Enable or disable Facter debugging
-    Puppet.runtime[:facter].debugging(level == :debug)
+    Facter.debugging(level == :debug) if Facter.respond_to? :debugging
   end
 
   def Log.levels

data/lib/puppet/util/logging.rb

@@ -2,6 +2,8 @@
 require 'puppet/util/log'
 require 'puppet/error'
 
+require 'facter'
+
 module Puppet::Util
 module Logging
 
@@ -252,7 +254,29 @@ module Logging
   # Sets up Facter logging.
   # This method causes Facter output to be forwarded to Puppet.
   def self.setup_facter_logging!
-    Puppet.runtime[:facter]
+    # Only recent versions of Facter support this feature
+    return false unless Facter.respond_to? :on_message
+
+    # The current Facter log levels are: :trace, :debug, :info, :warn, :error, and :fatal.
+    # Convert to the corresponding levels in Puppet
+    Facter.on_message do |level, message|
+      case level
+      when :trace, :debug
+        level = :debug
+      when :info
+        # Same as Puppet
+      when :warn
+        level = :warning
+      when :error
+        level = :err
+      when :fatal
+        level = :crit
+      else
+        next
+      end
+      Puppet::Util::Log.create({:level => level, :source => 'Facter', :message => message})
+      nil
+    end
     true
   end
 

data/lib/puppet/util/monkey_patches.rb

@@ -32,19 +32,6 @@ end
 # (#19151) Reject all SSLv2 ciphers and handshakes
 require 'puppet/ssl/openssl_loader'
 unless Puppet::Util::Platform.jruby_fips?
-  unless defined?(OpenSSL::SSL::TLS1_VERSION)
-    module OpenSSL::SSL
-      # see https://github.com/ruby/ruby/commit/609103dbb5fb182eec12f052226c43e39b907682#diff-09f822c26289f5347111795ca22ed7ed1cfadd6ebd28f987991d1d414eef565aR2755-R2759
-      OpenSSL::SSL::TLS1_VERSION = 0x301
-    end
-  end
-
-  unless defined?(OpenSSL::X509::V_ERR_HOSTNAME_MISMATCH)
-    module OpenSSL::X509
-      OpenSSL::X509::V_ERR_HOSTNAME_MISMATCH = 0x3E
-    end
-  end
-
   class OpenSSL::SSL::SSLContext
     if DEFAULT_PARAMS[:options]
       DEFAULT_PARAMS[:options] |= OpenSSL::SSL::OP_NO_SSLv2 | OpenSSL::SSL::OP_NO_SSLv3
@@ -70,6 +57,8 @@ unless Puppet::Util::Platform.jruby_fips?
 end
 
 if Puppet::Util::Platform.windows?
+  require 'puppet/util/windows'
+
   class OpenSSL::X509::Store
     @puppet_certs_loaded = false
     alias __original_set_default_paths set_default_paths
@@ -113,49 +102,3 @@ unless Puppet::Util::Platform.jruby_fips?
     end
   end
 end
-
-unless Puppet::Util::Platform.jruby_fips?
-  unless OpenSSL::PKey::EC.instance_methods.include?(:private?)
-    class OpenSSL::PKey::EC
-      # Added in ruby 2.4.0 in https://github.com/ruby/ruby/commit/7c971e61f04
-      alias :private? :private_key?
-    end
-  end
-
-  unless OpenSSL::PKey::EC.singleton_methods.include?(:generate)
-    class OpenSSL::PKey::EC
-      # Added in ruby 2.4.0 in https://github.com/ruby/ruby/commit/85500b66342
-      def self.generate(string)
-        ec = OpenSSL::PKey::EC.new(string)
-        ec.generate_key
-      end
-    end
-  end
-end
-
-# The Enumerable#uniq method was added in Ruby 2.4.0 (https://bugs.ruby-lang.org/issues/11090)
-# This is a backport to earlier Ruby versions.
-#
-unless Enumerable.instance_methods.include?(:uniq)
-  module Enumerable
-    def uniq
-      result = []
-      uniq_map = {}
-      if block_given?
-        each do |value|
-          key = yield value
-          next if uniq_map.has_key?(key)
-          uniq_map[key] = true
-          result << value
-        end
-      else
-        each do |value|
-          next if uniq_map.has_key?(value)
-          uniq_map[value] = true
-          result << value
-        end
-      end
-      result
-    end
-  end
-end

data/lib/puppet/util/package.rb

@@ -1,13 +1,6 @@
-# frozen_string_literal: true
 module Puppet::Util::Package
-  def versioncmp(version_a, version_b, ignore_trailing_zeroes = false)
+  def versioncmp(version_a, version_b)
     vre = /[-.]|\d+|[^-.\d]+/
-
-    if ignore_trailing_zeroes
-      version_a = normalize(version_a)
-      version_b = normalize(version_b)
-    end
-
     ax = version_a.scan(vre)
     bx = version_b.scan(vre)
 
@@ -15,26 +8,24 @@ module Puppet::Util::Package
       a = ax.shift
       b = bx.shift
 
-      next      if a == b
-      return -1 if a == '-'
-      return 1  if b == '-'
-      return -1 if a == '.'
-      return 1  if b == '.'
-      if a =~ /^\d+$/ && b =~ /^\d+$/
-        return a.to_s.upcase <=> b.to_s.upcase if a =~ /^0/ || b =~ /^0/
+      if( a == b )                 then next
+      elsif (a == '-' && b == '-') then next
+      elsif (a == '-')             then return -1
+      elsif (b == '-')             then return 1
+      elsif (a == '.' && b == '.') then next
+      elsif (a == '.' )            then return -1
+      elsif (b == '.' )            then return 1
+      elsif (a =~ /^\d+$/ && b =~ /^\d+$/) then
+        if( a =~ /^0/ or b =~ /^0/ ) then
+          return a.to_s.upcase <=> b.to_s.upcase
+        end
         return a.to_i <=> b.to_i
+      else
+        return a.upcase <=> b.upcase
       end
-      return a.upcase <=> b.upcase
     end
-    version_a <=> version_b
+    version_a <=> version_b;
   end
-  module_function :versioncmp
 
-  def self.normalize(version)
-    version = version.split('-')
-    version.first.sub!(/([\.0]+)$/, '')
-
-    version.join('-')
-  end
-  private_class_method :normalize
+  module_function :versioncmp
 end

data/lib/puppet/util/pidlock.rb

@@ -46,7 +46,7 @@ class Puppet::Util::Pidlock
   private
 
   def ps_argument_for_current_kernel
-    case Puppet.runtime[:facter].value(:kernel)
+    case Facter.value(:kernel)
       when "Linux"
         "-eq"
       when "AIX"

data/lib/puppet/util/posix.rb

@@ -12,18 +12,11 @@ module Puppet::Util::POSIX
   class << self
     # Returns an array of all the groups that the user's a member of.
     def groups_of(user)
-      begin
-        require 'puppet/ffi/posix'
-        groups = get_groups_list(user)
-      rescue StandardError, LoadError => e
-        Puppet.debug("Falling back to Puppet::Etc.group: #{e.message}")
-
-        groups = []
-        Puppet::Etc.group do |group|
-          groups << group.name if group.mem.include?(user)
-        end
+      groups = []
+      Puppet::Etc.group do |group|
+        groups << group.name if group.mem.include?(user)
       end
-
+  
       uniq_groups = groups.uniq
       if uniq_groups != groups
         Puppet.debug(_('Removing any duplicate group entries'))
@@ -31,39 +24,6 @@ module Puppet::Util::POSIX
 
       uniq_groups
     end
-
-    private
-    def get_groups_list(user)
-      raise LoadError, "The 'getgrouplist' method is not available" unless Puppet::FFI::POSIX::Functions.respond_to?(:getgrouplist)
-
-      user_gid = Puppet::Etc.getpwnam(user).gid
-      ngroups = Puppet::FFI::POSIX::Constants::MAXIMUM_NUMBER_OF_GROUPS
-
-      while true do # rubocop:disable Lint/LiteralInCondition
-        FFI::MemoryPointer.new(:int) do |ngroups_ptr|
-          FFI::MemoryPointer.new(:uint, ngroups) do |groups_ptr|
-            old_ngroups = ngroups
-            ngroups_ptr.write_int(ngroups)
-
-            if Puppet::FFI::POSIX::Functions::getgrouplist(user, user_gid, groups_ptr, ngroups_ptr) != -1
-              groups_gids = groups_ptr.get_array_of_uint(0, ngroups_ptr.read_int)
-
-              result = []
-              groups_gids.each do |group_gid|
-                group_info = Puppet::Etc.getgrgid(group_gid)
-                result |= [group_info.name] if group_info.mem.include?(user)
-              end
-              return result
-            end
-
-            ngroups = ngroups_ptr.read_int
-            if ngroups <= old_ngroups
-              ngroups *= 2
-            end
-          end
-        end
-      end
-    end
   end
 
   # Retrieve a field from a POSIX Etc object.  The id can be either an integer
@@ -184,17 +144,8 @@ module Puppet::Util::POSIX
       name = get_posix_field(location, :name, id)
       check_value = name
     end
-
     if check_value != field
-      check_value_id = get_posix_field(location, id_field, check_value) if check_value
-
-      if id == check_value_id
-        Puppet.debug("Multiple entries found for resource: '#{location}' with #{id_field}: #{id}")
-        return id
-      else
-        Puppet.debug("The value retrieved: '#{check_value}' is different than the required state: '#{field}', searching in all entries")
-        return search_posix_field(location, id_field, field)
-      end
+      return search_posix_field(location, id_field, field)
     else
       return id
     end

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

@@ -154,7 +154,7 @@ module RDoc::PuppetParserCore
         # fetch comments
         if line =~ /^[ \t]*# ?(.*)$/
           comments += $1 + "\n"
-        elsif line =~ /^[ \t]*(Facter.add|Puppet\.runtime\[:facter\].add)\(['"](.*?)['"]\)/
+        elsif line =~ /^[ \t]*Facter.add\(['"](.*?)['"]\)/
           current_fact = RDoc::Fact.new($1,{})
           look_for_directives_in(container, comments) unless comments.empty?
           current_fact.comment = comments

data/lib/puppet/util/rdoc.rb

@@ -26,13 +26,6 @@ module Puppet::Util::RDoc
 
     options << "--force-update"
     options += [ "--charset", charset] if charset
-    # Rdoc root default is Dir.pwd, but the win32-dir gem monkey patches Dir.pwd
-    # replacing Ruby's normal / with \.  When RDoc generates relative paths it
-    # uses relative_path_from that will generate errors when the slashes don't
-    # properly match.  This is a workaround for that issue.
-    if Puppet::Util::Platform.windows? && RDoc::VERSION !~ /^[0-3]\./
-      options += [ "--root", Dir.pwd.tr('\\', '/')]
-    end
     options += files
 
     # launch the documentation process

data/lib/puppet/util/retry_action.rb

@@ -7,7 +7,7 @@ module Puppet::Util::RetryAction
   # Execute the supplied block retrying with exponential backoff.
   #
   # @param [Hash] options the retry options
-  # @option options [FixNum] :retries Maximum number of times to retry.
+  # @option options [Integer] :retries Maximum number of times to retry.
   # @option options [Array<Exception>] :retry_exceptions ([StandardError]) Optional array of exceptions that are allowed to be retried.
   # @yield The block to be executed.
   def self.retry_action(options = {})

data/lib/puppet/util/run_mode.rb

@@ -74,6 +74,10 @@ module Puppet
         which_dir("/opt/puppetlabs/puppet/cache", "~/.puppetlabs/opt/puppet/cache")
       end
 
+      def public_dir
+        which_dir("/opt/puppetlabs/puppet/public", "~/.puppetlabs/opt/puppet/public")
+      end
+
       def run_dir
         which_dir("/var/run/puppetlabs", "~/.puppetlabs/var/run")
       end
@@ -96,6 +100,10 @@ module Puppet
         which_dir(File.join(windows_common_base("puppet/cache")), "~/.puppetlabs/opt/puppet/cache")
       end
 
+      def public_dir
+        which_dir(File.join(windows_common_base("puppet/public")), "~/.puppetlabs/opt/puppet/public")
+      end
+
       def run_dir
         which_dir(File.join(windows_common_base("puppet/var/run")), "~/.puppetlabs/var/run")
       end
@@ -107,7 +115,7 @@ module Puppet
     private
 
       def windows_common_base(*extra)
-        [Dir::COMMON_APPDATA, "PuppetLabs"] + extra
+        [ENV['ALLUSERSPROFILE'], "PuppetLabs"] + extra
       end
     end
   end

data/lib/puppet/util/selinux.rb

@@ -13,10 +13,6 @@ 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
@@ -42,7 +38,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, resource_ensure=nil)
+  def get_selinux_default_context(file)
     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
@@ -52,14 +48,8 @@ module Puppet::Util::SELinux
     begin
       filestat = file_lstat(file)
       mode = filestat.mode
-    rescue Errno::EACCES
+    rescue Errno::EACCES, Errno::ENOENT
       mode = 0
-    rescue Errno::ENOENT
-      if resource_ensure
-        mode = get_create_mode(resource_ensure)
-      else
-        mode = 0
-      end
     end
 
     retval = Selinux.matchpathcon(file, mode)
@@ -146,8 +136,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, resource_ensure=nil)
-    new_context = get_selinux_default_context(file, resource_ensure)
+  def set_selinux_default_context(file)
+    new_context = get_selinux_default_context(file)
     return nil unless new_context
     cur_context = get_selinux_current_context(file)
     if new_context != cur_context
@@ -208,22 +198,6 @@ 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/suidmanager.rb

@@ -1,3 +1,4 @@
+require 'facter'
 require 'puppet/util/warnings'
 require 'forwardable'
 require 'etc'
@@ -17,7 +18,7 @@ module Puppet::Util::SUIDManager
 
   def osx_maj_ver
     return @osx_maj_ver unless @osx_maj_ver.nil?
-    @osx_maj_ver = Puppet.runtime[:facter].value('macosx_productversion_major') || false
+    @osx_maj_ver = Facter.value('macosx_productversion_major') || false
   end
   module_function :osx_maj_ver
 

data/lib/puppet/util/symbolic_file_mode.rb

@@ -19,37 +19,25 @@ module SymbolicFileMode
     return false
   end
 
-  def display_mode(value)
-    if value =~ /^0?[0-7]{1,4}$/
-      value.rjust(4, "0")
-    else
-      value
-    end
-  end
-
   def normalize_symbolic_mode(value)
     return nil if value.nil?
 
     # We need to treat integers as octal numbers.
-    #
-    # "A numeric mode is from one to four octal digits (0-7), derived by adding
-    # up the bits with values 4, 2, and 1. Omitted digits are assumed to be
-    # leading zeros."
-    if value.is_a? Numeric
-      value.to_s(8)
-    elsif value =~ /^0?[0-7]{1,4}$/
-      value.to_i(8).to_s(8) # strip leading 0's
+    if value.is_a? Numeric then
+      return value.to_s(8)
+    elsif value =~ /^0?[0-7]{1,4}$/ then
+      return value.to_i(8).to_s(8)
     else
-      value
+      return value
     end
   end
 
   def symbolic_mode_to_int(modification, to_mode = 0, is_a_directory = false)
-    if modification.nil? or modification == ''
+    if modification.nil? or modification == '' then
       raise Puppet::Error, _("An empty mode string is illegal")
-    elsif modification =~ /^[0-7]+$/
-      return modification.to_i(8)
-    elsif modification =~ /^\d+$/
+    end
+    if modification =~ /^[0-7]+$/ then return modification.to_i(8) end
+    if modification =~ /^\d+$/ then
       raise Puppet::Error, _("Numeric modes must be in octal, not decimal!")
     end
 
@@ -96,31 +84,31 @@ module SymbolicFileMode
 
           dsl.split('').each do |op|
             case op
-            when /[-+=]/
+            when /[-+=]/ then
               action = op
               # Clear all bits, if this is assignment
               value  = 0 if op == '='
 
-            when /[ugo]/
+            when /[ugo]/ then
               value = actions[action].call(value, snapshot_mode[op])
 
-            when /[rwx]/
+            when /[rwx]/ then
               value = actions[action].call(value, SymbolicMode[op])
 
-            when 'X'
+            when 'X' then
               # Only meaningful in combination with "set" actions.
-              if action != '+'
+              if action != '+' then
                 raise Puppet::Error, _("X only works with the '+' operator")
               end
 
               # As per the BSD manual page, set if this is a directory, or if
               # any execute bit is set on the original (unmodified) mode.
               # Ignored otherwise; it is "add if", not "add or clear".
-              if is_a_directory or original_mode['any x?']
+              if is_a_directory or original_mode['any x?'] then
                 value = actions[action].call(value, ExecBit)
               end
 
-            when /[st]/
+            when /[st]/ then
               bit = SymbolicSpecialToBit[op][who] or fail _("internal error")
               final_mode['s'] = actions[action].call(final_mode['s'], bit)
 
@@ -134,7 +122,7 @@ module SymbolicFileMode
         end
 
       rescue Puppet::Error => e
-        if part.inspect != modification.inspect
+        if part.inspect != modification.inspect then
           rest = " at #{part.inspect}"
         else
           rest = ''

data/lib/puppet/util/tagging.rb

@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require 'puppet/util/tag_set'
 
 module Puppet::Util::Tagging

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

@@ -504,43 +504,6 @@ module Puppet::Util::Windows::ADSI
       user_name
     end
 
-    # https://docs.microsoft.com/en-us/windows/win32/api/secext/ne-secext-extended_name_format
-    NameUnknown           = 0
-    NameFullyQualifiedDN  = 1
-    NameSamCompatible     = 2
-    NameDisplay           = 3
-    NameUniqueId          = 6
-    NameCanonical         = 7
-    NameUserPrincipal     = 8
-    NameCanonicalEx       = 9
-    NameServicePrincipal  = 10
-    NameDnsDomain         = 12
-    NameGivenName         = 13
-    NameSurname           = 14
-
-    def self.current_user_name_with_format(format)
-      user_name = ''
-      max_length = 1024
-
-      FFI::MemoryPointer.new(:lpwstr, max_length * 2 + 1) do |buffer|
-        FFI::MemoryPointer.new(:dword, 1) do |buffer_size|
-          buffer_size.write_dword(max_length + 1)
-
-          if GetUserNameExW(format.to_i, buffer, buffer_size) == FFI::WIN32_FALSE
-            raise Puppet::Util::Windows::Error.new(_("Failed to get user name"), FFI.errno)
-          end
-
-          user_name = buffer.read_wide_string(buffer_size.read_dword).chomp
-        end
-      end
-
-      user_name
-    end
-
-    def self.current_sam_compatible_user_name
-      current_user_name_with_format(NameSamCompatible)
-    end
-
     def self.current_user_sid
       Puppet::Util::Windows::SID.name_to_principal(current_user_name)
     end
@@ -555,15 +518,6 @@ module Puppet::Util::Windows::ADSI
     ffi_lib :advapi32
     attach_function_private :GetUserNameW,
       [:lpwstr, :lpdword], :win32_bool
-
-    # https://docs.microsoft.com/en-us/windows/win32/api/secext/nf-secext-getusernameexa
-    # BOOLEAN SEC_ENTRY GetUserNameExA(
-    #   EXTENDED_NAME_FORMAT NameFormat,
-    #   LPSTR                lpNameBuffer,
-    #   PULONG               nSize
-    # );type
-    ffi_lib :secur32
-    attach_function_private :GetUserNameExW, [:uint16, :lpwstr, :pointer], :win32_bool
   end
 
   class UserProfile