openvox 7.37.1 → 8.19.0

data/lib/puppet/util/suidmanager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/util/warnings'
 require 'forwardable'
 require 'etc'
@@ -8,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
@@ -17,30 +19,27 @@ module Puppet::Util::SUIDManager
 
   def osx_maj_ver
     return @osx_maj_ver unless @osx_maj_ver.nil?
-    @osx_maj_ver = Puppet.runtime[:facter].value('macosx_productversion_major') || false
+
+    @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
-    rescue Errno::EINVAL => e
-      #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
-      # a wrapper for "int setgroups(size_t size, const gid_t *list)" (part of SVr4
-      # and 4.3BSD but not in POSIX.1-2001) that fails and sets errno to EINVAL.
-      #
-      # This does not appear to be a problem with Ruby but rather an issue on the
-      # 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
-        raise e
-      end
+    Process.groups = grouplist
+  rescue Errno::EINVAL => e
+    # 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
+    # a wrapper for "int setgroups(size_t size, const gid_t *list)" (part of SVr4
+    # and 4.3BSD but not in POSIX.1-2001) that fails and sets errno to EINVAL.
+    #
+    # This does not appear to be a problem with Ruby but rather an issue on the
+    # 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 || osx_maj_ver.empty?
+      raise e
     end
   end
   module_function :groups=
@@ -61,12 +60,13 @@ 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
 
-    old_euid, old_egid = self.euid, self.egid
+    old_euid = euid
+    old_egid = egid
     begin
       change_privileges(new_uid, new_gid, false)
 
@@ -82,7 +82,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
@@ -98,7 +98,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
 
@@ -114,7 +114,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
 
@@ -125,30 +125,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
+    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,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/util'
 
 module Puppet
@@ -16,7 +18,8 @@ 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
+
+    false
   end
 
   def display_mode(value)
@@ -35,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
@@ -56,12 +60,12 @@ module SymbolicFileMode
     fail _("non-numeric current mode (%{mode})") % { mode: to_mode.inspect } unless to_mode.is_a?(Numeric)
 
     original_mode = {
-      's' => (to_mode & 07000) >> 9,
-      'u' => (to_mode & 00700) >> 6,
-      'g' => (to_mode & 00070) >> 3,
-      'o' => (to_mode & 00007) >> 0,
+      's' => (to_mode & 0o7000) >> 9,
+      'u' => (to_mode & 0o0700) >> 6,
+      'g' => (to_mode & 0o0070) >> 3,
+      'o' => (to_mode & 0o0007) >> 0,
       # Are there any execute bits set in the original mode?
-      'any x?' => (to_mode & 00111) != 0
+      'any x?' => (to_mode & 0o0111) != 0
     }
     final_mode = {
       's' => original_mode['s'],
@@ -71,85 +75,81 @@ module SymbolicFileMode
     }
 
     modification.split(/\s*,\s*/).each do |part|
-      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
-        # make actions like 'a-g' atomic.  Various parts of the DSL refer to
-        # 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 }
-
-        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 },
-          }
-
-          dsl.split('').each do |op|
-            case op
-            when /[-+=]/
-              action = op
-              # Clear all bits, if this is assignment
-              value  = 0 if op == '='
-
-            when /[ugo]/
-              value = actions[action].call(value, snapshot_mode[op])
-
-            when /[rwx]/
-              value = actions[action].call(value, SymbolicMode[op])
-
-            when 'X'
-              # Only meaningful in combination with "set" actions.
-              if action != '+'
-                raise Puppet::Error, _("X only works with the '+' operator")
-              end
-
-              # As per the BSD manual page, set if this is a directory, or if
-              # any execute bit is set on the original (unmodified) mode.
-              # Ignored otherwise; it is "add if", not "add or clear".
-              if is_a_directory or original_mode['any x?']
-                value = actions[action].call(value, ExecBit)
-              end
-
-            when /[st]/
-              bit = SymbolicSpecialToBit[op][who] or fail _("internal error")
-              final_mode['s'] = actions[action].call(final_mode['s'], bit)
-
-            else
-              raise Puppet::Error, _('Unknown operation')
+      _, 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
+      # make actions like 'a-g' atomic.  Various parts of the DSL refer to
+      # 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 }
+
+      to.gsub('a', 'ugo').split('').uniq.each do |who|
+        value = snapshot_mode[who]
+
+        action = '!'
+        actions = {
+          '!' => ->(_, _) { raise Puppet::Error, _('Missing operation (-, =, or +)') },
+          '=' => ->(m, v) { m | v },
+          '+' => ->(m, v) { m | v },
+          '-' => ->(m, v) { m & ~v },
+        }
+
+        dsl.split('').each do |op|
+          case op
+          when /[-+=]/
+            action = op
+            # Clear all bits, if this is assignment
+            value  = 0 if op == '='
+
+          when /[ugo]/
+            value = actions[action].call(value, snapshot_mode[op])
+
+          when /[rwx]/
+            value = actions[action].call(value, SymbolicMode[op])
+
+          when 'X'
+            # Only meaningful in combination with "set" actions.
+            if action != '+'
+              raise Puppet::Error, _("X only works with the '+' operator")
             end
-          end
 
-          # Now, assign back the value.
-          final_mode[who] = value
-        end
+            # As per the BSD manual page, set if this is a directory, or if
+            # any execute bit is set on the original (unmodified) mode.
+            # Ignored otherwise; it is "add if", not "add or clear".
+            if is_a_directory or original_mode['any x?']
+              value = actions[action].call(value, ExecBit)
+            end
 
-      rescue Puppet::Error => e
-        if part.inspect != modification.inspect
-          rest = " at #{part.inspect}"
-        else
-          rest = ''
+          when /[st]/
+            bit = SymbolicSpecialToBit[op][who] or fail _("internal error")
+            final_mode['s'] = actions[action].call(final_mode['s'], bit)
+
+          else
+            raise Puppet::Error, _('Unknown operation')
+          end
         end
 
