openvox 7.37.1 → 8.19.0

data/lib/puppet/util/rpm_compare.rb

@@ -1,11 +1,13 @@
-module Puppet::Util::RpmCompare
+# frozen_string_literal: true
 
-  ARCH_LIST = %w(
+require 'English'
+module Puppet::Util::RpmCompare
+  ARCH_LIST = %w[
     noarch i386 i686 ppc ppc64 armv3l armv4b armv4l armv4tl armv5tel
     armv5tejl armv6l armv7l m68kmint s390 s390x ia64 x86_64 sh3 sh4
-  ).freeze
+  ].freeze
 
-  ARCH_REGEX = Regexp.new(ARCH_LIST.join('|\.'))
+  ARCH_REGEX = Regexp.new(ARCH_LIST.map { |arch| "\\.#{arch}" }.join('|'))
 
   # This is an attempt at implementing RPM's
   # lib/rpmvercmp.c rpmvercmp(a, b) in Ruby.
@@ -35,8 +37,8 @@ module Puppet::Util::RpmCompare
       # "handle the tilde separator, it sorts before everything else"
       if str1 =~ /^~/ && str2 =~ /^~/
         # if they both have ~, strip it
-        str1 = str1[1..-1]
-        str2 = str2[1..-1]
+        str1 = str1[1..]
+        str2 = str2[1..]
         next
       elsif str1 =~ /^~/
         return -1
@@ -51,14 +53,14 @@ module Puppet::Util::RpmCompare
       # if the first char of str1 is a digit, grab the chunk of continuous digits from each string
       if str1 =~ /^[0-9]+/
         if str1 =~ /^[0-9]+/
-          segment1 = $~.to_s
-          str1 = $~.post_match
+          segment1 = $LAST_MATCH_INFO.to_s
+          str1 = $LAST_MATCH_INFO.post_match
         else
           segment1 = ''
         end
         if str2 =~ /^[0-9]+/
-          segment2 = $~.to_s
-          str2 = $~.post_match
+          segment2 = $LAST_MATCH_INFO.to_s
+          str2 = $LAST_MATCH_INFO.post_match
         else
           segment2 = ''
         end
@@ -66,14 +68,14 @@ module Puppet::Util::RpmCompare
       # else grab the chunk of continuous alphas from each string (which may be '')
       else
         if str1 =~ /^[A-Za-z]+/
-          segment1 = $~.to_s
-          str1 = $~.post_match
+          segment1 = $LAST_MATCH_INFO.to_s
+          str1 = $LAST_MATCH_INFO.post_match
         else
           segment1 = ''
         end
         if str2 =~ /^[A-Za-z]+/
-          segment2 = $~.to_s
-          str2 = $~.post_match
+          segment2 = $LAST_MATCH_INFO.to_s
+          str2 = $LAST_MATCH_INFO.post_match
         else
           segment2 = ''
         end
@@ -83,6 +85,7 @@ module Puppet::Util::RpmCompare
       # where alpha also includes ''; "numeric segments are always newer than alpha segments"
       if segment2.length == 0
         return 1 if isnum
+
         return -1
       end
 
@@ -100,11 +103,12 @@ module Puppet::Util::RpmCompare
       # be more segments to compare"
       rc = segment1 <=> segment2
       return rc if rc != 0
-    end #end while loop
+    end # end while loop
 
     # if we haven't returned anything yet, "whichever version still has characters left over wins"
     return 1 if str1.length > str2.length
     return -1 if str1.length < str2.length
+
     0
   end
 
@@ -114,8 +118,8 @@ module Puppet::Util::RpmCompare
   def rpm_parse_evr(full_version)
     epoch_index = full_version.index(':')
     if epoch_index
-      epoch = full_version[0,epoch_index]
-      full_version = full_version[epoch_index+1,full_version.length]
+      epoch = full_version[0, epoch_index]
+      full_version = full_version[epoch_index + 1, full_version.length]
     else
       epoch = nil
     end
@@ -127,8 +131,8 @@ module Puppet::Util::RpmCompare
     end
     release_index = full_version.index('-')
     if release_index
-      version = full_version[0,release_index]
-      release = full_version[release_index+1,full_version.length]
+      version = full_version[0, release_index]
+      release = full_version[release_index + 1, full_version.length]
       arch = release.scan(ARCH_REGEX)[0]
       if arch
         architecture = arch.delete('.')
@@ -138,7 +142,7 @@ module Puppet::Util::RpmCompare
       version = full_version
       release = nil
     end
-    return { :epoch => epoch, :version => version, :release => release, :arch => architecture }
+    { :epoch => epoch, :version => version, :release => release, :arch => architecture }
   end
 
   # this method is a native implementation of the
@@ -146,9 +150,10 @@ module Puppet::Util::RpmCompare
   # found in python/header-py.c, as used by rpm.
   def compare_values(s1, s2)
     return 0 if s1.nil? && s2.nil?
