openvox 7.37.1 → 8.19.0

data/lib/puppet/type/tidy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/parameter/boolean'
 
 Puppet::Type.newtype(:tidy) do
@@ -30,7 +32,9 @@ Puppet::Type.newtype(:tidy) do
 
   newparam(:recurse) do
     desc "If target is a directory, recursively descend
-      into the directory looking for files to tidy."
+      into the directory looking for files to tidy. Numeric values
+      specify a limit for the recursion depth, `true` means
+      unrestricted recursion."
 
     newvalues(:true, :false, :inf, /^[0-9]+$/)
 
@@ -98,7 +102,8 @@ Puppet::Type.newtype(:tidy) do
 
     # Make sure we convert to an array.
     munge do |value|
-      fail _("Tidy can't use matches with recurse 0, false, or undef") if "#{@resource[:recurse]}" =~ /^(0|false|)$/
+      fail _("Tidy can't use matches with recurse 0, false, or undef") if (@resource[:recurse]).to_s =~ /^(0|false|)$/
+
       [value].flatten
     end
 
@@ -107,7 +112,7 @@ Puppet::Type.newtype(:tidy) do
     def tidy?(path, stat)
       basename = File.basename(path)
       flags = File::FNM_DOTMATCH | File::FNM_PATHNAME
-      return(value.find {|pattern| File.fnmatch(pattern, basename, flags) } ? true : false)
+      (value.find { |pattern| File.fnmatch(pattern, basename, flags) } ? true : false)
     end
   end
 
@@ -136,7 +141,7 @@ Puppet::Type.newtype(:tidy) do
     def convert(unit, multi)
       num = AgeConvertors[unit]
       if num
-        return num * multi
+        num * multi
       else
         self.fail _("Invalid age unit '%{unit}'") % { unit: unit }
       end
@@ -151,13 +156,13 @@ Puppet::Type.newtype(:tidy) do
       unit = multi = nil
       case age
       when /^([0-9]+)(\w)\w*$/
-        multi = Integer($1)
-        unit = $2.downcase.intern
+        multi = Integer(Regexp.last_match(1))
+        unit = Regexp.last_match(2).downcase.intern
       when /^([0-9]+)$/
-        multi = Integer($1)
+        multi = Integer(Regexp.last_match(1))
         unit = :d
       else
-        #TRANSLATORS tidy is the name of a program and should not be translated
+        # TRANSLATORS tidy is the name of a program and should not be translated
         self.fail _("Invalid tidy age %{age}") % { age: age }
       end
 
@@ -178,7 +183,7 @@ Puppet::Type.newtype(:tidy) do
       if num
         result = multi
         num.times do result *= 1024 end
-        return result
+        result
       else
         self.fail _("Invalid size unit '%{unit}'") % { unit: unit }
       end
@@ -191,13 +196,13 @@ Puppet::Type.newtype(:tidy) do
     munge do |size|
       case size
       when /^([0-9]+)(\w)\w*$/
-        multi = Integer($1)
-        unit = $2.downcase.intern
+        multi = Integer(Regexp.last_match(1))
+        unit = Regexp.last_match(2).downcase.intern
       when /^([0-9]+)$/
-        multi = Integer($1)
+        multi = Integer(Regexp.last_match(1))
         unit = :k
       else
-        #TRANSLATORS tidy is the name of a program and should not be translated
+        # TRANSLATORS tidy is the name of a program and should not be translated
         self.fail _("Invalid tidy size %{age}") % { age: age }
       end
 
@@ -257,9 +262,9 @@ Puppet::Type.newtype(:tidy) do
     # Our ensure property knows how to retrieve everything for us.
     obj = @parameters[:ensure]
     if obj
-      return obj.retrieve
+      obj.retrieve
     else
-      return {}
+      {}
     end
   end
 
@@ -289,9 +294,9 @@ Puppet::Type.newtype(:tidy) do
       files = [self[:path]]
     end
     found_files = files.find_all { |path| tidy?(path) }.collect { |path| mkfile(path) }
-    result = found_files.each { |file| debug "Tidying #{file.ref}" }.sort { |a,b| b[:path] <=> a[:path] }
+    result = found_files.each { |file| debug "Tidying #{file.ref}" }.sort { |a, b| b[:path] <=> a[:path] }
     if found_files.size > 0
-      #TRANSLATORS "Tidy" is a program name and should not be translated
+      # TRANSLATORS "Tidy" is a program name and should not be translated
       notice _("Tidying %{count} files") % { count: found_files.size }
     end
 
@@ -301,12 +306,13 @@ Puppet::Type.newtype(:tidy) do
 
     # Now make sure that all directories require the files they contain, if all are available,
     # so that a directory is emptied before we try to remove it.
