puppet 7.6.1 → 7.7.0

data/lib/puppet/provider/package/pkgdmg.rb

@@ -8,9 +8,9 @@
 # As a result, we store installed .pkg.dmg file names
 # in /var/db/.puppet_pkgdmg_installed_<name>
 
-require 'puppet/provider/package'
-require 'puppet/util/plist'
-require 'puppet/util/http_proxy'
+require_relative '../../../puppet/provider/package'
+require_relative '../../../puppet/util/plist'
+require_relative '../../../puppet/util/http_proxy'
 
 Puppet::Type.type(:package).provide :pkgdmg, :parent => Puppet::Provider::Package do
   desc "Package management based on Apple's Installer.app and DiskUtility.app.

data/lib/puppet/provider/package/pkgin.rb

@@ -1,4 +1,4 @@
-require "puppet/provider/package"
+require_relative '../../../puppet/provider/package'
 
 Puppet::Type.type(:package).provide :pkgin, :parent => Puppet::Provider::Package do
   desc "Package management using pkgin, a binary package manager for pkgsrc."

data/lib/puppet/provider/package/pkgng.rb

@@ -1,4 +1,4 @@
-require 'puppet/provider/package'
+require_relative '../../../puppet/provider/package'
 
 Puppet::Type.type(:package).provide :pkgng, :parent => Puppet::Provider::Package do
   desc "A PkgNG provider for FreeBSD and DragonFly."

data/lib/puppet/provider/package/portage.rb

@@ -1,4 +1,4 @@
-require 'puppet/provider/package'
+require_relative '../../../puppet/provider/package'
 require 'fileutils'
 
 Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Package do

data/lib/puppet/provider/package/portupgrade.rb

@@ -1,5 +1,5 @@
 # Whole new package, so include pack stuff
-require 'puppet/provider/package'
+require_relative '../../../puppet/provider/package'
 
 Puppet::Type.type(:package).provide :portupgrade, :parent => Puppet::Provider::Package do
   include Puppet::Util::Execution

data/lib/puppet/provider/package/rpm.rb

@@ -1,5 +1,5 @@
-require 'puppet/provider/package'
-require 'puppet/util/rpm_compare'
+require_relative '../../../puppet/provider/package'
+require_relative '../../../puppet/util/rpm_compare'
 
 # RPM packaging.  Should work anywhere that has rpm installed.
 Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Provider::Package do

data/lib/puppet/provider/package/sun.rb

@@ -1,6 +1,6 @@
 # Sun packaging.
 
-require 'puppet/provider/package'
+require_relative '../../../puppet/provider/package'
 
 Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package do
   desc "Sun's packaging system.  Requires that you specify the source for

data/lib/puppet/provider/package/windows.rb

@@ -1,6 +1,6 @@
-require 'puppet/provider/package'
-require 'puppet/util/windows'
-require 'puppet/provider/package/windows/package'
+require_relative '../../../puppet/provider/package'
+require_relative '../../../puppet/util/windows'
+require_relative 'windows/package'
 
 Puppet::Type.type(:package).provide(:windows, :parent => Puppet::Provider::Package) do
   desc "Windows package management.

data/lib/puppet/provider/package/windows/exe_package.rb

@@ -1,4 +1,4 @@
-require 'puppet/provider/package/windows/package'
+require_relative '../../../../puppet/provider/package/windows/package'
 
 class Puppet::Provider::Package::Windows
   class ExePackage < Puppet::Provider::Package::Windows::Package

data/lib/puppet/provider/package/windows/msi_package.rb

@@ -1,4 +1,4 @@
-require 'puppet/provider/package/windows/package'
+require_relative '../../../../puppet/provider/package/windows/package'
 
 class Puppet::Provider::Package::Windows
   class MsiPackage < Puppet::Provider::Package::Windows::Package

data/lib/puppet/provider/package/windows/package.rb

@@ -1,5 +1,5 @@
-require 'puppet/provider/package'
-require 'puppet/util/windows'
+require_relative '../../../../puppet/provider/package'
+require_relative '../../../../puppet/util/windows'
 
 class Puppet::Provider::Package::Windows
   class Package
@@ -105,5 +105,5 @@ class Puppet::Provider::Package::Windows
   end
 end
 
-require 'puppet/provider/package/windows/msi_package'
-require 'puppet/provider/package/windows/exe_package'
+require_relative '../../../../puppet/provider/package/windows/msi_package'
+require_relative '../../../../puppet/provider/package/windows/exe_package'

data/lib/puppet/provider/package/yum.rb

@@ -1,6 +1,6 @@
-require 'puppet/util/package/version/range'
-require 'puppet/util/package/version/rpm'
-require 'puppet/util/rpm_compare'
+require_relative '../../../puppet/util/package/version/range'
+require_relative '../../../puppet/util/package/version/rpm'
+require_relative '../../../puppet/util/rpm_compare'
 
 Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
   # provides Rpm parsing and comparison

