openvox 7.37.1 → 8.19.0

data/lib/puppet/util/at_fork/noop.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # A noop implementation of the Puppet::Util::AtFork handler
 class Puppet::Util::AtFork::Noop
   class << self

data/lib/puppet/util/at_fork/solaris.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet'
 require 'fiddle'
 
@@ -21,7 +23,7 @@ class Puppet::Util::AtFork::Solaris
 
   {
     'libcontract.so.1' => [
-      #function name,            return value type, parameter types, ...
+      # function name,            return value type, parameter types, ...
       [:ct_ctl_abandon,          Fiddle::TYPE_INT,  Fiddle::TYPE_INT],
       [:ct_tmpl_activate,        Fiddle::TYPE_INT,  Fiddle::TYPE_INT],
       [:ct_tmpl_clear,           Fiddle::TYPE_INT,  Fiddle::TYPE_INT],
@@ -34,19 +36,19 @@ class Puppet::Util::AtFork::Solaris
       [:ct_status_read,          Fiddle::TYPE_INT,  Fiddle::TYPE_INT, Fiddle::TYPE_INT, Fiddle::TYPE_VOIDP],
 
       [:ct_status_get_id,        Fiddle::TYPE_INT,  Fiddle::TYPE_VOIDP],
-      [:ct_status_free,          Fiddle::TYPE_VOID, Fiddle::TYPE_VOIDP],
+      [:ct_status_free,          Fiddle::TYPE_VOID, Fiddle::TYPE_VOIDP]
     ],
   }.each do |library, functions|
     libhandle = Fiddle::Handle.new(library)
 
     functions.each do |f|
-      define_method f[0], Fiddle::Function.new(libhandle[f[0].to_s], f[2..-1], f[1]).method(:call).to_proc
+      define_method f[0], Fiddle::Function.new(libhandle[f[0].to_s], f[2..], f[1]).method(:call).to_proc
     end
   end
 
-  CTFS_PR_ROOT = File.join('', %w(system contract process))
-  CTFS_PR_TEMPLATE = File.join(CTFS_PR_ROOT, %q(template))
-  CTFS_PR_LATEST = File.join(CTFS_PR_ROOT, %q(latest))
+  CTFS_PR_ROOT = File.join('', %w[system contract process])
+  CTFS_PR_TEMPLATE = File.join(CTFS_PR_ROOT, 'template')
+  CTFS_PR_LATEST = File.join(CTFS_PR_ROOT, 'latest')
 
   CT_PR_PGRPONLY = 0x4
   CT_PR_EV_HWERR = 0x20
@@ -61,27 +63,25 @@ class Puppet::Util::AtFork::Solaris
   end
 
   def activate_new_contract_template
-    begin
-      tmpl = File.open(CTFS_PR_TEMPLATE, File::RDWR)
+    tmpl = File.new(CTFS_PR_TEMPLATE, File::RDWR)
 
-      begin
-        tmpl_fd = tmpl.fileno
+    begin
+      tmpl_fd = tmpl.fileno
 
-        raise_if_error { ct_pr_tmpl_set_param(tmpl_fd, CT_PR_PGRPONLY) }
-        raise_if_error { ct_pr_tmpl_set_fatal(tmpl_fd, CT_PR_EV_HWERR) }
-        raise_if_error { ct_tmpl_set_critical(tmpl_fd, 0) }
-        raise_if_error { ct_tmpl_set_informative(tmpl_fd, CT_PR_EV_HWERR) }
+      raise_if_error { ct_pr_tmpl_set_param(tmpl_fd, CT_PR_PGRPONLY) }
+      raise_if_error { ct_pr_tmpl_set_fatal(tmpl_fd, CT_PR_EV_HWERR) }
+      raise_if_error { ct_tmpl_set_critical(tmpl_fd, 0) }
+      raise_if_error { ct_tmpl_set_informative(tmpl_fd, CT_PR_EV_HWERR) }
 
-        raise_if_error { ct_tmpl_activate(tmpl_fd) }
-      rescue
-        tmpl.close
-        raise
-      end
-
-      @tmpl = tmpl
-    rescue => detail
-      Puppet.log_exception(detail, _('Failed to activate a new process contract template'))
+      raise_if_error { ct_tmpl_activate(tmpl_fd) }
+    rescue
+      tmpl.close
+      raise
     end
