puppet 8.3.1-x86-mingw32 → 8.5.0-x86-mingw32

data/lib/puppet/util/selinux.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Provides utility functions to help interface Puppet to SELinux.
 #
 # This requires the very new SELinux Ruby bindings.  These bindings closely
@@ -13,7 +14,6 @@ Puppet.features.selinux? # check, but continue even if it's not
 require 'pathname'
 
 module Puppet::Util::SELinux
-
   S_IFREG = 0100000
   S_IFDIR = 0040000
   S_IFLNK = 0120000
@@ -23,6 +23,7 @@ module Puppet::Util::SELinux
     if Selinux.is_selinux_enabled == 1
       return true
     end
+
     false
   end
 
@@ -34,20 +35,23 @@ module Puppet::Util::SELinux
   # SELinux support or if the SELinux call fails then return nil.
   def get_selinux_current_context(file)
     return nil unless selinux_support?
+
     retval = Selinux.lgetfilecon(file)
     if retval == -1
       return nil
     end
+
     retval[1]
   end
 
   # 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, 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
     return nil unless selinux_label_support?(file)
+
     # If the file exists we should pass the mode to matchpathcon for the most specific
     # matching.  If not, we can pass a mode of 0.
     begin
@@ -67,6 +71,7 @@ module Puppet::Util::SELinux
     if retval == -1
       return nil
     end
+
     retval[1]
   end
 
@@ -77,10 +82,12 @@ module Puppet::Util::SELinux
     if context.nil? or context == "unlabeled"
       return nil
     end
+
     components = /^([^\s:]+):([^\s:]+):([^\s:]+)(?::([\sa-zA-Z0-9:,._-]+))?$/.match(context)
     unless components
       raise Puppet::Error, _("Invalid context to parse: %{context}") % { context: context }
     end
+
     case component
     when :seluser
       components[1]
@@ -117,16 +124,16 @@ module Puppet::Util::SELinux
       end
       context = context.split(':')
       case component
-        when :seluser
-          context[0] = value
-        when :selrole
-          context[1] = value
-        when :seltype
-          context[2] = value
-        when :selrange
-          context[3] = value
-        else
-          raise ArgumentError, _("set_selinux_context component must be one of :seluser, :selrole, :seltype, or :selrange")
+      when :seluser
+        context[0] = value
+      when :selrole
+        context[1] = value
+      when :seltype
+        context[2] = value
+      when :selrange
+        context[3] = value
+      else
+        raise ArgumentError, _("set_selinux_context component must be one of :seluser, :selrole, :seltype, or :selrange")
       end
       context = context.join(':')
     else
@@ -147,9 +154,10 @@ 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)
+  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
       set_selinux_context(file, new_context)
@@ -180,6 +188,7 @@ module Puppet::Util::SELinux
         line.strip!
         next if line.empty?
         next if line[0] == "#" # skip comments
+
         line.gsub!(/[[:space:]]+/m, '')
         mapping = line.split("=", 2)
         if category == mapping[1]
@@ -205,6 +214,7 @@ module Puppet::Util::SELinux
   def selinux_label_support?(file)
     fstype = find_fs(file)
     return false if fstype.nil?
+
     filesystems = ['ext2', 'ext3', 'ext4', 'gfs', 'gfs2', 'xfs', 'jfs', 'btrfs', 'tmpfs', 'zfs']
     filesystems.include?(fstype)
   end
@@ -232,7 +242,7 @@ module Puppet::Util::SELinux
       if File.method_defined? "read_nonblock"
         # If possible we use read_nonblock in a loop rather than read to work-
         # a linux kernel bug.  See ticket #1963 for details.
-        mountfh = File.open("/proc/mounts")
+        mountfh = File.new("/proc/mounts")
         loop do
           mounts += mountfh.read_nonblock(1024)
         end
@@ -257,6 +267,7 @@ module Puppet::Util::SELinux
     mounts.each_line do |line|
       params = line.split(' ')
       next if params[2] == 'rootfs'
+
       mntpoint[params[1]] = params[2]
     end
     mntpoint

data/lib/puppet/util/skip_tags.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/util/tagging'
 
 class Puppet::Util::SkipTags

data/lib/puppet/util/splayer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Handle splay options (sleeping for a random interval before executing)
 module Puppet::Util::Splayer
   # Have we splayed already?

data/lib/puppet/util/storage.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'yaml'
 require 'singleton'
 require_relative '../../puppet/util/yaml'