-        raise Puppet::Error, _("%{error}%{rest} in symbolic mode %{modification}") % { error: e, rest: rest, modification: modification.inspect }, e.backtrace
+        # Now, assign back the value.
+        final_mode[who] = value
       end
+    rescue Puppet::Error => e
+      if part.inspect != modification.inspect
+        rest = " at #{part.inspect}"
+      else
+        rest = ''
+      end
+
+      raise Puppet::Error, _("%{error}%{rest} in symbolic mode %{modification}") % { error: e, rest: rest, modification: modification.inspect }, e.backtrace
     end
 
-    result =
-      final_mode['s'] << 9 |
+    final_mode['s'] << 9 |
       final_mode['u'] << 6 |
       final_mode['g'] << 3 |
       final_mode['o'] << 0
-    return result
   end
 end
 end

data/lib/puppet/util/tag_set.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'set'
 require_relative '../../puppet/network/format_support'
 
@@ -5,7 +7,7 @@ class Puppet::Util::TagSet < Set
   include Puppet::Network::FormatSupport
 
   def self.from_yaml(yaml)
-    self.new(Puppet::Util::Yaml.safe_load(yaml, [Symbol]))
+    new(Puppet::Util::Yaml.safe_load(yaml, [Symbol]))
   end
 
   def to_yaml
@@ -13,7 +15,7 @@ class Puppet::Util::TagSet < Set
   end
 
   def self.from_data_hash(data)
-    self.new(data)
+    new(data)
   end
 
   # TODO: A method named #to_data_hash should not return an array

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.
@@ -70,7 +71,7 @@ module Puppet::Util::Tagging
   # @return [Boolean] true if this instance is tagged with at least one of the provided tags
   #
   def raw_tagged?(tag_array)
-    my_tags = self.tags
+    my_tags = tags
     !tag_array.index { |t| my_tags.include?(t) }.nil?
   end
 
@@ -108,16 +109,14 @@ module Puppet::Util::Tagging
   end
 
   def valid_tag?(maybe_tag)
-    begin
-      tag_enc = maybe_tag.encoding
-      if tag_enc == Encoding::UTF_8 || tag_enc == Encoding::ASCII
-        maybe_tag =~ ValidTagRegex
-      else
-        maybe_tag.encode(Encoding::UTF_8) =~ ValidTagRegex
-      end
-    rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError
-      false
+    tag_enc = maybe_tag.encoding
+    if tag_enc == Encoding::UTF_8 || tag_enc == Encoding::ASCII
+      maybe_tag =~ ValidTagRegex
+    else
+      maybe_tag.encode(Encoding::UTF_8) =~ ValidTagRegex
     end
+  rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError
+    false
   end
 
   private

data/lib/puppet/util/terminal.rb

@@ -1,3 +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`).
@@ -6,11 +8,11 @@ module Puppet::Util::Terminal
   # @return [Number] The column width of the terminal.  Defaults to 80 columns.
   def self.width
     if Puppet.features.posix?
-      result = %x{stty size 2>/dev/null}.split[1] ||
-               %x{tput cols 2>/dev/null}.split[0]
+      result = %x(stty size 2>/dev/null).split[1] ||
+               %x(tput cols 2>/dev/null).split[0]
     end
-    return (result || '80').to_i
+    (result || '80').to_i
   rescue
-    return 80
+    80
   end
 end

data/lib/puppet/util/user_attr.rb

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

data/lib/puppet/util/warnings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Methods to help with handling warnings.
 module Puppet::Util::Warnings
   module_function
@@ -8,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
 
@@ -24,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,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/util/watcher'
 
 # Monitor a given file for changes on a periodic interval. Changes are detected
@@ -17,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,3 +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,3 +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
@@ -34,4 +36,3 @@ class Puppet::Util::Watcher::PeriodicWatcher
     end
   end
 end
-

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

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

data/lib/puppet/util/watcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Puppet::Util::Watcher
   require_relative 'watcher/timer'
   require_relative 'watcher/change_watcher'
@@ -6,11 +8,9 @@ module Puppet::Util::Watcher
   module Common
     def self.file_ctime_change_watcher(filename)
       Puppet::Util::Watcher::ChangeWatcher.watch(lambda do
-        begin
-          Puppet::FileSystem.stat(filename).ctime
-        rescue Errno::ENOENT, Errno::ENOTDIR
-          :absent
-        end
+        Puppet::FileSystem.stat(filename).ctime
+      rescue Errno::ENOENT, Errno::ENOTDIR
+        :absent
       end)
     end
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Windows Access Control Entry
 #
 # Represents an access control entry, which grants or denies a subject,
@@ -60,7 +62,7 @@ class Puppet::Util::Windows::AccessControlEntry
   end
 
   def inspect
-    inheritance = ""
+    inheritance = ''.dup
     inheritance << '(I)' if inherited?
     inheritance << '(OI)' if object_inherit?
     inheritance << '(CI)' if container_inherit?

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Windows Access Control List
 #
 # Represents a list of access control entries (ACEs).
@@ -25,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+.
@@ -69,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
@@ -87,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
 
@@ -97,7 +100,7 @@ class Puppet::Util::Windows::AccessControlList
   end
 
   def inspect
-    str = ""
+    str = ''.dup
     @aces.each do |ace|
       str << "  #{ace.inspect}\n"
     end
@@ -106,7 +109,7 @@ class Puppet::Util::Windows::AccessControlList
 
   def ==(other)
     self.class == other.class &&
-      self.to_a == other.to_a
+      to_a == other.to_a
   end
 
   alias eql? ==