openvox 7.37.1 → 8.19.0

data/lib/puppet/property.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # The virtual base class for properties, which are the self-contained building
 # blocks for actually doing work on the system.
 
@@ -95,8 +97,9 @@ class Puppet::Property < Puppet::Parameter
     #
     def array_matching=(value)
       value = value.intern if value.is_a?(String)
-      #TRANSLATORS 'Property#array_matching', 'first', and 'all' should not be translated
+      # TRANSLATORS 'Property#array_matching', 'first', and 'all' should not be translated
       raise ArgumentError, _("Supported values for Property#array_matching are 'first' and 'all'") unless [:first, :all].include?(value)
+
       @array_matching = value
     end
 
@@ -168,6 +171,7 @@ class Puppet::Property < Puppet::Parameter
         if instance_methods(false).include?(method)
           raise ArgumentError, _("Attempt to redefine method %{method} with block") % { method: method }
         end
+
         define_method(method, &value.block)
       else
         # Let the method be an alias for calling the providers setter unless we already have this method
@@ -199,21 +203,19 @@ class Puppet::Property < Puppet::Parameter
   # @raise [Puppet::DevError] if there were issues formatting the message
   #
   def change_to_s(current_value, newvalue)
-    begin
-      if current_value == :absent
-        return "defined '#{name}' as #{should_to_s(newvalue)}"
-      elsif newvalue == :absent or newvalue == [:absent]
-        return "undefined '#{name}' from #{is_to_s(current_value)}"
-      else
-        return "#{name} changed #{is_to_s(current_value)} to #{should_to_s(newvalue)}"
-      end
-    rescue Puppet::Error
-      raise
-    rescue => detail
-      message = _("Could not convert change '%{name}' to string: %{detail}") % { name: name, detail: detail }
-      Puppet.log_exception(detail, message)
-      raise Puppet::DevError, message, detail.backtrace
+    if current_value == :absent
+      "defined '#{name}' as #{should_to_s(newvalue)}"
+    elsif newvalue == :absent or newvalue == [:absent]
+      "undefined '#{name}' from #{is_to_s(current_value)}"
+    else
+      "#{name} changed #{is_to_s(current_value)} to #{should_to_s(newvalue)}"
     end
+  rescue Puppet::Error
+    raise
+  rescue => detail
+    message = _("Could not convert change '%{name}' to string: %{detail}") % { name: name, detail: detail }
+    Puppet.log_exception(detail, message)
+    raise Puppet::DevError, message, detail.backtrace
   end
 
   # Produces the name of the event to use to describe a change of this property's value.
@@ -223,18 +225,17 @@ class Puppet::Property < Puppet::Parameter
   # @return [String] the name of the event that describes the change
   #
   def event_name
-    value = self.should
+    value = should
 
     event_name = self.class.value_option(value, :event) and return event_name
 
     name == :ensure or return (name.to_s + "_changed").to_sym
 
-    return (resource.type.to_s + case value
-    when :present; "_created"
-    when :absent; "_removed"
-    else
-      "_changed"
-    end).to_sym
+    (resource.type.to_s + case value
+                          when :present; "_created"
+                          when :absent;  "_removed"
+                          else "_changed"
+                          end).to_sym
   end
 
   # Produces an event describing a change of this property.
@@ -254,8 +255,8 @@ class Puppet::Property < Puppet::Parameter
   def event(options = {})
     attrs = { :name => event_name, :desired_value => should, :property => self, :source_description => path }.merge(options)
     value = self.class.value_collection.match?(should) if should
-    
-    attrs[:invalidate_refreshes] = true if value && value.invalidate_refreshes 
+
+    attrs[:invalidate_refreshes] = true if value && value.invalidate_refreshes
     attrs[:redacted] = @sensitive
     resource.event attrs
   end
@@ -305,7 +306,7 @@ class Puppet::Property < Puppet::Parameter
   # @api public
   #
   def insync?(is)
-    self.devfail "#{self.class.name}'s should is not array" unless @should.is_a?(Array)
+    devfail "#{self.class.name}'s should is not array" unless @should.is_a?(Array)
 
     # an empty array is analogous to no should values
     return true if @should.empty?
@@ -330,14 +331,14 @@ class Puppet::Property < Puppet::Parameter
       #
       # This does mean that property equality is not commutative, and will not
       # work unless the `is` value is carefully arranged to match the should.