-    files_by_name = result.inject({}) { |hash, file| hash[file[:path]] = file; hash }
+    files_by_name = result.each_with_object({}) { |file, hash| hash[file[:path]] = file; }
 
-    files_by_name.keys.sort { |a,b| b <=> a }.each do |path|
+    files_by_name.keys.sort { |a, b| b <=> a }.each do |path|
       dir = ::File.dirname(path)
       resource = files_by_name[dir]
       next unless resource
+
       if resource[:require]
         resource[:require] << Puppet::Resource.new(:file, path)
       else
@@ -324,11 +330,11 @@ Puppet::Type.newtype(:tidy) do
 
     basename = File.basename(path)
     flags = File::FNM_DOTMATCH | File::FNM_PATHNAME
-    if self[:matches].find {|pattern| File.fnmatch(pattern, basename, flags) }
-      return true
+    if self[:matches].find { |pattern| File.fnmatch(pattern, basename, flags) }
+      true
     else
       debug "No specified patterns match #{path}, not tidying"
-      return false
+      false
     end
   end
 
@@ -341,36 +347,36 @@ Puppet::Type.newtype(:tidy) do
     stat = self.stat(path)
     return false unless stat
 
-    return false if stat.ftype == "directory" and ! rmdirs?
+    return false if stat.ftype == "directory" and !rmdirs?
 
     # The 'matches' parameter isn't OR'ed with the other tests --
     # it's just used to reduce the list of files we can match.
     param = parameter(:matches)
-    return false if param && ! param.tidy?(path, stat)
+    return false if param && !param.tidy?(path, stat)
 
     tested = false
     [:age, :size].each do |name|
       param = parameter(name)
       next unless param
+
       tested = true
       return true if param.tidy?(path, stat)
     end
 
     # If they don't specify either, then the file should always be removed.
     return true unless tested
+
     false
   end
 
   def stat(path)
-    begin
-      Puppet::FileSystem.lstat(path)
-    rescue Errno::ENOENT
-      debug _("File does not exist")
-      return nil
-    rescue Errno::EACCES
-      #TRANSLATORS "stat" is a program name and should not be translated
-      warning _("Could not stat; permission denied")
-      return nil
-    end
+    Puppet::FileSystem.lstat(path)
+  rescue Errno::ENOENT
+    debug _("File does not exist")
+    nil
+  rescue Errno::EACCES
+    # TRANSLATORS "stat" is a program name and should not be translated
+    warning _("Could not stat; permission denied")
+    nil
   end
 end

data/lib/puppet/type/user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'etc'
 require_relative '../../puppet/parameter/boolean'
 require_relative '../../puppet/property/list'
@@ -21,47 +23,47 @@ module Puppet
       user resource will autorequire those role accounts."
 
     feature :allows_duplicates,
-      "The provider supports duplicate users with the same UID."
+            "The provider supports duplicate users with the same UID."
 
     feature :manages_homedir,
-      "The provider can create and remove home directories."
+            "The provider can create and remove home directories."
 
     feature :manages_passwords,
-      "The provider can modify user passwords, by accepting a password
+            "The provider can modify user passwords, by accepting a password
       hash."
 
     feature :manages_password_age,
-      "The provider can set age requirements and restrictions for
+            "The provider can set age requirements and restrictions for
       passwords."
 
     feature :manages_password_salt,
-      "The provider can set a password salt. This is for providers that
+            "The provider can set a password salt. This is for providers that
        implement PBKDF2 passwords with salt properties."
 
     feature :manages_solaris_rbac,
-      "The provider can manage normal users"
+            "The provider can manage normal users"
 
     feature :manages_roles,
-      "The provider can manage roles"
+            "The provider can manage roles"
 
     feature :manages_expiry,
-      "The provider can manage the expiry date for a user."
+            "The provider can manage the expiry date for a user."
 
-   feature :system_users,
-     "The provider allows you to create system users with lower UIDs."
+    feature :system_users,
+            "The provider allows you to create system users with lower UIDs."
 
     feature :manages_aix_lam,
-      "The provider can manage AIX Loadable Authentication Module (LAM) system."
+            "The provider can manage AIX Loadable Authentication Module (LAM) system."
 
     feature :manages_local_users_and_groups,
-      "Allows local users to be managed on systems that also use some other
+            "Allows local users to be managed on systems that also use some other
        remote Name Service Switch (NSS) method of managing accounts."
 
     feature :manages_shell,
-      "The provider allows for setting shell and validates if possible"
+            "The provider allows for setting shell and validates if possible"
 
     feature :manages_loginclass,
-      "The provider can manage the login class for a user."
+            "The provider can manage the login class for a user."
 
     newproperty(:ensure, :parent => Puppet::Property::Ensure) do
       newvalue(:present, :event => :user_created) do