@@ -88,7 +89,7 @@ class Puppet::Util::Storage
       Puppet::Util.benchmark(:debug, "Pruned old state cache entries in %{seconds} seconds") do
         ttl_cutoff = Time.now - Puppet[:statettl]
 
-        @@state.reject! do |k,v|
+        @@state.reject! do |k, _v|
           @@state[k][:checked] && @@state[k][:checked] < ttl_cutoff
         end
       end

data/lib/puppet/util/suidmanager.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/util/warnings'
 require 'forwardable'
 require 'etc'
@@ -9,7 +10,7 @@ module Puppet::Util::SUIDManager
 
   # Note groups= is handled specially due to a bug in OS X 10.6, 10.7,
   # and probably upcoming releases...
-  to_delegate_to_process = [ :euid=, :euid, :egid=, :egid, :uid=, :uid, :gid=, :gid, :groups ]
+  to_delegate_to_process = [:euid=, :euid, :egid=, :egid, :uid=, :uid, :gid=, :gid, :groups]
 
   to_delegate_to_process.each do |method|
     def_delegator Process, method
@@ -18,15 +19,16 @@ module Puppet::Util::SUIDManager
 
   def osx_maj_ver
     return @osx_maj_ver unless @osx_maj_ver.nil?
+
     @osx_maj_ver = Puppet.runtime[:facter].value('os.macosx.version.major') || false
   end
   module_function :osx_maj_ver
 
   def groups=(grouplist)
     begin
-      return Process.groups = grouplist
+      Process.groups = grouplist
     rescue Errno::EINVAL => e
-      #We catch Errno::EINVAL as some operating systems (OS X in particular) can
+      # We catch Errno::EINVAL as some operating systems (OS X in particular) can
       # cause troubles when using Process#groups= to change *this* user / process
       # list of supplementary groups membership.  This is done via Ruby's function
       # "static VALUE proc_setgroups(VALUE obj, VALUE ary)" which is effectively
@@ -37,9 +39,7 @@ module Puppet::Util::SUIDManager
       # operating system side.  Therefore we catch the exception and look whether
       # we run under OS X or not -- if so, then we acknowledge the problem and
       # re-throw the exception otherwise.
-      if osx_maj_ver and not osx_maj_ver.empty?
-        return true
-      else
+      if !osx_maj_ver || osx_maj_ver.empty?
         raise e
       end
     end
@@ -62,7 +62,7 @@ module Puppet::Util::SUIDManager
   # Runs block setting euid and egid if provided then restoring original ids.
   # If running on Windows or without root, the block will be run with the
   # current euid/egid.
-  def asuser(new_uid=nil, new_gid=nil)
+  def asuser(new_uid = nil, new_gid = nil)
     return yield if Puppet::Util::Platform.windows?
     return yield unless root?
     return yield unless new_uid or new_gid
@@ -83,7 +83,7 @@ module Puppet::Util::SUIDManager
   # the primary group of the supplied gid will be used. If only gid is
   # supplied, only gid will be changed. This method will fail if used on
   # Windows.
-  def change_privileges(uid=nil, gid=nil, permanently=false)
+  def change_privileges(uid = nil, gid = nil, permanently = false)
     return unless uid or gid
 
     unless gid
@@ -99,7 +99,7 @@ module Puppet::Util::SUIDManager
   # Changes the egid of the process if `permanently` is not set, otherwise
   # changes gid. This method will fail if used on Windows, or attempting to
   # change to a different gid without root.
-  def change_group(group, permanently=false)
+  def change_group(group, permanently = false)
     gid = convert_xid(:gid, group)
     raise Puppet::Error, _("No such group %{group}") % { group: group } unless gid
 
@@ -115,7 +115,7 @@ module Puppet::Util::SUIDManager
 
   # As change_group, but operates on uids. If changing user permanently,
   # supplementary groups will be set the to default groups for the new uid.
-  def change_user(user, permanently=false)
+  def change_user(user, permanently = false)
     uid = convert_xid(:uid, user)
     raise Puppet::Error, _("No such user %{user}") % { user: user } unless uid
 
@@ -126,30 +126,31 @@ module Puppet::Util::SUIDManager
       initgroups(uid)
 
       Process::UID.change_privilege(uid)
-    else
+    elsif Process.euid == 0
       # We must be root to initgroups, so initgroups before dropping euid if
       # we're root, otherwise elevate euid before initgroups.
       # change euid (to root) first.