-      return (is == @should or is == @should.map(&:to_s))
+      (is == @should or is == @should.map(&:to_s))
 
       # When we stop being idiots about this, and actually have meaningful
       # semantics, this version is the thing we actually want to do.
       #
       # return is.zip(@should).all? {|a, b| property_matches?(a, b) }
     else
-      return @should.any? {|want| property_matches?(is, want) }
+      @should.any? { |want| property_matches?(is, want) }
     end
   end
 
@@ -366,9 +367,9 @@ class Puppet::Property < Puppet::Parameter
     rescue
       # Certain operations may fail, but we don't want to fail the transaction if we can
       # avoid it
-      #TRANSLATORS 'insync_values?' should not be translated
+      # TRANSLATORS 'insync_values?' should not be translated
       msg = _("Unknown failure using insync_values? on type: %{type} / property: %{name} to compare values %{should} and %{is}") %
-          { type: self.resource.ref, name: self.name, should: should, is: is }
+            { type: resource.ref, name: name, should: should, is: is }
       Puppet.info(msg)
 
       # Return nil, ie. unknown
@@ -402,7 +403,7 @@ class Puppet::Property < Puppet::Parameter
   # are not already in suitable form.
   # @param value [Object] the value to format as a string
   # @return [String] a pretty printing string
-  def is_to_s(value)
+  def is_to_s(value) # rubocop:disable Naming/PredicateName
     self.class.format_value_for_display(value)
   end
 
@@ -413,9 +414,9 @@ class Puppet::Property < Puppet::Parameter
   #
   def log(msg)
     Puppet::Util::Log.create(
-      :level   => resource[:loglevel],
+      :level => resource[:loglevel],
       :message => msg,
-      :source  => self
+      :source => self
     )
   end
 
@@ -449,12 +450,10 @@ class Puppet::Property < Puppet::Parameter
     # This is only here to make testing easier.
     if @resource.respond_to?(:noop?)
       @resource.noop?
+    elsif defined?(@noop)
+      @noop
     else
-      if defined?(@noop)
-        @noop
-      else
-        Puppet[:noop]
-      end
+      Puppet[:noop]
     end
   end
 
@@ -485,9 +484,9 @@ class Puppet::Property < Puppet::Parameter
     # Set a name for looking up associated options like the event.
     name = self.class.value_name(value)
     method = self.class.value_option(name, :method)
-    if method && self.respond_to?(method)
+    if method && respond_to?(method)
       begin
-        self.send(method)
+        send(method)
       rescue Puppet::Error
         raise
       rescue => detail
@@ -502,7 +501,7 @@ class Puppet::Property < Puppet::Parameter
       if block
         # FIXME It'd be better here to define a method, so that
         # the blocks could return values.
-        self.instance_eval(&block)
+        instance_eval(&block)
       else
         call_provider(value)
       end
@@ -525,12 +524,12 @@ class Puppet::Property < Puppet::Parameter
   def should
     return nil unless defined?(@should)
 
-    self.devfail "should for #{self.class.name} on #{resource.name} is not an array" unless @should.is_a?(Array)
+    devfail "should for #{self.class.name} on #{resource.name} is not an array" unless @should.is_a?(Array)
 
     if match_all?
-      return @should.collect { |val| self.unmunge(val) }
+      @should.collect { |val| unmunge(val) }
     else
-      return self.unmunge(@should[0])
+      unmunge(@should[0])
     end
   end
 
@@ -548,7 +547,7 @@ class Puppet::Property < Puppet::Parameter
     @shouldorig = values
 
     values.each { |val| validate(val) }
-    @should = values.collect { |val| self.munge(val) }
+    @should = values.collect { |val| munge(val) }
   end
 
   # Produces a pretty printing string for the given value.
@@ -590,18 +589,18 @@ class Puppet::Property < Puppet::Parameter
     features = self.class.value_option(self.class.value_name(value), :required_features)
     if features
       features = Array(features)
-      needed_features = features.collect { |f| f.to_s }.join(", ")
+      needed_features = features.collect(&:to_s).join(", ")
       unless provider.satisfies?(features)