@@ -91,12 +93,12 @@ module Puppet
       def retrieve
         if provider.exists?
           if provider.respond_to?(:is_role?) and provider.is_role?
-            return :role
+            :role
           else
-            return :present
+            :present
           end
         else
-          return :absent
+          :absent
         end
       end
 
@@ -171,11 +173,11 @@ module Puppet
         found = false
         @should.each do |value|
           number = Puppet::Util.gid(value)
-          if number
-            provider.gid = number
-            found = true
-            break
-          end
+          next unless number
+
+          provider.gid = number
+          found = true
+          break
         end
 
         fail _("Could not find group(s) %{groups}") % { groups: @should.join(",") } unless found
@@ -192,6 +194,7 @@ module Puppet
         if !@should.empty? && provider.respond_to?(:comments_insync?)
           return provider.comments_insync?(is, @should)
         end
+
         super(is)
       end
 
@@ -202,6 +205,7 @@ module Puppet
         if newvalue.is_a?(String) && !Encoding.compatible?(currentvalue, newvalue)
           return super(currentvalue, newvalue.dup.force_encoding(currentvalue.encoding))
         end
+
         super(currentvalue, newvalue)
       end
     end
@@ -227,9 +231,9 @@ module Puppet
         * OS X 10.8 and higher use salted SHA512 PBKDF2 hashes. When managing passwords
           on these systems, the `salt` and `iterations` attributes need to be specified as
           well as the password.
-        * macOS 10.15 and higher require the salt to be 32-bytes. Since Puppet's user 
+        * macOS 10.15 and later require the salt to be 32 bytes. Because Puppet's user
           resource requires the value to be hex encoded, the length of the salt's
-          string must be 64. 
+          string must be 64.
         * Windows passwords can be managed only in cleartext, because there is no Windows
           API for setting the password hash.
 
@@ -430,13 +434,13 @@ module Puppet
         run.
 
         Note that on Windows, this manages creation/deletion of the user profile instead of the
-        home directory. The user profile is stored in the `C:\Users\<username>` directory."
+        home directory. The user profile is stored in the `C:\\Users\\<username>` directory."
 
       defaultto false
 
       validate do |val|
         if munge(val)
-          raise ArgumentError, _("User provider %{name} can not manage home directories") % { name: provider.class.name } if provider and not provider.class.manages_homedir?
+          raise ArgumentError, _("User provider %{name} can not manage home directories") % { name: provider.class.name } if provider and !provider.class.manages_homedir?
         end
       end
     end
@@ -451,8 +455,8 @@ module Puppet
 
       validate do |value|
         if value.intern != :absent and value !~ /^\d{4}-\d{2}-\d{2}$/
-          #TRANSLATORS YYYY-MM-DD represents a date with a four-digit year, a two-digit month, and a two-digit day,
-          #TRANSLATORS separated by dashes.
+          # TRANSLATORS YYYY-MM-DD represents a date with a four-digit year, a two-digit month, and a two-digit day,
+          # TRANSLATORS separated by dashes.
           raise ArgumentError, _("Expiry dates must be YYYY-MM-DD or the string \"absent\"")
         end
       end
@@ -467,7 +471,7 @@ module Puppet
       groups = obj.shouldorig if obj
       if groups
         groups = groups.collect { |group|
-          if group.is_a?(String) && group =~/^\d+$/
+          if group.is_a?(String) && group =~ /^\d+$/
             Integer(group)
           else
             group
@@ -526,7 +530,7 @@ module Puppet
       end
     end
 
-    #autorequire the roles that the user has
+    # autorequire the roles that the user has
     autorequire(:user) do
       reqs = []
 
@@ -629,16 +633,16 @@ module Puppet
     end
 
     newproperty(:attributes, :parent => Puppet::Property::KeyValue, :required_features => :manages_aix_lam) do
-      desc "Specify AIX attributes for the user in an array or hash of attribute = value pairs. 
-      
+      desc "Specify AIX attributes for the user in an array or hash of attribute = value pairs.
+
       For example:
-      
+
       ```
       ['minage=0', 'maxage=5', 'SYSTEM=compat']
       ```
-      
-      or 
-    
+
+      or
+
      ```
      attributes => { 'minage' => '0', 'maxage' => '5', 'SYSTEM' => 'compat' }
      ```
@@ -677,7 +681,7 @@ module Puppet
             newer."
 
       munge do |value|
-        if value.is_a?(String) and value =~/^[-0-9]+$/
+        if value.is_a?(String) and value =~ /^[-0-9]+$/
           Integer(value)
         else
           value
@@ -686,17 +690,17 @@ module Puppet
     end
 
     newparam(:forcelocal, :boolean => true,
-            :required_features => :manages_local_users_and_groups,
-            :parent => Puppet::Parameter::Boolean) do
+                          :required_features => :manages_local_users_and_groups,
+                          :parent => Puppet::Parameter::Boolean) do
       desc "Forces the management of local accounts when accounts are also
             being managed by some other Name Service Switch (NSS). For AIX, refer to the `ia_load_module` parameter.