-      if Process.euid == 0
-        initgroups(uid)
-        Process.euid = uid
-      else
-        Process.euid = uid
-        initgroups(uid)
-      end
+      initgroups(uid)
+      Process.euid = uid
+    else
+      Process.euid = uid
+      initgroups(uid)
     end
   end
   module_function :change_user
 
   # Make sure the passed argument is a number.
   def convert_xid(type, id)
-    return id if id.kind_of? Integer
-    map = {:gid => :group, :uid => :user}
+    return id if id.is_a? Integer
+
+    map = { :gid => :group, :uid => :user }
     raise ArgumentError, _("Invalid id type %{type}") % { type: type } unless map.include?(type)
+
     ret = Puppet::Util.send(type, id)
     if ret == nil
       raise Puppet::Error, _("Invalid %{klass}: %{id}") % { klass: map[type], id: id }
     end
+
     ret
   end
   module_function :convert_xid

data/lib/puppet/util/symbolic_file_mode.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/util'
 
 module Puppet
@@ -17,6 +18,7 @@ module SymbolicFileMode
     value = normalize_symbolic_mode(value)
     return true if value =~ /^0?[0-7]{1,4}$/
     return true if value =~ /^([ugoa]*[-=+][-=+rstwxXugo]*)(,[ugoa]*[-=+][-=+rstwxXugo]*)*$/
+
     return false
   end
 
@@ -36,9 +38,10 @@ module SymbolicFileMode
     # "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
+    case value
+    when Numeric
       value.to_s(8)
-    elsif value =~ /^0?[0-7]{1,4}$/
+    when /^0?[0-7]{1,4}$/
       value.to_i(8).to_s(8) # strip leading 0's
     else
       value
@@ -75,6 +78,7 @@ module SymbolicFileMode
       begin
         _, to, dsl = /^([ugoa]*)([-+=].*)$/.match(part).to_a
         if dsl.nil? then raise Puppet::Error, _('Missing action') end
+
         to = "a" unless to and to.length > 0
 
         # We want a snapshot of the mode before we start messing with it to
@@ -82,17 +86,17 @@ module SymbolicFileMode
         # the original mode, the final mode, or the current snapshot of the
         # mode, for added fun.
         snapshot_mode = {}
-        final_mode.each {|k,v| snapshot_mode[k] = v }
+        final_mode.each { |k, v| snapshot_mode[k] = v }
 
         to.gsub('a', 'ugo').split('').uniq.each do |who|
           value = snapshot_mode[who]
 
           action = '!'
           actions = {
-            '!' => lambda {|_,_| raise Puppet::Error, _('Missing operation (-, =, or +)') },
-            '=' => lambda {|m,v| m | v },
-            '+' => lambda {|m,v| m | v },
-            '-' => lambda {|m,v| m & ~v },
+            '!' => ->(_, _) { raise Puppet::Error, _('Missing operation (-, =, or +)') },
+            '=' => ->(m, v) { m | v },
+            '+' => ->(m, v) { m | v },
+            '-' => ->(m, v) { m & ~v },
           }
 
           dsl.split('').each do |op|
@@ -133,7 +137,6 @@ module SymbolicFileMode
           # Now, assign back the value.
           final_mode[who] = value
         end
-
       rescue Puppet::Error => e
         if part.inspect != modification.inspect
           rest = " at #{part.inspect}"

data/lib/puppet/util/tag_set.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'set'
 require_relative '../../puppet/network/format_support'
 

data/lib/puppet/util/tagging.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/util/tag_set'
 
 module Puppet::Util::Tagging
@@ -20,7 +21,7 @@ module Puppet::Util::Tagging
         # not seen before, so now we test if it is valid
         if valid_tag?(name)
           if split_qualified_tags?
-          # avoid adding twice by first testing if the string contains '::'
+            # avoid adding twice by first testing if the string contains '::'
             @tags.merge(name.split('::')) if name.include?('::')
           end
         else
@@ -33,7 +34,7 @@ module Puppet::Util::Tagging
 
   # Add a name to the current tag set. Silently ignore names that does not
   # represent valid tags.
-  # 
+  #
   # Use this method instead of doing this:
   #
   #  tag(name) if is_valid?(name)
@@ -58,7 +59,7 @@ module Puppet::Util::Tagging
   # @return [Boolean] true if this instance is tagged with at least one of the provided tags
   #
   def tagged?(*tags)
-    raw_tagged?(tags.collect {|t| t.to_s.downcase})
+    raw_tagged?(tags.collect { |t| t.to_s.downcase })
   end
 
   # Answers if this resource is tagged with at least one of the tags given in downcased string form.