-        #TRANSLATORS 'Provider' refers to a Puppet provider class
+        # TRANSLATORS 'Provider' refers to a Puppet provider class
         raise ArgumentError, _("Provider %{provider} must have features '%{needed_features}' to set '%{property}' to '%{value}'") %
-            { provider: provider.class.name, needed_features: needed_features, property: self.class.name, value: value }
+                             { provider: provider.class.name, needed_features: needed_features, property: self.class.name, value: value }
       end
     end
   end
 
   # @return [Object, nil] Returns the wanted _(should)_ value of this property.
   def value
-    self.should
+    should
   end
 
   # (see #should=)

data/lib/puppet/provider/aix_object.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Common code for AIX user/group providers.
 class Puppet::Provider::AixObject < Puppet::Provider
   desc "Generic AIX resource provider"
@@ -93,7 +95,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
     # NOTE: 'Impure' lambdas are useful in case we need to generate more specific error
     # messages or pass-in instance-specific command-line arguments.
     def mapping(info = {})
-      identity_fn = lambda { |x| x }
+      identity_fn = ->(x) { x }
       info[:aix_attribute] ||= info[:puppet_property]
       info[:property_to_attribute] ||= identity_fn
       info[:attribute_to_property] ||= identity_fn
@@ -169,7 +171,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
 
     # This helper splits a list separated by sep into its corresponding
     # items. Note that a key precondition here is that none of the items
-    # in the list contain sep. 
+    # in the list contain sep.
     #
     # Let A be the return value. Then one of our postconditions is:
     #   A.join(sep) == list
@@ -256,11 +258,11 @@ class Puppet::Provider::AixObject < Puppet::Provider
 
         values = parse_colon_separated_list(values_line.chomp)
 
-        attributes_hash = Hash[attributes.zip(values)]
+        attributes_hash = attributes.zip(values).to_h
 
         object_name = attributes_hash.delete(:name)
 
-        Hash[[[:name, object_name.to_s], [:attributes, attributes_hash]]]
+        [[:name, object_name.to_s], [:attributes, attributes_hash]].to_h
       end
 
       objects
@@ -299,7 +301,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
   # that need our provider instance.
   def mappings
     return @mappings if @mappings
-    
+
     @mappings = {}
     self.class.mappings.each do |type, mapped_objects|
       @mappings[type] = {}
@@ -333,6 +335,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
     raise ArgumentError, _("Cannot have both 'forcelocal' and 'ia_load_module' at the same time!") if @resource[:ia_load_module] && @resource[:forcelocal]
     return ["-R", @resource[:ia_load_module].to_s] if @resource[:ia_load_module]
     return ["-R", "files"] if @resource[:forcelocal]
+
     []
   end
 
@@ -357,12 +360,13 @@ class Puppet::Provider::AixObject < Puppet::Provider
   # Modifies the AIX object by setting its new attributes.
   def modify_object(new_attributes)
     execute(modifycmd(new_attributes))
-    object_info(true) 
+    object_info(true)
   end
 
   # Gets a Puppet property's value from object_info
   def get(property)
     return :absent unless exists?
+
     object_info[property] || :absent
   end
 
@@ -398,7 +402,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
     properties, attributes = conflicts.keys.map do |key|
       conflicts[key].map! { |name| "'#{name}'" }.join(', ')
     end
-      
+
     detail = _("attributes is setting the %{properties} properties via. the %{attributes} attributes, respectively! Please specify these property values in the resource declaration instead.") % { properties: properties, attributes: attributes }
 
     raise Puppet::Error, _("Could not set attributes on %{resource}[%{name}]: %{detail}") % { resource: @resource.class.name, name: @resource.name, detail: detail }
@@ -416,7 +420,8 @@ class Puppet::Provider::AixObject < Puppet::Provider
   # Collects the current property values of all mapped properties +
   # the attributes property.
   def object_info(refresh = false)
-    return @object_info if @object_info && ! refresh
+    return @object_info if @object_info && !refresh
+
     @object_info = nil
 
     begin
@@ -452,7 +457,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
 
   # Check that the AIX object exists
   def exists?
-    ! object_info.nil?
+    !object_info.nil?
   end
 
   # Creates a new instance of the resource
@@ -463,6 +468,7 @@ class Puppet::Provider::AixObject < Puppet::Provider
     mappings[:aix_attribute].each do |property, aix_attribute|
       property_should = @resource.should(property)
       next if property_should.nil?