-            
+
             This option relies on your operating system's implementation of `luser*` commands, such as `luseradd` , and `lgroupadd`, `lusermod`. The `forcelocal` option could behave unpredictably in some circumstances. If the tools it depends on are not available, it might have no effect at all."
       defaultto false
     end
 
     def generate
-      if !self[:purge_ssh_keys].empty?
+      unless self[:purge_ssh_keys].empty?
         if Puppet::Type.type(:ssh_authorized_key).nil?
           warning _("Ssh_authorized_key type is not available. Cannot purge SSH keys.")
         else
@@ -711,7 +715,7 @@ module Puppet
       desc "Whether to purge authorized SSH keys for this user if they are not managed
         with the `ssh_authorized_key` resource type. This parameter is a noop if the
         ssh_authorized_key type is not available.
-        
+
         Allowed values are:
 
         * `false` (default) --- don't purge SSH keys for this user.
@@ -729,13 +733,13 @@ module Puppet
       newvalues(:true, :false)
 
       validate do |value|
-        if [ :true, :false ].include? value.to_s.intern
+        if [:true, :false].include? value.to_s.intern
           return
         end
-        value = [ value ] if value.is_a?(String)
+
+        value = [value] if value.is_a?(String)
         if value.is_a?(Array)
           value.each do |entry|
-
             raise ArgumentError, _("Each entry for purge_ssh_keys must be a string, not a %{klass}") % { klass: entry.class } unless entry.is_a?(String)
 
             valid_home = Puppet::Util.absolute_path?(entry) || entry =~ %r{^~/|^%h/}
@@ -754,12 +758,12 @@ module Puppet
           []
         when :true, true, "true"
           home = homedir
-          home ? [ "#{home}/.ssh/authorized_keys" ] : []
+          home ? ["#{home}/.ssh/authorized_keys"] : []
         else
           # value can be a string or array - munge each value
-          [ value ].flatten.map do |entry|
+          [value].flatten.filter_map do |entry|
             authorized_keys_path(entry)
-          end.compact
+          end
         end
       end
 
@@ -805,10 +809,10 @@ module Puppet
     # @see generate
     # @api private
     def find_unmanaged_keys
-      self[:purge_ssh_keys].
-        select { |f| File.readable?(f) }.
-        map { |f| unknown_keys_in_file(f) }.
-        flatten.each do |res|
+      self[:purge_ssh_keys]
+        .select { |f| File.readable?(f) }
+        .map { |f| unknown_keys_in_file(f) }
+        .flatten.each do |res|
           res[:ensure] = :absent
           res[:user] = self[:name]
           res.copy_metaparams(@parameters)
@@ -834,23 +838,25 @@ module Puppet
       # the authorized_keys file may contain UTF-8 comments
       Puppet::FileSystem.open(keyfile, nil, 'r:UTF-8').each do |line|
         next unless line =~ Puppet::Type.type(:ssh_authorized_key).keyline_regex
+
         # the name is stored in the 4th capture of the regex
-        name = $4
+        name = ::Regexp.last_match(4)
         if name.empty?
-          $3.delete("\n")
+          ::Regexp.last_match(3).delete("\n")
           # If no comment is specified for this key, generate a unique internal
           # name. This uses the same rules as
           # provider/ssh_authorized_key/parsed (PUP-3357)
           name = "#{keyfile}:unnamed-#{name_index += 1}"
         end
         names << name
-        Puppet.debug "#{self.ref} parsed for purging Ssh_authorized_key[#{name}]"
+        Puppet.debug "#{ref} parsed for purging Ssh_authorized_key[#{name}]"
       end
 
       names.map { |keyname|
         Puppet::Type.type(:ssh_authorized_key).new(
           :name => keyname,
-          :target => keyfile)
+          :target => keyfile
+        )
       }.reject { |res|
         catalog.resource_refs.include? res.ref
       }

data/lib/puppet/type/whit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Puppet::Type.newtype(:whit) do
   desc "Whits are internal artifacts of Puppet's current implementation, and
     Puppet suppresses their appearance in all logs. We make no guarantee of
@@ -9,7 +11,6 @@ Puppet::Type.newtype(:whit) do
     desc "The name of the whit, because it must have one."
   end
 
-
   # Hide the fact that we're a whit from logs.
   #
   # I hate you, milkman whit.  You are so painful, so often.