-    return 1 if ( not s1.nil? ) && s2.nil?
-    return -1 if s1.nil? && (not s2.nil?)
-    return rpmvercmp(s1, s2)
+    return 1 if !s1.nil? && s2.nil?
+    return -1 if s1.nil? && !s2.nil?
+
+    rpmvercmp(s1, s2)
   end
 
   # how rpm compares two package versions:
@@ -164,12 +169,12 @@ module Puppet::Util::RpmCompare
   # return 1: a is newer than b
   #        0: a and b are the same version
   #       -1: b is newer than a
-  def rpm_compareEVR(should, is)
+  def rpm_compare_evr(should, is)
     # pass on to rpm labelCompare
     should_hash = rpm_parse_evr(should)
     is_hash = rpm_parse_evr(is)
 
-    if !should_hash[:epoch].nil?
+    unless should_hash[:epoch].nil?
       rc = compare_values(should_hash[:epoch], is_hash[:epoch])
       return rc unless rc == 0
     end
@@ -186,8 +191,6 @@ module Puppet::Util::RpmCompare
     # This should NOT be triggered if we're trying to ensure latest.
     return 0 if should_hash[:release].nil?
 
-    rc = compare_values(should_hash[:release], is_hash[:release])
-
-    return rc
+    compare_values(should_hash[:release], is_hash[:release])
   end
 end

data/lib/puppet/util/rubygems.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/util'
 
 module Puppet::Util::RubyGems
-
   # Base/factory class for rubygems source. These classes introspec into
   # rubygems to in order to list where the rubygems system will look for files
   # to load.
@@ -15,7 +16,7 @@ module Puppet::Util::RubyGems
         # rubygems installs. So when Bundler is around we have to act
         # as though rubygems is not, e.g. we shouldn't be able to load
         # a gem that Bundler doesn't want us to see.
-        defined? ::Gem and not defined? ::Bundler
+        defined? ::Gem and !defined? ::Bundler
       end
 
       # @api private
@@ -64,4 +65,3 @@ module Puppet::Util::RubyGems
     def clear_paths; end
   end
 end
-

data/lib/puppet/util/run_mode.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'etc'
 
 module Puppet
@@ -7,7 +9,7 @@ module Puppet
         @name = name.to_sym
       end
 
-      attr :name
+      attr_reader :name
 
       def self.[](name)
         @run_modes ||= {}
@@ -52,7 +54,7 @@ module Puppet
       #
       # @todo this code duplicates {Puppet::Settings#which\_configuration\_file}
       #   as described in {https://projects.puppetlabs.com/issues/16637 #16637}
-      def which_dir( system, user )
+      def which_dir(system, user)
         if Puppet.features.root?
           File.expand_path(system)
         else
@@ -85,6 +87,22 @@ module Puppet
       def log_dir
         which_dir("/var/log/puppetlabs/puppet", "~/.puppetlabs/var/log")
       end
+
+      def pkg_config_path
+        '/opt/puppetlabs/puppet/lib/pkgconfig'
+      end
+
+      def gem_cmd
+        '/opt/puppetlabs/puppet/bin/gem'
+      end
+
+      def common_module_dir
+        '/opt/puppetlabs/puppet/modules'
+      end
+
+      def vendor_module_dir
+        '/opt/puppetlabs/puppet/vendor_modules'
+      end
     end
 
     class WindowsRunMode < RunMode
@@ -112,10 +130,34 @@ module Puppet
         which_dir(File.join(windows_common_base("puppet/var/log")), "~/.puppetlabs/var/log")
       end
 
-    private
+      def pkg_config_path
+        nil
+      end
+
+      def gem_cmd
+        if (puppet_dir = ENV.fetch('PUPPET_DIR', nil))
+          File.join(puppet_dir.to_s, 'bin', 'gem.bat')
+        else
+          File.join(Gem.default_bindir, 'gem.bat')
+        end
+      end
+
+      def common_module_dir
+        "#{installdir}/puppet/modules" if installdir
+      end
+
+      def vendor_module_dir
+        "#{installdir}\\puppet\\vendor_modules" if installdir
+      end
+
+      private
+
+      def installdir
+        ENV.fetch('FACTER_env_windows_installdir', nil)
+      end
 
       def windows_common_base(*extra)
-        [ENV['ALLUSERSPROFILE'], "PuppetLabs"] + extra
+        [ENV.fetch('ALLUSERSPROFILE', nil), "PuppetLabs"] + extra
       end
     end
   end

data/lib/puppet/util/selinux.rb

@@ -1,3 +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
@@ -12,16 +14,16 @@ 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
+  S_IFREG = 0o100000
+  S_IFDIR = 0o040000
+  S_IFLNK = 0o120000
 
   def self.selinux_support?
     return false unless defined?(Selinux)
     if Selinux.is_selinux_enabled == 1
       return true
     end
+
     false
   end
 