+
       attributes[aix_attribute.name] = aix_attribute.convert_property_value(property_should)
     end
 

data/lib/puppet/provider/command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # A command that can be executed on the system
 class Puppet::Provider::Command
   attr_reader :executable

data/lib/puppet/provider/confine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Confines have been moved out of the provider as they are also used for other things.
 # This provides backwards compatibility for people still including this old location.
 require_relative '../../puppet/provider'

data/lib/puppet/provider/exec/posix.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/provider/exec'
 
 Puppet::Type.type(:exec).provide :posix, :parent => Puppet::Provider::Exec do
@@ -36,6 +38,7 @@ Puppet::Type.type(:exec).provide :posix, :parent => Puppet::Provider::Exec do
       elsif !File.executable?(exe)
         raise ArgumentError, _("'%{exe}' is not executable") % { exe: exe }
       end
+
       return
     end
 
@@ -52,7 +55,7 @@ Puppet::Type.type(:exec).provide :posix, :parent => Puppet::Provider::Exec do
 
   def run(command, check = false)
     if resource[:umask]
-      Puppet::Util::withumask(resource[:umask]) { super(command, check) }
+      Puppet::Util.withumask(resource[:umask]) { super(command, check) }
     else
       super(command, check)
     end

data/lib/puppet/provider/exec/shell.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Puppet::Type.type(:exec).provide :shell, :parent => :posix do
   include Puppet::Util::Execution
 

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

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/provider/exec'
 
 Puppet::Type.type(:exec).provide :windows, :parent => Puppet::Provider::Exec do
-
-  confine    :operatingsystem => :windows
-  defaultfor :operatingsystem => :windows
+  confine    'os.name' => :windows
+  defaultfor 'os.name' => :windows
 
   desc <<-'EOT'
     Execute external binaries on Windows systems. As with the `posix`
@@ -41,11 +42,12 @@ Puppet::Type.type(:exec).provide :windows, :parent => Puppet::Provider::Exec do
       elsif !File.file?(exe)
         raise ArgumentError, _("'%{exe}' is a %{klass}, not a file") % { exe: exe, klass: File.ftype(exe) }
       end
+
       return
     end
 
     if resource[:path]
-      Puppet::Util.withenv( {'PATH' => resource[:path].join(File::PATH_SEPARATOR)}, :windows) do
+      Puppet::Util.withenv('PATH' => resource[:path].join(File::PATH_SEPARATOR)) do
         return if which(exe)
       end
     end

data/lib/puppet/provider/exec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/provider'
 require_relative '../../puppet/util/execution'
 
@@ -27,7 +29,7 @@ class Puppet::Provider::Exec < Puppet::Provider
       end
 
       if value.nil? || value.empty?
-        msg = _("Empty environment setting '%{var}'") % {var: var}
+        msg = _("Empty environment setting '%{var}'") % { var: var }
         Puppet.warn_once('undefined_variables', "empty_env_var_#{var}", msg, resource.file, resource.line)
       end
 
@@ -43,14 +45,14 @@ class Puppet::Provider::Exec < Puppet::Provider
 
     checkexe(command)
 
-    debug "Executing#{check ? " check": ""} '#{sensitive ? '[redacted]' : command}'"
+    debug "Executing#{check ? ' check' : ''} '#{sensitive ? '[redacted]' : command}'"
 
     # Ruby 2.1 and later interrupt execution in a way that bypasses error
     # handling by default. Passing Timeout::Error causes an exception to be
     # raised that can be rescued inside of the block by cleanup routines.
     #
     # This is backwards compatible all the way to Ruby 1.8.7.
-    Timeout::timeout(resource[:timeout], Timeout::Error) do
+    Timeout.timeout(resource[:timeout], Timeout::Error) do
       cwd = resource[:cwd]
       # It's ok if cwd is nil. In that case Puppet::Util::Execution.execute() simply will not attempt to
       # change the working directory, which is exactly the right behavior when no cwd parameter is
@@ -80,7 +82,7 @@ class Puppet::Provider::Exec < Puppet::Provider
     # Return output twice as processstatus was returned before, but only exitstatus was ever called.
     # Output has the exitstatus on it so it is returned instead. This is here twice as changing this
     #  would result in a change to the underlying API.
