puppet 7.3.0-x64-mingw32 → 7.7.0-x64-mingw32

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

@@ -17,6 +17,8 @@ Puppet::Type.type(:service).provide :debian, :parent => :init do
   commands :invoke_rc => "/usr/sbin/invoke-rc.d"
   commands :service => "/usr/sbin/service"
 
+  confine :false => Puppet::FileSystem.exist?('/proc/1/comm') && Puppet::FileSystem.read('/proc/1/comm').include?('systemd')
+
   defaultfor :operatingsystem => :cumuluslinux, :operatingsystemmajrelease => ['1','2']
   defaultfor :operatingsystem => :debian, :operatingsystemmajrelease => ['5','6','7']
   defaultfor :operatingsystem => :devuan
@@ -32,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`.
@@ -30,7 +30,7 @@ Puppet::Type.type(:service).provide :systemd, :parent => :base do
   def self.instances
     i = []
     output = systemctl('list-unit-files', '--type', 'service', '--full', '--all',  '--no-pager')
-    output.scan(/^(\S+)\s+(disabled|enabled|masked|indirect|bad|static)\s*$/i).each do |m|
+    output.scan(/^(\S+)\s+(disabled|enabled|masked|indirect|bad|static)\s*([^-]\S+)?\s*$/i).each do |m|
       Puppet.debug("#{m[0]} marked as bad by `systemctl`. It is recommended to be further checked.") if m[1] == "bad"
       i << new(:name => m[0])
     end
@@ -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'
 

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

@@ -1,5 +1,5 @@
-require 'puppet'
-require 'puppet/util/plist' if Puppet.features.cfpropertylist?
+require_relative '../../../puppet'
+require_relative '../../../puppet/util/plist' if Puppet.features.cfpropertylist?
 require 'base64'
 
 Puppet::Type.type(:user).provide :directoryservice do

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

@@ -1,4 +1,4 @@
-require 'puppet/provider/ldap'
+require_relative '../../../puppet/provider/ldap'
 
 Puppet::Type.type(:user).provide :ldap, :parent => Puppet::Provider::Ldap do
   desc "User management via LDAP.

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

@@ -1,4 +1,4 @@
-require 'puppet/error'
+require_relative '../../../puppet/error'
 
 Puppet::Type.type(:user).provide :openbsd, :parent => :useradd do
   desc "User management via `useradd` and its ilk for OpenBSD. Note that you

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

@@ -1,4 +1,4 @@
-require 'puppet/provider/nameservice/pw'
+require_relative '../../../puppet/provider/nameservice/pw'
 require 'open3'
 
 Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::PW do

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

@@ -1,5 +1,5 @@
-require 'puppet/util'
-require 'puppet/util/user_attr'
+require_relative '../../../puppet/util'
+require_relative '../../../puppet/util/user_attr'
 require 'date'
 
 Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source => :useradd do

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

@@ -1,8 +1,8 @@
-require 'puppet/provider/nameservice/objectadd'
+require_relative '../../../puppet/provider/nameservice/objectadd'
 require 'date'
-require 'puppet/util/libuser'
+require_relative '../../../puppet/util/libuser'
 require 'time'
-require 'puppet/error'
+require_relative '../../../puppet/error'
 
 Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameService::ObjectAdd do
   desc "User management via `useradd` and its ilk.  Note that you will need to
@@ -59,23 +59,37 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
      get(:uid)
   end
 
+  def gid
+     return localgid if @resource.forcelocal?
+     get(:gid)
+  end
+
   def comment
      return localcomment if @resource.forcelocal?
      get(:comment)
   end
 
+  def groups
+     return localgroups if @resource.forcelocal?
+     super
+  end
+
   def finduser(key, value)
-    passwd_file = "/etc/passwd"
+    passwd_file = '/etc/passwd'
     passwd_keys = [:account, :password, :uid, :gid, :gecos, :directory, :shell]
-    index = passwd_keys.index(key)
-    @passwd_content ||= File.read(passwd_file)
-    @passwd_content.each_line do |line|
-      user = line.split(":")
-      if user[index] == value
-        return Hash[passwd_keys.zip(user)]
+
+    unless @users
+      unless Puppet::FileSystem.exist?(passwd_file)
+        raise Puppet::Error.new("Forcelocal set for user resource '#{resource[:name]}', but #{passwd_file} does not exist")
+      end
+
+      @users = []
+      Puppet::FileSystem.each_line(passwd_file) do |line|
+        user = line.chomp.split(':')
+        @users << Hash[passwd_keys.zip(user)]
       end
     end
-    false
+    @users.find { |param| param[key] == value } || false
   end
 
   def local_username
@@ -88,16 +102,56 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     false
   end
 
+  def localgid
+    user = finduser(:account, resource[:name])
+    if user
+      begin
+        return Integer(user[:gid])
+      rescue ArgumentError
+        Puppet.debug("Non-numeric GID found in /etc/passwd for user #{resource[:name]}")
+        return user[:gid]
+      end
+    end
+    false
+  end
+
   def localcomment
     user = finduser(:account, resource[:name])
     user[:gecos]
   end
 
+  def localgroups
+    @groups_of ||= {}
+    group_file = '/etc/group'
+    user = resource[:name]
+
+    return @groups_of[user] if @groups_of[user]
+
+    @groups_of[user] = []
+
+    unless Puppet::FileSystem.exist?(group_file)
+      raise Puppet::Error.new("Forcelocal set for user resource '#{user}', but #{group_file} does not exist")
+    end
+
+    Puppet::FileSystem.each_line(group_file) do |line|
+      data = line.chomp.split(':')
+      if !data.empty? && data.last.split(',').include?(user)
+        @groups_of[user] << data.first
+      end
+    end
+
+    @groups_of[user]
+  end
+
   def shell=(value)
     check_valid_shell
     set(:shell, value)
   end
 
+  def groups=(value)
+    set(:groups, value)
+  end
+
   verify :gid, "GID must be an integer" do |value|
     value.is_a? Integer
   end