@@ -33,40 +35,50 @@ 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)
+  # @deprecated matchpathcon is a deprecated method, selabel_lookup is preferred
+  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
-      filestat = file_lstat(file)
-      mode = filestat.mode
-    rescue Errno::EACCES
-      mode = 0
-    rescue Errno::ENOENT
-      if resource_ensure
-        mode = get_create_mode(resource_ensure)
-      else
-        mode = 0
-      end
-    end
+    mode = file_mode(file, resource_ensure)
 
     retval = Selinux.matchpathcon(file, mode)
-    if retval == -1
-      return nil
-    end
-    retval[1]
+    retval == -1 ? nil : retval[1]
+  end
+
+  # Retrieve and return the default context of the file using an selinux handle.
+  # 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_with_handle(file, handle, 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 selabel_lookup would return
+    return nil unless selinux_label_support?(file)
+
+    # Handle is needed for selabel_lookup
+    raise ArgumentError, _("Cannot get default context with nil handle") unless handle
+
+    # If the file exists we should pass the mode to selabel_lookup for the most specific
+    # matching.  If not, we can pass a mode of 0.
+    mode = file_mode(file, resource_ensure)
+
+    retval = Selinux.selabel_lookup(handle, file, mode)
+    retval == -1 ? nil : retval[1]
   end
 
   # Take the full SELinux context returned from the tools and parse it
@@ -76,10 +88,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]
@@ -116,16 +130,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
@@ -134,10 +148,10 @@ module Puppet::Util::SELinux
 
     retval = Selinux.lsetfilecon(file, context)
     if retval == 0
-      return true
+      true
     else
       Puppet.warning _("Failed to set SELinux context %{context} on %{file}") % { context: context, file: file }
-      return false
+      false
     end
   end
 
@@ -146,9 +160,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)
@@ -179,6 +194,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]
@@ -204,7 +220,8 @@ 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 = %w[ext2 ext3 ext4 gfs gfs2 xfs jfs btrfs tmpfs zfs]
     filesystems.include?(fstype)
   end
 
@@ -224,14 +241,30 @@ module Puppet::Util::SELinux
     mode
   end
 
+  # If the file/directory/symlink exists, return its mode. Otherwise, get the default mode
+  # that should be used to create the file/directory/symlink taking into account the desired
+  # file type specified in +resource_ensure+.
+  def file_mode(file, resource_ensure)
+    filestat = file_lstat(file)
+    filestat.mode
+  rescue Errno::EACCES
+    0
+  rescue Errno::ENOENT
+    if resource_ensure
+      get_create_mode(resource_ensure)
+    else
+      0
+    end
+  end
+
   # Internal helper function to read and parse /proc/mounts
   def read_mounts
-    mounts = ""
+    mounts = ''.dup
     begin
       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
@@ -256,6 +289,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
@@ -282,7 +316,7 @@ module Puppet::Util::SELinux
     end
 
     # Should never be reached...
-    return mounts['/']
+    mounts['/']
   end
 
   ##

data/lib/puppet/util/skip_tags.rb

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

data/lib/puppet/util/splayer.rb

@@ -1,3 +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,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'singleton'
 require_relative '../../puppet/util/yaml'
@@ -38,14 +40,14 @@ class Puppet::Util::Storage
     @@state = {}
   end
 
-  self.init
+  init
 
   def self.load
     Puppet.settings.use(:main) unless FileTest.directory?(Puppet[:statedir])
     filename = Puppet[:statefile]
 
     unless Puppet::FileSystem.exist?(filename)
-      self.init if @@state.nil?
+      init if @@state.nil?
       return
     end
     unless File.file?(filename)
@@ -53,22 +55,20 @@ class Puppet::Util::Storage
       return
     end
     Puppet::Util.benchmark(:debug, "Loaded state in %{seconds} seconds") do
+      @@state = Puppet::Util::Yaml.safe_load_file(filename, [Symbol, Time])
+    rescue Puppet::Util::Yaml::YamlLoadError => detail
+      Puppet.err _("Checksumfile %{filename} is corrupt (%{detail}); replacing") % { filename: filename, detail: detail }
+
       begin
-        @@state = Puppet::Util::Yaml.safe_load_file(filename, [Symbol, Time])
-      rescue Puppet::Util::Yaml::YamlLoadError => detail
-        Puppet.err _("Checksumfile %{filename} is corrupt (%{detail}); replacing") % { filename: filename, detail: detail }
-
-        begin
-          File.rename(filename, filename + ".bad")
-        rescue
-          raise Puppet::Error, _("Could not rename corrupt %{filename}; remove manually") % { filename: filename }, detail.backtrace
-        end
+        File.rename(filename, filename + ".bad")
+      rescue
+        raise Puppet::Error, _("Could not rename corrupt %{filename}; remove manually") % { filename: filename }, detail.backtrace
       end
     end
 
     unless @@state.is_a?(Hash)
       Puppet.err _("State got corrupted")
-      self.init
+      init
     end
   end
 
@@ -87,7 +87,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