+
+    @tmpl = tmpl
+  rescue => detail
+    Puppet.log_exception(detail, _('Failed to activate a new process contract template'))
   end
 
   def deactivate_contract_template(parent)
@@ -106,24 +106,22 @@ class Puppet::Util::AtFork::Solaris
   end
 
   def get_latest_child_contract_id
-    begin
-      stat = File.open(CTFS_PR_LATEST, File::RDONLY)
-
-      begin
-        stathdl = Fiddle::Pointer.new(0)
+    stat = File.new(CTFS_PR_LATEST, File::RDONLY)
 
-        raise_if_error { ct_status_read(stat.fileno, CTD_COMMON, stathdl.ref) }
-        ctid = ct_status_get_id(stathdl)
-        ct_status_free(stathdl)
-      ensure
-        stat.close
-      end
+    begin
+      stathdl = Fiddle::Pointer.new(0)
 
-      ctid
-    rescue => detail
-      Puppet.log_exception(detail, _('Failed to get latest child process contract id'))
-      nil
+      raise_if_error { ct_status_read(stat.fileno, CTD_COMMON, stathdl.ref) }
+      ctid = ct_status_get_id(stathdl)
+      ct_status_free(stathdl)
+    ensure
+      stat.close
     end
+
+    ctid
+  rescue => detail
+    Puppet.log_exception(detail, _('Failed to get latest child process contract id'))
+    nil
   end
 
   def abandon_latest_child_contract
@@ -131,7 +129,7 @@ class Puppet::Util::AtFork::Solaris
     return if ctid.nil?
 
     begin
-      ctl = File.open(File.join(CTFS_PR_ROOT, ctid.to_s, %q(ctl)), File::WRONLY)
+      ctl = File.new(File.join(CTFS_PR_ROOT, ctid.to_s, 'ctl'), File::WRONLY)
 
       begin
         raise_if_error { ct_ctl_abandon(ctl.fileno) }

data/lib/puppet/util/at_fork.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet'
 
 # A module for building AtFork handlers. These handlers are objects providing
@@ -12,7 +14,7 @@ require_relative '../../puppet'
 #   killed in the process as a consequence of running in the same contract as the
 #   service.
 module Puppet::Util::AtFork
-  @handler_class = loop do
+  @handler_class = loop do # rubocop:disable Lint/UnreachableLoop
     if Puppet::Util::Platform.solaris?
       begin
         require_relative 'at_fork/solaris'

data/lib/puppet/util/autoload.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require_relative '../../puppet/util/rubygems'
 require_relative '../../puppet/util/warnings'
@@ -59,8 +61,10 @@ class Puppet::Util::Autoload
     def changed?(name, env)
       name = cleanpath(name).chomp('.rb')
       return true unless loaded.include?(name)
+
       file, old_mtime = loaded[name]
       return true unless file == get_file(name, env)
+
       begin
         old_mtime.to_i != File.mtime(file).to_i
       rescue Errno::ENOENT
@@ -73,11 +77,12 @@ class Puppet::Util::Autoload
     def load_file(name, env)
       file = get_file(name.to_s, env)
       return false unless file
+
       begin
         mark_loaded(name, file)
         Kernel.load file
-        return true
-      rescue SystemExit,NoMemoryError
+        true
+      rescue SystemExit, NoMemoryError
         raise
       rescue Exception => detail
         message = _("Could not autoload %{name}: %{detail}") % { name: name, detail: detail }
@@ -106,13 +111,13 @@ class Puppet::Util::Autoload
     # returns nil if no file is found
     # @api private
     def get_file(name, env)
-      name = name + '.rb' unless name =~ /\.rb$/
+      name += '.rb' unless name =~ /\.rb$/
       path = search_directories(env).find { |dir| Puppet::FileSystem.exist?(File.join(dir, name)) }
       path and File.join(path, name)
     end
 
     def files_to_load(path, env)
-      search_directories(env).map {|dir| files_in_dir(dir, path) }.flatten.uniq
+      search_directories(env).map { |dir| files_in_dir(dir, path) }.flatten.uniq
     end
 
     # @api private
@@ -175,6 +180,7 @@ class Puppet::Util::Autoload
   def initialize(obj, path)
     @path = path.to_s
     raise ArgumentError, _("Autoload paths cannot be fully qualified") if Puppet::Util.absolute_path?(@path)