data/lib/puppet/provider/package_targetable.rb

@@ -7,7 +7,7 @@
 # possibly via a `prefetchV2` method that could take a better data structure.)
 #
 # In addition, `Puppet::Provider::Package::properties` calls `query` in the provider.
-require 'puppet/provider/package'
+require_relative '../../puppet/provider/package'
 
 # But `query` in the provider depends upon whether a `command` attribute is defined for the resource.
 # This is a Catch-22.

data/lib/puppet/provider/parsedfile.rb

@@ -1,6 +1,6 @@
-require 'puppet'
-require 'puppet/util/filetype'
-require 'puppet/util/fileparsing'
+require_relative '../../puppet'
+require_relative '../../puppet/util/filetype'
+require_relative '../../puppet/util/fileparsing'
 
 # This provider can be used as the parent class for a provider that
 # parses and generates files.  Its content must be loaded via the

data/lib/puppet/provider/service/base.rb

@@ -68,10 +68,10 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
   def status
     if @resource[:status] or statuscmd
       # Don't fail when the exit status is not 0.
-      ucommand(:status, false)
+      status = service_command(:status, false)
 
       # Explicitly calling exitstatus to facilitate testing
-      if $CHILD_STATUS.exitstatus == 0
+      if status.exitstatus == 0
         return :running
       else
         return :stopped
@@ -93,7 +93,8 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
 
   # Run the 'start' parameter command, or the specified 'startcmd'.
   def start
-    ucommand(:start)
+    service_command(:start)
+    nil
   end
 
   # The command used to start.  Generated if the 'binary' argument
@@ -114,7 +115,8 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
   # This method will generally not be overridden by submodules.
   def stop
     if @resource[:stop] or stopcmd
-      ucommand(:stop)
+      service_command(:stop)
+      nil
     else
       pid = getpid
       unless pid

data/lib/puppet/provider/service/daemontools.rb

@@ -128,7 +128,6 @@ Puppet::Type.type(:service).provide :daemontools, :parent => :base do
       if resource[:manifest]
         Puppet.notice "Configuring #{resource[:name]}"
         command = [ resource[:manifest], resource[:name] ]
-        #texecute("setupservice", command)
         system("#{command}")
       end
   rescue Puppet::ExecutionFailure => detail

data/lib/puppet/provider/service/debian.rb

@@ -34,16 +34,14 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
   end
 
   def enabled?
-    # TODO: Replace system call when Puppet::Util::Execution.execute gives us a way
-    # to determine exit status.  https://projects.puppetlabs.com/issues/2538
-    system("/usr/sbin/invoke-rc.d", "--quiet", "--query", @resource[:name], "start")
+    status = execute(["/usr/sbin/invoke-rc.d", "--quiet", "--query", @resource[:name], "start"], :failonfail => false)
 
     # 104 is the exit status when you query start an enabled service.
     # 106 is the exit status when the policy layer supplies a fallback action
     # See x-man-page://invoke-rc.d
-    if [104, 106].include?($CHILD_STATUS.exitstatus)
+    if [104, 106].include?(status.exitstatus)
       return :true
-    elsif [101, 105].include?($CHILD_STATUS.exitstatus)
+    elsif [101, 105].include?(status.exitstatus)
       # 101 is action not allowed, which means we have to do the check manually.
       # 105 is unknown, which generally means the initscript does not support query
       # The debian policy states that the initscript should support methods of query

data/lib/puppet/provider/service/init.rb

@@ -170,7 +170,7 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     (@resource[:hasrestart] == :true) && [initscript, :restart]
   end
 
-  def texecute(type, command, fof = true, squelch = false, combine = true)
+  def service_execute(type, command, fof = true, squelch = false, combine = true)
     if type == :start && Facter.value(:osfamily) == "Solaris"
         command =  ["/usr/bin/ctrun -l child", command].flatten.join(" ")
     end

data/lib/puppet/provider/service/launchd.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/plist'
+require_relative '../../../puppet/util/plist'
 Puppet::Type.type(:service).provide :launchd, :parent => :base do
   desc <<-'EOT'
     This provider manages jobs with `launchd`, which is the default service
@@ -262,7 +262,10 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   # conditionally enable at load, then disable by modifying the plist file
   # directly.
   def start
-    return ucommand(:start) if resource[:start]
+    if resource[:start]
+      service_command(:start)
+      return nil
+    end
     job_path, _ = plist_from_label(resource[:name])
     did_enable_job = false
     cmds = []
@@ -285,7 +288,10 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
 
 
   def stop
-    return ucommand(:stop) if resource[:stop]
+    if resource[:stop]
+      service_command(:stop)
+      return nil
+    end
     job_path, _ = plist_from_label(resource[:name])
     did_disable_job = false
     cmds = []