-    return output, output
+    [output, output]
   end
 
   def extractexe(command)

data/lib/puppet/provider/file/posix.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Puppet::Type.type(:file).provide :posix do
   desc "Uses POSIX functionality to manage file ownership and permissions."
 
@@ -10,8 +12,22 @@ Puppet::Type.type(:file).provide :posix do
   require 'etc'
   require_relative '../../../puppet/util/selinux'
 
-  def self.post_resource_eval
-    Selinux.matchpathcon_fini if Puppet::Util::SELinux.selinux_support?
+  class << self
+    def selinux_handle
+      return nil unless Puppet::Util::SELinux.selinux_support?
+
+      # selabel_open takes 3 args: backend, options, and nopt. The backend param
+      # is a constant, SELABEL_CTX_FILE, which happens to be 0. Since options is
+      # nil, nopt can be 0 since nopt represents the # of options specified.
+      @selinux_handle ||= Selinux.selabel_open(Selinux::SELABEL_CTX_FILE, nil, 0)
+    end
+
+    def post_resource_eval
+      if @selinux_handle
+        Selinux.selabel_close(@selinux_handle)
+        @selinux_handle = nil
+      end
+    end
   end
 
   def uid2name(id)
@@ -25,15 +41,17 @@ Puppet::Type.type(:file).provide :posix do
     end
 
     if user.uid == ""
-      return nil
+      nil
     else
-      return user.name
+      user.name
     end
   end
 
   # Determine if the user is valid, and if so, return the UID
   def name2uid(value)
-    Integer(value) rescue uid(value) || false
+    Integer(value)
+  rescue
+    uid(value) || false
   end
 
   def gid2name(id)
@@ -47,14 +65,16 @@ Puppet::Type.type(:file).provide :posix do
     end
 
     if group.gid == ""
-      return nil
+      nil
     else
-      return group.name
+      group.name
     end
   end
 
   def name2gid(value)
-    Integer(value) rescue gid(value) || false
+    Integer(value)
+  rescue
+    gid(value) || false
   end
 
   def owner
@@ -69,7 +89,7 @@ Puppet::Type.type(:file).provide :posix do
     # large UIDs instead of negative ones.  This isn't a Ruby bug,
     # it's an OS X bug, since it shows up in perl, too.
     if currentvalue > Puppet[:maximum_uid].to_i
-      self.warning _("Apparently using negative UID (%{currentvalue}) on a platform that does not consistently handle them") % { currentvalue: currentvalue }
+      warning _("Apparently using negative UID (%{currentvalue}) on a platform that does not consistently handle them") % { currentvalue: currentvalue }
       currentvalue = :silly
     end
 
@@ -101,7 +121,7 @@ Puppet::Type.type(:file).provide :posix do
     # large GIDs instead of negative ones.  This isn't a Ruby bug,
     # it's an OS X bug, since it shows up in perl, too.
     if currentvalue > Puppet[:maximum_uid].to_i
-      self.warning _("Apparently using negative GID (%{currentvalue}) on a platform that does not consistently handle them") % { currentvalue: currentvalue }
+      warning _("Apparently using negative GID (%{currentvalue}) on a platform that does not consistently handle them") % { currentvalue: currentvalue }
       currentvalue = :silly
     end
 
@@ -126,19 +146,17 @@ Puppet::Type.type(:file).provide :posix do
   def mode
     stat = resource.stat
     if stat
-      return (stat.mode & 007777).to_s(8).rjust(4, '0')
+      (stat.mode & 0o07777).to_s(8).rjust(4, '0')
     else
-      return :absent
+      :absent
     end
   end
 
   def mode=(value)
-    begin
-      File.chmod(value.to_i(8), resource[:path])
-    rescue => detail
-      error = Puppet::Error.new(_("failed to set mode %{mode} on %{path}: %{message}") % { mode: mode, path: resource[:path], message: detail.message })
-      error.set_backtrace detail.backtrace
-      raise error
-    end
+    File.chmod(value.to_i(8), resource[:path])
+  rescue => detail
+    error = Puppet::Error.new(_("failed to set mode %{mode} on %{path}: %{message}") % { mode: mode, path: resource[:path], message: detail.message })
+    error.set_backtrace detail.backtrace
+    raise error
   end
 end