data/lib/puppet/util/terminal.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Util::Terminal
   # Attempts to determine the width of the terminal.  This is currently only
   # supported on POSIX systems, and relies on the claims of `stty` (or `tput`).

data/lib/puppet/util/user_attr.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class UserAttr
   def self.get_attributes_by_name(name)
     attributes = nil
@@ -9,7 +10,7 @@ class UserAttr
       token = line.split(':')
 
       if token[0] == name
-        attributes = {:name => name}
+        attributes = { :name => name }
         token[4].split(';').each do |attr|
           key_value = attr.split('=')
           attributes[key_value[0].intern] = key_value[1].strip

data/lib/puppet/util/warnings.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Methods to help with handling warnings.
 module Puppet::Util::Warnings
   module_function
@@ -9,6 +10,7 @@ module Puppet::Util::Warnings
 
   def debug_once(msg)
     return nil unless Puppet[:debug]
+
     Puppet::Util::Warnings.maybe_log(msg, self.class) { Puppet.debug msg }
   end
 
@@ -25,6 +27,7 @@ module Puppet::Util::Warnings
     @stampwarnings ||= {}
     @stampwarnings[klass] ||= []
     return nil if @stampwarnings[klass].include? message
+
     yield
     @stampwarnings[klass] << message
     nil

data/lib/puppet/util/watched_file.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/util/watcher'
 
 # Monitor a given file for changes on a periodic interval. Changes are detected
@@ -18,7 +19,8 @@ class Puppet::Util::WatchedFile
 
     @info = Puppet::Util::Watcher::PeriodicWatcher.new(
       Puppet::Util::Watcher::Common.file_ctime_change_watcher(@filename),
-      timer)
+      timer
+    )
   end
 
   # @return [true, false] If the file has changed since it was last checked.

data/lib/puppet/util/watcher/change_watcher.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Watches for changes over time. It only re-examines the values when it is requested to update readings.
 # @api private
 class Puppet::Util::Watcher::ChangeWatcher

data/lib/puppet/util/watcher/periodic_watcher.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Monitor a given watcher for changes on a periodic interval.
 class Puppet::Util::Watcher::PeriodicWatcher
   # @param watcher [Puppet::Util::Watcher::ChangeWatcher] a watcher for the value to watch
@@ -35,4 +36,3 @@ class Puppet::Util::Watcher::PeriodicWatcher
     end
   end
 end
-

data/lib/puppet/util/watcher/timer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Puppet::Util::Watcher::Timer
   attr_reader :timeout
 

data/lib/puppet/util/watcher.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Puppet::Util::Watcher
   require_relative 'watcher/timer'
   require_relative 'watcher/change_watcher'

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Windows Access Control Entry
 #
 # Represents an access control entry, which grants or denies a subject,

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Windows Access Control List
 #
 # Represents a list of access control entries (ACEs).
@@ -26,7 +27,7 @@ class Puppet::Util::Windows::AccessControlList
   #
   # @yieldparam ace [Hash] the ace
   def each
-    @aces.each {|ace| yield ace}
+    @aces.each { |ace| yield ace }
   end
 
   # Allow the +sid+ to access a resource with the specified access +mask+.
@@ -70,8 +71,8 @@ class Puppet::Util::Windows::AccessControlList
           # flags except those affecting inheritance of the
           # ACE we're creating.
           inherit_mask = Puppet::Util::Windows::AccessControlEntry::CONTAINER_INHERIT_ACE |
-            Puppet::Util::Windows::AccessControlEntry::OBJECT_INHERIT_ACE |
-            Puppet::Util::Windows::AccessControlEntry::INHERIT_ONLY_ACE
+                         Puppet::Util::Windows::AccessControlEntry::OBJECT_INHERIT_ACE |
+                         Puppet::Util::Windows::AccessControlEntry::INHERIT_ONLY_ACE
           explicit_ace = Puppet::Util::Windows::AccessControlEntry.new(new_sid, ace.mask, ace.flags & inherit_mask, ace.type)
           aces_to_prepend << explicit_ace
         else
@@ -88,8 +89,9 @@ class Puppet::Util::Windows::AccessControlList
     if prepend_needed
       mask = Puppet::Util::Windows::File::STANDARD_RIGHTS_ALL | Puppet::Util::Windows::File::SPECIFIC_RIGHTS_ALL
       ace = Puppet::Util::Windows::AccessControlEntry.new(
-              Puppet::Util::Windows::SID::LocalSystem,
-              mask)
+        Puppet::Util::Windows::SID::LocalSystem,
+        mask
+      )
       @aces << ace
     end