puppet 7.4.0-x64-mingw32 → 7.8.0-x64-mingw32

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)

data/lib/puppet/util/windows.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/platform'
+require_relative '../../puppet/util/platform'
 
 module Puppet::Util::Windows
   module ADSI
@@ -25,24 +25,24 @@ module Puppet::Util::Windows
     require 'win32ole' ; WIN32OLE.codepage = WIN32OLE::CP_UTF8
 
     # these reference platform specific gems
-    require 'puppet/ffi/windows'
-    require 'puppet/util/windows/string'
-    require 'puppet/util/windows/error'
-    require 'puppet/util/windows/com'
-    require 'puppet/util/windows/sid'
-    require 'puppet/util/windows/principal'
-    require 'puppet/util/windows/file'
-    require 'puppet/util/windows/security'
-    require 'puppet/util/windows/user'
-    require 'puppet/util/windows/process'
-    require 'puppet/util/windows/root_certs'
-    require 'puppet/util/windows/access_control_entry'
-    require 'puppet/util/windows/access_control_list'
-    require 'puppet/util/windows/security_descriptor'
-    require 'puppet/util/windows/adsi'
-    require 'puppet/util/windows/registry'
-    require 'puppet/util/windows/eventlog'
-    require 'puppet/util/windows/service'
-    require 'puppet/util/windows/monkey_patches/process'
+    require_relative '../../puppet/ffi/windows'
+    require_relative 'windows/string'
+    require_relative 'windows/error'
+    require_relative 'windows/com'
+    require_relative 'windows/sid'
+    require_relative 'windows/principal'
+    require_relative 'windows/file'
+    require_relative 'windows/security'
+    require_relative 'windows/user'
+    require_relative 'windows/process'
+    require_relative 'windows/root_certs'
+    require_relative 'windows/access_control_entry'
+    require_relative 'windows/access_control_list'
+    require_relative 'windows/security_descriptor'
+    require_relative 'windows/adsi'
+    require_relative 'windows/registry'
+    require_relative 'windows/eventlog'
+    require_relative 'windows/service'
+    require_relative 'windows/monkey_patches/process'
   end
 end

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

@@ -6,7 +6,7 @@
 # @see https://msdn.microsoft.com/en-us/library/windows/desktop/aa374868(v=vs.85).aspx
 # @api private
 class Puppet::Util::Windows::AccessControlEntry
-  require 'puppet/util/windows/security'
+  require_relative '../../../puppet/util/windows/security'
   include Puppet::Util::Windows::SID
 
   attr_accessor :sid

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

@@ -293,7 +293,7 @@ module Puppet::Util::Windows::ADSI
   class User < ADSIObject
     extend FFI::Library
 
-    require 'puppet/util/windows/sid'
+    require_relative '../../../puppet/util/windows/sid'
 
     # https://msdn.microsoft.com/en-us/library/aa746340.aspx
     # IADsUser interface
@@ -504,6 +504,43 @@ 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
@@ -518,6 +555,15 @@ 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

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

@@ -1,4 +1,4 @@
-require 'puppet/ffi/windows'
+require_relative '../../../puppet/ffi/windows'
 
 module Puppet::Util::Windows
 

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

@@ -1,5 +1,5 @@
-require 'puppet/util/windows'
-require 'puppet/error'
+require_relative '../../../puppet/util/windows'
+require_relative '../../../puppet/error'
 
 # represents an error resulting from a Win32 error code
 class Puppet::Util::Windows::Error < Puppet::Error

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

@@ -1,4 +1,4 @@
-require 'puppet/ffi/windows'
+require_relative '../../../puppet/ffi/windows'
 
 module Puppet::Util::Windows::File
   extend Puppet::Util::Windows::String

data/lib/puppet/util/windows/monkey_patches/process.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 require 'ffi'
-require 'puppet/ffi/windows'
-require 'puppet/util/windows/string'
+require_relative '../../../../puppet/ffi/windows'
+require_relative '../../../../puppet/util/windows/string'
 
 module Process
   extend FFI::Library

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

@@ -1,4 +1,4 @@
-require 'puppet/util/windows'
+require_relative '../../../puppet/util/windows'
 
 module Puppet::Util::Windows::SID
   class Principal
@@ -44,7 +44,8 @@ module Puppet::Util::Windows::SID
     ERROR_INVALID_PARAMETER   = 87
     ERROR_INSUFFICIENT_BUFFER = 122
 
-    def self.lookup_account_name(system_name = nil, account_name)
+    def self.lookup_account_name(system_name = nil, sanitize = true, account_name)
+      account_name = sanitize_account_name(account_name) if sanitize
       system_name_ptr = FFI::Pointer::NULL
       begin
         if system_name
@@ -146,6 +147,13 @@ module Puppet::Util::Windows::SID
       end
     end
 
+    # Sanitize the given account name for lookup to avoid known issues
+    def self.sanitize_account_name(account_name)
+      return account_name unless account_name.start_with?('APPLICATION PACKAGE AUTHORITY\\')
+      account_name.split('\\').last
+    end
+    private_class_method :sanitize_account_name
+
     ffi_convention :stdcall
 
     # https://msdn.microsoft.com/en-us/library/windows/desktop/aa379601(v=vs.85).aspx
@@ -191,4 +199,3 @@ module Puppet::Util::Windows::SID
       [:lpcwstr, :pointer, :lpwstr, :lpdword, :lpwstr, :lpdword, :pointer], :win32_bool
   end
 end
-

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

@@ -1,5 +1,5 @@
-require 'puppet/util/windows/monkey_patches/process'
-require 'puppet/ffi/windows'
+require_relative '../../../puppet/util/windows/monkey_patches/process'
+require_relative '../../../puppet/ffi/windows'
 
 module Puppet::Util::Windows::Process
   extend Puppet::FFI::Windows::Functions

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

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

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

@@ -1,5 +1,5 @@
-require 'puppet/util/windows'
-require 'puppet/ssl/openssl_loader'
+require_relative '../../../puppet/util/windows'
+require_relative '../../../puppet/ssl/openssl_loader'
 require 'ffi'
 
 # Represents a collection of trusted root certificates.

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

@@ -61,7 +61,7 @@
 #   automatically rebuild the access control list based on the new
 #   (and different) owner or group.
 
-require 'puppet/util/windows'
+require_relative '../../../puppet/util/windows'
 require 'pathname'
 require 'ffi'
 

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

@@ -8,7 +8,7 @@
 # @see https://msdn.microsoft.com/en-us/library/windows/desktop/aa379563(v=vs.85).aspx
 # @api private
 class Puppet::Util::Windows::SecurityDescriptor
-  require 'puppet/util/windows/security'
+  require_relative '../../../puppet/util/windows/security'
   include Puppet::Util::Windows::SID
 
   attr_reader :owner, :group, :dacl