data/lib/puppet/provider/service/service.rb

@@ -8,7 +8,8 @@ Puppet::Type.type(:service).provide :service do
   # How to restart the process.
   def restart
     if @resource[:restart] or restartcmd
-      ucommand(:restart)
+      service_command(:restart)
+      nil
     else
       self.stop
       self.start
@@ -19,7 +20,7 @@ Puppet::Type.type(:service).provide :service do
   def restartcmd
   end
 
-  # A simple wrapper so execution failures are a bit more informative.
+  # @deprecated because the exit status is not returned, use service_execute instead
   def texecute(type, command, fof = true, squelch = false, combine = true)
     begin
       execute(command, :failonfail => fof, :override_locale => false, :squelch => squelch, :combine => combine)
@@ -29,7 +30,7 @@ Puppet::Type.type(:service).provide :service do
     nil
   end
 
-  # Use either a specified command or the default for our provider.
+  # @deprecated because the exitstatus is not returned, use service_command instead
   def ucommand(type, fof = true)
     c = @resource[type]
     if c
@@ -39,5 +40,29 @@ Puppet::Type.type(:service).provide :service do
     end
     texecute(type, cmd, fof)
   end
+
+  # Execute a command, failing the resource if the command fails.
+  #
+  # @return [Puppet::Util::Execution::ProcessOutput]
+  def service_execute(type, command, fof = true, squelch = false, combine = true)
+    begin
+      execute(command, :failonfail => fof, :override_locale => false, :squelch => squelch, :combine => combine)
+    rescue Puppet::ExecutionFailure => detail
+      @resource.fail Puppet::Error, "Could not #{type} #{@resource.ref}: #{detail}", detail
+    end
+  end
+
+  # Use either a specified command or the default for our provider.
+  #
+  # @return [Puppet::Util::Execution::ProcessOutput]
+  def service_command(type, fof = true)
+    c = @resource[type]
+    if c
+      cmd = [c]
+    else
+      cmd = [send("#{type}cmd")].flatten
+    end
+    service_execute(type, cmd, fof)
+  end
 end
 

data/lib/puppet/provider/service/smf.rb

@@ -77,30 +77,6 @@ Puppet::Type.type(:service).provide :smf, :parent => :base do
     raise Puppet::Error.new( "Cannot config #{@resource[:name]} to enable it: #{detail}", detail )
   end
 
-  # Returns the service's FMRI. We fail if multiple FMRIs correspond to
-  # @resource[:name].
-  #
-  # If the service does not exist or we fail to get any FMRIs from svcs,
-  # this method will raise a Puppet::ExecutionFailure
-  def service_fmri
-    return @fmri if @fmri
-
-    # `svcs -l` is better to use because we can detect service instances
-    # that have not yet been activated or enabled (i.e. it lets us detect
-    # services that svcadm has not yet touched). `svcs -H -o fmri` is a bit
-    # more limited.
-    lines = svcs("-l", @resource[:name]).chomp.lines.to_a
-    lines.select! { |line| line =~ /^fmri/ }
-    fmris = lines.map! { |line| line.split(' ')[-1].chomp }
-    unless fmris.length == 1
-      raise Puppet::Error.new(
-        "Failed to get #{@resource[:name]}'s FMRI: The pattern '#{@resource[:name]}' matches multiple FMRIs! These are the FMRIs it matches: #{fmris.join(', ')}"
-      )
-    end
-
-    @fmri = fmris.first
-  end
-
   # Returns the service's FMRI. We fail if multiple FMRIs correspond to
   # @resource[:name].
   #

data/lib/puppet/provider/service/src.rb

@@ -53,8 +53,8 @@ Puppet::Type.type(:service).provide :src, :parent => :base do
   end
 
   def enabled?
-    execute([command(:lsitab), @resource[:name]], {:failonfail => false, :combine => true})
-    $CHILD_STATUS.exitstatus == 0 ? :true : :false
+    output = execute([command(:lsitab), @resource[:name]], {:failonfail => false, :combine => true})
+    output.exitstatus == 0 ? :true : :false
   end
 
   def enable

data/lib/puppet/provider/service/systemd.rb

@@ -1,6 +1,6 @@
 # Manage systemd services using systemctl
 
-require 'puppet/file_system'
+require_relative '../../../puppet/file_system'
 
 Puppet::Type.type(:service).provide :systemd, :parent => :base do
   desc "Manages `systemd` services using `systemctl`.
@@ -45,8 +45,13 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   def enabled_insync?(current)
     case cached_enabled?[:output]
     when 'static'