+
     @object = obj
   end
 

data/lib/puppet/util/backups.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 require 'find'
 require 'fileutils'
 module Puppet::Util::Backups
-
   # Deal with backups.
   def perform_backup(file = nil)
     # if they specifically don't want a backup, then just say
@@ -12,27 +13,28 @@ module Puppet::Util::Backups
     file ||= self[:path]
     return true unless Puppet::FileSystem.exist?(file)
 
-    return(self.bucket ? perform_backup_with_bucket(file) : perform_backup_with_backuplocal(file, self[:backup]))
+    (bucket ? perform_backup_with_bucket(file) : perform_backup_with_backuplocal(file, self[:backup]))
   end
 
   private
 
   def perform_backup_with_bucket(fileobj)
-    file = (fileobj.class == String) ? fileobj : fileobj.name
+    file = fileobj.instance_of?(String) ? fileobj : fileobj.name
     case Puppet::FileSystem.lstat(file).ftype
     when "directory"
       # we don't need to backup directories when recurse is on
       return true if self[:recurse]
+
       info _("Recursively backing up to filebucket")
       Find.find(self[:path]) { |f| backup_file_with_filebucket(f) if File.file?(f) }
     when "file"; backup_file_with_filebucket(file)
-    when "link";
+    when "link"; # do nothing
     end
     true
   end
 
   def perform_backup_with_backuplocal(fileobj, backup)
-    file = (fileobj.class == String) ? fileobj : fileobj.name
+    file = fileobj.instance_of?(String) ? fileobj : fileobj.name
     newfile = file + backup
 
     remove_backup(newfile)
@@ -42,7 +44,7 @@ module Puppet::Util::Backups
 
       # N.B. cp_r works on both files and directories
       FileUtils.cp_r(file, bfile, :preserve => true)
-      return true
+      true
     rescue => detail
       # since they said they want a backup, let's error out
       # if we couldn't make one
@@ -51,7 +53,7 @@ module Puppet::Util::Backups
   end
 
   def remove_backup(newfile)
-    if self.class.name == :file and self[:links] != :follow
+    if instance_of?(Puppet::Type::File) and self[:links] != :follow
       method = :lstat
     else
       method = :stat
@@ -73,14 +75,14 @@ module Puppet::Util::Backups
       Puppet::FileSystem.unlink(newfile)
     rescue => detail
       message = _("Could not remove old backup: %{detail}") % { detail: detail }
-      self.log_exception(detail, message)
+      log_exception(detail, message)
       self.fail Puppet::Error, message, detail
     end
   end
 
   def backup_file_with_filebucket(f)
-    sum = self.bucket.backup(f)
-    self.info _("Filebucketed %{f} to %{filebucket} with sum %{sum}") % { f: f, filebucket: self.bucket.name, sum: sum }
-    return sum
+    sum = bucket.backup(f)
+    info _("Filebucketed %{f} to %{filebucket} with sum %{sum}") % { f: f, filebucket: bucket.name, sum: sum }
+    sum
   end
 end

data/lib/puppet/util/character_encoding.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # A module to centralize heuristics/practices for managing character encoding in Puppet
 
 module Puppet::Util::CharacterEncoding
@@ -18,13 +20,13 @@ module Puppet::Util::CharacterEncoding
       string_copy = string.dup
       begin
         if original_encoding == Encoding::UTF_8
-          if !string_copy.valid_encoding?
+          unless string_copy.valid_encoding?
             Puppet.debug {
               _("%{value} is already labeled as UTF-8 but this encoding is invalid. It cannot be transcoded by Puppet.") % { value: string.dump }
             }
           end
           # String is already valid UTF-8 - noop
-          return string_copy
+          string_copy
         else
           # If the string comes to us as BINARY encoded, we don't know what it
           # started as. However, to encode! we need a starting place, and our
@@ -32,7 +34,7 @@ module Puppet::Util::CharacterEncoding
           # So set external_encoding to default_external before we try to
           # transcode to UTF-8.
           string_copy.force_encoding(Encoding.default_external) if original_encoding == Encoding::BINARY
-          return string_copy.encode(Encoding::UTF_8)
+          string_copy.encode(Encoding::UTF_8)
         end
       rescue EncodingError => detail
         # Set the encoding on our copy back to its original if we modified it