-      Puppet.debug("Unable to enable or disable static service #{@resource[:name]}")
-      return true
+      # masking static services is OK, but enabling/disabling them is not
+      if @resource[:enable] == :mask
+        current == @resource[:enable]
+      else
+        Puppet.debug("Unable to enable or disable static service #{@resource[:name]}")
+        return true
+      end
     when 'indirect'
       Puppet.debug("Service #{@resource[:name]} is in 'indirect' state and cannot be enabled/disabled")
       return true
@@ -119,10 +124,10 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   # whether it is enabled or not. See PUP-5016 for more details.
   #
   def debian_enabled?
-    system("/usr/sbin/invoke-rc.d", "--quiet", "--query", @resource[:name], "start")
-    if [104, 106].include?($CHILD_STATUS.exitstatus)
+    status = execute(["/usr/sbin/invoke-rc.d", "--quiet", "--query", @resource[:name], "start"], :failonfail => false)
+    if [104, 106].include?(status.exitstatus)
       return :true
-    elsif [101, 105].include?($CHILD_STATUS.exitstatus)
+    elsif [101, 105].include?(status.exitstatus)
       # 101 is action not allowed, which means we have to do the check manually.
       # 105 is unknown, which generally means the initscript does not support query
       # The debian policy states that the initscript should support methods of query

data/lib/puppet/provider/service/windows.rb

@@ -128,17 +128,55 @@ Puppet::Type.type(:service).provide :windows, :parent => :service do
     services
   end
 
+  def logonaccount_insync?(current)
+    @normalized_logon_account ||= normalize_logonaccount
+    @resource[:logonaccount] = @normalized_logon_account
+
+    insync = @resource[:logonaccount] == current
+    self.logonpassword = @resource[:logonpassword] if insync
+    insync
+  end
+
   def logonaccount
     return unless Puppet::Util::Windows::Service.exists?(@resource[:name])
     Puppet::Util::Windows::Service.logon_account(@resource[:name])
   end
 
   def logonaccount=(value)
+    validate_logon_credentials
     Puppet::Util::Windows::Service.set_startup_configuration(@resource[:name], options: {logon_account: value, logon_password: @resource[:logonpassword]})
     restart if @resource[:ensure] == :running && [:running, :paused].include?(status)
   end
 
   def logonpassword=(value)
+    validate_logon_credentials
     Puppet::Util::Windows::Service.set_startup_configuration(@resource[:name], options: {logon_password: value})
   end
+
+  private
+
+  def normalize_logonaccount
+    logon_account = @resource[:logonaccount].sub(/^\.\\/, "#{Puppet::Util::Windows::ADSI.computer_name}\\")
+    return 'LocalSystem' if Puppet::Util::Windows::User::localsystem?(logon_account)
+
+    @logonaccount_information ||= Puppet::Util::Windows::SID.name_to_principal(logon_account)
+    return logon_account unless @logonaccount_information
+    return ".\\#{@logonaccount_information.account}" if @logonaccount_information.domain == Puppet::Util::Windows::ADSI.computer_name
+    @logonaccount_information.domain_account
+  end
+
+  def validate_logon_credentials
+    unless Puppet::Util::Windows::User::localsystem?(@normalized_logon_account)
+      raise Puppet::Error.new("\"#{@normalized_logon_account}\" is not a valid account") unless @logonaccount_information && [:SidTypeUser, :SidTypeWellKnownGroup].include?(@logonaccount_information.account_type)
+
+      user_rights = Puppet::Util::Windows::User::get_rights(@logonaccount_information.domain_account) unless Puppet::Util::Windows::User::default_system_account?(@normalized_logon_account)
+      raise Puppet::Error.new("\"#{@normalized_logon_account}\" has the 'Log On As A Service' right set to denied.") if user_rights =~ /SeDenyServiceLogonRight/
+      raise Puppet::Error.new("\"#{@normalized_logon_account}\" is missing the 'Log On As A Service' right.") unless user_rights.nil? || user_rights =~ /SeServiceLogonRight/
+    end
+
+    is_a_predefined_local_account = Puppet::Util::Windows::User::default_system_account?(@normalized_logon_account) || @normalized_logon_account == 'LocalSystem'
+    account_info = @normalized_logon_account.split("\\")
+    able_to_logon = Puppet::Util::Windows::User.password_is?(account_info[1], @resource[:logonpassword], account_info[0]) unless is_a_predefined_local_account
+    raise Puppet::Error.new("The given password is invalid for user '#{@normalized_logon_account}'.") unless is_a_predefined_local_account || able_to_logon
+  end
 end

data/lib/puppet/provider/user/aix.rb

@@ -9,8 +9,8 @@
 #
 # See https://puppet.com/docs/puppet/latest/provider_development.html
 # for more information
-require 'puppet/provider/aix_object'
-require 'puppet/util/posix'
+require_relative '../../../puppet/provider/aix_object'
+require_relative '../../../puppet/util/posix'
 require 'tempfile'
 require 'date'