@@ -44,7 +46,7 @@ module Puppet::Util::CharacterEncoding
         Puppet.debug {
           _("%{error}: %{value} cannot be transcoded by Puppet.") % { error: detail.inspect, value: string.dump }
         }
-        return string_copy
+        string_copy
       end
     end
 
@@ -66,14 +68,15 @@ module Puppet::Util::CharacterEncoding
       string_copy = string.dup
       original_encoding = string_copy.encoding
       return string_copy if original_encoding == Encoding::UTF_8
+
       if string_copy.force_encoding(Encoding::UTF_8).valid_encoding?
-        return string_copy
+        string_copy
       else
         Puppet.debug {
           _("%{value} is not valid UTF-8 and result of overriding encoding would be invalid.") % { value: string.dump }
         }
         # Set copy back to its original encoding before returning
-        return string_copy.force_encoding(original_encoding)
+        string_copy.force_encoding(original_encoding)
       end
     end
   end

data/lib/puppet/util/checksums.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'digest/md5'
 require 'digest/sha1'
 require 'time'
@@ -7,6 +9,7 @@ require 'time'
 module Puppet::Util::Checksums
   module_function
 
+  # If you modify this, update puppet/type/file/checksum.rb too
   KNOWN_CHECKSUMS = [
     :sha256, :sha256lite,
     :md5, :md5lite,
@@ -43,12 +46,12 @@ module Puppet::Util::Checksums
 
   # Strip the checksum type from an existing checksum
   def sumdata(checksum)
-    checksum =~ /^\{(\w+)\}(.+)/ ? $2 : nil
+    checksum =~ /^\{(\w+)\}(.+)/ ? ::Regexp.last_match(2) : nil
   end
 
   # Strip the checksum type from an existing checksum
   def sumtype(checksum)
-    checksum =~ /^\{(\w+)\}/ ? $1 : nil
+    checksum =~ /^\{(\w+)\}/ ? ::Regexp.last_match(1) : nil
   end
 
   # Calculate a checksum using Digest::SHA256.
@@ -65,7 +68,7 @@ module Puppet::Util::Checksums
     require 'digest/sha2'
 
     digest = Digest::SHA256.new
-    checksum_file(digest, filename,  lite)
+    checksum_file(digest, filename, lite)
   end
 
   def sha256_stream(lite = false, &block)
@@ -112,7 +115,7 @@ module Puppet::Util::Checksums
     require 'digest/sha2'
 
     digest = Digest::SHA384.new
-    checksum_file(digest, filename,  lite)
+    checksum_file(digest, filename, lite)
   end
 
   def sha384_stream(lite = false, &block)
@@ -139,7 +142,7 @@ module Puppet::Util::Checksums
     require 'digest/sha2'
 
     digest = Digest::SHA512.new
-    checksum_file(digest, filename,  lite)
+    checksum_file(digest, filename, lite)
   end
 
   def sha512_stream(lite = false, &block)
@@ -155,7 +158,7 @@ module Puppet::Util::Checksums
   # Calculate a checksum using Digest::SHA224.
   def sha224(content)
     require_relative '../../puppet/ssl/openssl_loader'
-    OpenSSL::Digest::SHA224.new.hexdigest(content)
+    OpenSSL::Digest.new('SHA224').hexdigest(content)
   end
 
   def sha224?(string)
@@ -165,13 +168,13 @@ module Puppet::Util::Checksums
   def sha224_file(filename, lite = false)
     require_relative '../../puppet/ssl/openssl_loader'
 
-    digest = OpenSSL::Digest::SHA224.new
-    checksum_file(digest, filename,  lite)
+    digest = OpenSSL::Digest.new('SHA224')
+    checksum_file(digest, filename, lite)
   end
 
   def sha224_stream(lite = false, &block)
     require_relative '../../puppet/ssl/openssl_loader'
-    digest = OpenSSL::Digest::SHA224.new
+    digest = OpenSSL::Digest.new('SHA224')
     checksum_stream(digest, block, lite)
   end
 
@@ -191,7 +194,7 @@ module Puppet::Util::Checksums
   # Calculate a checksum of a file's content using Digest::MD5.
   def md5_file(filename, lite = false)
     digest = Digest::MD5.new
-    checksum_file(digest, filename,  lite)
+    checksum_file(digest, filename, lite)
   end
 
   def md5_stream(lite = false, &block)
@@ -231,6 +234,7 @@ module Puppet::Util::Checksums
 
   def mtime?(string)
     return true if string.is_a? Time
+
     !!DateTime.parse(string)
   rescue
     false
@@ -301,6 +305,7 @@ module Puppet::Util::Checksums
 
   def ctime?(string)
     return true if string.is_a? Time
+
     !!DateTime.parse(string)
   rescue
     false
@@ -359,7 +364,7 @@ module Puppet::Util::Checksums
   def checksum_file(digest, filename, lite = false)
     buffer = lite ? 512 : 4096
     File.open(filename, 'rb') do |file|
-      while content = file.read(buffer) #rubocop:disable Lint/AssignmentInCondition
+      while content = file.read(buffer) # rubocop:disable Lint/AssignmentInCondition
         digest << content
         break if lite
       end
@@ -372,5 +377,4 @@ module Puppet::Util::Checksums
     block.call(DigestLite.new(digest, lite))
     digest.hexdigest
   end
-
 end

data/lib/puppet/util/classgen.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Puppet
   class ConstantAlreadyDefined < Error; end
   class SubclassAlreadyDefined < Error; end
@@ -65,7 +67,7 @@ module Puppet::Util::ClassGen
   def rmclass(name, options)
     const = genconst_string(name, options)
     retval = false
-    if is_constant_defined?(const)
+    if const_defined?(const, false)
       remove_const(const)
       retval = true
     end
@@ -101,7 +103,7 @@ module Puppet::Util::ClassGen
     name = name.to_s.downcase.intern
 
     if type == Module
-      #evalmethod = :module_eval
+      # evalmethod = :module_eval
       evalmethod = :class_eval
       # Create the class, with the correct name.
       klass = Module.new do
@@ -139,25 +141,19 @@ module Puppet::Util::ClassGen
     klass
   end
 
-  # @api private
-  #
-  def is_constant_defined?(const)
-    const_defined?(const, false)
-  end
-
   # Handle the setting and/or removing of the associated constant.
   # @api private
   #
   def handleclassconst(klass, name, options)
-   const = genconst_string(name, options)
+    const = genconst_string(name, options)
 
-    if is_constant_defined?(const)
+    if const_defined?(const, false)
       if options[:overwrite]
         Puppet.info _("Redefining %{name} in %{klass}") % { name: name, klass: self }
         remove_const(const)
       else
         raise Puppet::ConstantAlreadyDefined,
-          _("Class %{const} is already defined in %{klass}") % { const: const, klass: self }
+              _("Class %{const} is already defined in %{klass}") % { const: const, klass: self }
       end
     end
     const_set(const, klass)
@@ -181,11 +177,11 @@ module Puppet::Util::ClassGen
 
     [:include, :extend].each do |method|
       set = options[method]
-      if set
-        set = [set] unless set.is_a?(Array)
-        set.each do |mod|
-          klass.send(method, mod)
-        end
+      next unless set
+
+      set = [set] unless set.is_a?(Array)
+      set.each do |mod|
+        klass.send(method, mod)
       end
     end
 
@@ -203,9 +199,9 @@ module Puppet::Util::ClassGen
   def storeclass(klass, klassname, options)
     hash = options[:hash]
     if hash
-      if hash.include? klassname and ! options[:overwrite]
+      if hash.include? klassname and !options[:overwrite]
         raise Puppet::SubclassAlreadyDefined,
-          _("Already a generated class named %{klassname}") % { klassname: klassname }
+              _("Already a generated class named %{klassname}") % { klassname: klassname }
       end
 
       hash[klassname] = klass
@@ -214,15 +210,14 @@ module Puppet::Util::ClassGen
     # If we were told to stick it in a hash, then do so
     array = options[:array]
     if array
-      if (klass.respond_to? :name and
-              array.find { |c| c.name == klassname } and
-              ! options[:overwrite])
+      if klass.respond_to? :name and
+         array.find { |c| c.name == klassname } and
+         !options[:overwrite]
         raise Puppet::SubclassAlreadyDefined,
-          _("Already a generated class named %{klassname}") % { klassname: klassname }
+              _("Already a generated class named %{klassname}") % { klassname: klassname }
       end
 
       array << klass
     end
   end
 end
-