puppet 8.5.1 → 8.7.0

data/lib/puppet/settings/file_setting.rb

@@ -126,7 +126,7 @@ class Puppet::Settings::FileSetting < Puppet::Settings::StringSetting
     type = self.type
     return nil unless type
 
-    path = self.value
+    path = value
 
     return nil unless path.is_a?(String)
 
@@ -134,12 +134,12 @@ class Puppet::Settings::FileSetting < Puppet::Settings::StringSetting
     path = File.expand_path(path)
 
     return nil unless type == :directory || Puppet::FileSystem.exist?(path)
-    return nil if path =~ /^\/dev/ || path =~ /^[A-Z]:\/dev/i
+    return nil if path =~ %r{^/dev} || path =~ %r{^[A-Z]:/dev}i
 
     resource = Puppet::Resource.new(:file, path)
 
     if Puppet[:manage_internal_file_permissions]
-      if self.mode
+      if mode
         # This ends up mimicking the munge method of the mode
         # parameter to make sure that we're always passing the string
         # version of the octal number.  If we were setting the
@@ -156,8 +156,8 @@ class Puppet::Settings::FileSetting < Puppet::Settings::StringSetting
 
       # REMIND fails on Windows because chown/chgrp functionality not supported yet
       if Puppet.features.root? and !Puppet::Util::Platform.windows?
-        resource[:owner] = self.owner if self.owner
-        resource[:group] = self.group if self.group
+        resource[:owner] = owner if owner
+        resource[:group] = group if group
       end
     end
 
@@ -166,7 +166,7 @@ class Puppet::Settings::FileSetting < Puppet::Settings::StringSetting
     resource[:links] = :follow
     resource[:backup] = false
 
-    resource.tag(self.section, self.name, "settings")
+    resource.tag(section, name, "settings")
 
     resource
   end
@@ -215,14 +215,14 @@ class Puppet::Settings::FileSetting < Puppet::Settings::StringSetting
 
     Puppet::Util::SUIDManager.asuser(*chown) do
       # Update the umask to make non-executable files
-      Puppet::Util.withumask(File.umask ^ 0111) do
-        yielded_value = case self.mode
+      Puppet::Util.withumask(File.umask ^ 0o111) do
+        yielded_value = case mode
                         when String
-                          self.mode.to_i(8)
+                          mode.to_i(8)
                         when NilClass
-                          0640
+                          0o640
                         else
-                          self.mode
+                          mode
                         end
 
         yield yielded_value

data/lib/puppet/settings/ini_file.rb

@@ -16,9 +16,9 @@ class Puppet::Settings::IniFile
     config_fh.each_line do |line|
       case line.chomp
       when /^(\s*)\[([[:word:]]+)\](\s*)$/
-        config.append(SectionLine.new($1, $2, $3))
+        config.append(SectionLine.new(::Regexp.last_match(1), ::Regexp.last_match(2), ::Regexp.last_match(3)))
       when /^(\s*)([[:word:]]+)(\s*=\s*)(.*?)(\s*)$/
-        config.append(SettingLine.new($1, $2, $3, $4, $5))
+        config.append(SettingLine.new(::Regexp.last_match(1), ::Regexp.last_match(2), ::Regexp.last_match(3), ::Regexp.last_match(4), ::Regexp.last_match(5)))
       else
         config.append(Line.new(line))
       end
@@ -195,7 +195,7 @@ class Puppet::Settings::IniFile
     end
 
     def ==(other)
-      super(other) && self.line_number == other.line_number
+      super(other) && line_number == other.line_number
     end
   end
 

data/lib/puppet/settings/port_setting.rb

@@ -4,7 +4,7 @@ class Puppet::Settings::PortSetting < Puppet::Settings::IntegerSetting
   def munge(value)
     value = super(value)
 
-    if value < 0 || value > 65535
+    if value < 0 || value > 65_535
       raise Puppet::Settings::ValidationError, _("Value '%{value}' is not a valid port number for parameter: %{name}") % { value: value.inspect, name: @name }
     end
 

data/lib/puppet/settings/priority_setting.rb

@@ -33,9 +33,9 @@ class Puppet::Settings::PrioritySetting < Puppet::Settings::BaseSetting
 
     if value.is_a?(Integer)
       value
-    elsif (value.is_a?(String) and value =~ /\d+/)
+    elsif value.is_a?(String) and value =~ /\d+/
       value.to_i
-    elsif (value.is_a?(String) and PRIORITY_MAP[value.to_sym])
+    elsif value.is_a?(String) and PRIORITY_MAP[value.to_sym]
       PRIORITY_MAP[value.to_sym]
     else
       raise Puppet::Settings::ValidationError, _("Invalid priority format '%{value}' for parameter: %{name}") % { value: value.inspect, name: @name }

data/lib/puppet/settings/ttl_setting.rb

@@ -44,8 +44,8 @@ class Puppet::Settings::TTLSetting < Puppet::Settings::BaseSetting
     elsif value == 'unlimited'
       Float::INFINITY
 
-    elsif (value.is_a?(String) and value =~ FORMAT)
-      $1.to_i * UNITMAP[$2 || 's']
+    elsif value.is_a?(String) and value =~ FORMAT
+      ::Regexp.last_match(1).to_i * UNITMAP[::Regexp.last_match(2) || 's']
     else
       raise Puppet::Settings::ValidationError, _("Invalid 'time to live' format '%{value}' for parameter: %{param_name}") % { value: value.inspect, param_name: param_name }
     end

data/lib/puppet/settings/value_translator.rb

@@ -4,13 +4,13 @@
 class Puppet::Settings::ValueTranslator
   def [](value)
     # Handle different data types correctly
-    return case value
-           when /^false$/i; false
-           when /^true$/i; true
-           when true; true
-           when false; false
-           else
-             value.gsub(/^["']|["']$/, '').sub(/\s+$/, '')
-           end
+    case value
+    when /^false$/i; false
+    when /^true$/i; true
+    when true; true
+    when false; false
+    else
+      value.gsub(/^["']|["']$/, '').sub(/\s+$/, '')
+    end
   end
 end

data/lib/puppet/settings.rb

@@ -50,7 +50,7 @@ class Puppet::Settings
   REQUIRED_APP_SETTINGS = [:logdir, :confdir, :vardir, :codedir]
 
   # The acceptable sections of the puppet.conf configuration file.
-  ALLOWED_SECTION_NAMES = ['main', 'server', 'master', 'agent', 'user'].freeze
+  ALLOWED_SECTION_NAMES = %w[main server master agent user].freeze
 
   NONE = 'none'
 
@@ -220,7 +220,7 @@ class Puppet::Settings
   # understand, and add them to the passed option list.
   def addargs(options)
     # Add all of the settings as valid options.
-    self.each { |_name, setting|
+    each { |_name, setting|
       setting.getopt_args.each { |args| options << args }
     }
 
@@ -231,7 +231,7 @@ class Puppet::Settings
   # understand, and add them to the passed option list.
   def optparse_addargs(options)
     # Add all of the settings as valid options.
-    self.each { |_name, setting|
+    each { |_name, setting|
       options << setting.optparse_args
     }
 
@@ -344,7 +344,7 @@ class Puppet::Settings
     option_parser.ignore_invalid_options = true
 
     # Add all global options to it.
-    self.optparse_addargs([]).each do |option|
+    optparse_addargs([]).each do |option|
       option_parser.on(*option) do |arg|
         opt, val = Puppet::Settings.clean_opt(option[0], arg)
         handlearg(opt, val)
@@ -361,7 +361,7 @@ class Puppet::Settings
 
     # remove run_mode options from the arguments so that later parses don't think
     # it is an unknown option.
-    while option_index = args.index('--run_mode') do # rubocop:disable Lint/AssignmentInCondition
+    while option_index = args.index('--run_mode') # rubocop:disable Lint/AssignmentInCondition
       args.delete_at option_index
       args.delete_at option_index
     end
@@ -421,7 +421,7 @@ class Puppet::Settings
   def create_ancestors(dir)
     parent_dir = File.dirname(dir)
 
-    if !File.exist?(parent_dir)
+    unless File.exist?(parent_dir)
       FileUtils.mkdir_p(parent_dir)
     end
   end
@@ -429,13 +429,11 @@ class Puppet::Settings
 
   def call_hooks_deferred_to_application_initialization(options = {})
     @hooks_to_call_on_application_initialization.each do |setting|
-      begin
-        setting.handle(self.value(setting.name))
-      rescue InterpolationError => err
-        raise InterpolationError, err.message, err.backtrace unless options[:ignore_interpolation_dependency_errors]
-        # swallow. We're not concerned if we can't call hooks because dependencies don't exist yet
-        # we'll get another chance after application defaults are initialized
-      end
+      setting.handle(value(setting.name))
+    rescue InterpolationError => err
+      raise InterpolationError, err.message, err.backtrace unless options[:ignore_interpolation_dependency_errors]
+      # swallow. We're not concerned if we can't call hooks because dependencies don't exist yet
+      # we'll get another chance after application defaults are initialized
     end
   end
   private :call_hooks_deferred_to_application_initialization
@@ -519,7 +517,7 @@ class Puppet::Settings
   def print_config_options
     if Puppet::Util::Log.sendlevel?(:info)
       Puppet::Util::Log.newdestination(:console)
-      message = (_("Using --configprint is deprecated. Use 'puppet config <subcommand>' instead."))
+      message = _("Using --configprint is deprecated. Use 'puppet config <subcommand>' instead.")
       Puppet.deprecation_warning(message)
     end
 
@@ -622,7 +620,7 @@ class Puppet::Settings
 
     # Determine our environment, if we have one.
     if @config[:environment]
-      env = self.value(:environment).to_sym
+      env = value(:environment).to_sym
     else
       env = NONE
     end
@@ -631,24 +629,24 @@ class Puppet::Settings
     value_sets = value_sets_for(env, preferred_run_mode)
     @config.values.select(&:has_hook?).each do |setting|
       value_sets.each do |source|
-        if source.include?(setting.name)
-          # We still have to use value to retrieve the value, since
-          # we want the fully interpolated value, not $vardir/lib or whatever.
-          # This results in extra work, but so few of the settings
-          # will have associated hooks that it ends up being less work this
-          # way overall.
-          if setting.call_hook_on_initialize?
-            @hooks_to_call_on_application_initialization |= [setting]
-          else
-            setting.handle(ChainedValues.new(
-              preferred_run_mode,
-              env,
-              value_sets,
-              @config
-            ).interpolate(setting.name))
-          end
-          break
+        next unless source.include?(setting.name)
+
+        # We still have to use value to retrieve the value, since
+        # we want the fully interpolated value, not $vardir/lib or whatever.
+        # This results in extra work, but so few of the settings
+        # will have associated hooks that it ends up being less work this
+        # way overall.
+        if setting.call_hook_on_initialize?
+          @hooks_to_call_on_application_initialization |= [setting]
+        else
+          setting.handle(ChainedValues.new(
+            preferred_run_mode,
+            env,
+            value_sets,
+            @config
+          ).interpolate(setting.name))
         end
+        break
       end
     end
 
@@ -681,15 +679,15 @@ class Puppet::Settings
 
   def main_config_file
     if explicit_config_file?
-      return self[:config]
+      self[:config]
     else
-      return File.join(Puppet::Util::RunMode[:server].conf_dir, config_file_name)
+      File.join(Puppet::Util::RunMode[:server].conf_dir, config_file_name)
     end
   end
   private :main_config_file
 
   def user_config_file
-    return File.join(Puppet::Util::RunMode[:user].conf_dir, config_file_name)
+    File.join(Puppet::Util::RunMode[:user].conf_dir, config_file_name)
   end
   private :user_config_file
 
@@ -708,7 +706,7 @@ class Puppet::Settings
       # This just means that the setting wasn't explicitly set on the command line, so we will ignore it and
       #  fall through to the default name.
     end
-    return self.class.default_config_file_name
+    self.class.default_config_file_name
   end
   private :config_file_name
 
@@ -783,9 +781,7 @@ class Puppet::Settings
       klass = StringSetting
     end
     hash[:settings] = self
-    setting = klass.new(hash)
-
-    setting
+    klass.new(hash)
   end
 
   # This has to be private, because it doesn't add the settings to @config
@@ -794,7 +790,7 @@ class Puppet::Settings
   # Iterate across all of the objects in a given section.
   def persection(section)
     section = section.to_sym
-    self.each { |_name, obj|
+    each { |_name, obj|
       if obj.section == section
         yield obj
       end
@@ -842,10 +838,10 @@ class Puppet::Settings
 
     new = @used
     @used = []
-    self.use(*new)
+    use(*new)
   end
 
-  class SearchPathElement < Struct.new(:name, :type); end
+  SearchPathElement = Struct.new(:name, :type)
 
   # The order in which to search for values, without defaults.
   #
@@ -856,7 +852,7 @@ class Puppet::Settings
   def configsearchpath(environment = nil, run_mode = preferred_run_mode)
     searchpath = [
       SearchPathElement.new(:memory, :values),
-      SearchPathElement.new(:cli, :values),
+      SearchPathElement.new(:cli, :values)
     ]
     searchpath << SearchPathElement.new(environment.intern, :environment) if environment
 
@@ -1060,7 +1056,7 @@ class Puppet::Settings
     end
 
     call.each do |setting|
-      setting.handle(self.value(setting.name))
+      setting.handle(value(setting.name))
     end
   end
 
@@ -1072,7 +1068,7 @@ class Puppet::Settings
     @config.keys.find_all { |key| @config[key].is_a?(FileSetting) }.each do |key|
       file = @config[key]
       next if file.value.nil?
-      next unless (sections.nil? or sections.include?(file.section))
+      next unless sections.nil? or sections.include?(file.section)
 
       resource = file.to_resource
       next unless resource
@@ -1091,7 +1087,7 @@ class Puppet::Settings
 
   # Convert our list of config settings into a configuration file.
   def to_config
-    str = %{The configuration file for #{Puppet.run_mode.name}.  Note that this file
+    str = %(The configuration file for #{Puppet.run_mode.name}.  Note that this file
 is likely to have unused settings in it; any setting that's
 valid anywhere in Puppet can be in any config file, even if it's not used.
 
@@ -1103,7 +1099,7 @@ own configured state, so they can be used to make Puppet a bit more self-managin
 The file format supports octothorpe-commented lines, but not partial-line comments.
 
 Generated on #{Time.now}.
-}.gsub(/^/, "# ")
+).gsub(/^/, "# ")
 
     #         Add a section heading that matches our name.
     str += "[#{preferred_run_mode}]\n"
@@ -1113,7 +1109,7 @@ Generated on #{Time.now}.
       end
     end
 
-    return str
+    str
   end
 
   # Convert to a parseable manifest
@@ -1128,7 +1124,7 @@ Generated on #{Time.now}.
   # you can 'use' a section as many times as you want.
   def use(*sections)
     if Puppet[:settings_catalog]
-      sections = sections.collect { |s| s.to_sym }
+      sections = sections.collect(&:to_sym)
       sections = sections.reject { |s| @used.include?(s) }
 
       Puppet.warning(":master section deprecated in favor of :server section") if sections.include?(:master)
@@ -1136,7 +1132,7 @@ Generated on #{Time.now}.
       # add :server if sections include :master or :master if sections include :server
       sections |= [:master, :server] if (sections & [:master, :server]).any?
 
-      sections = sections.collect { |s| s.to_sym }
+      sections = sections.collect(&:to_sym)
       sections = sections.reject { |s| @used.include?(s) }
 
       return if sections.empty?
@@ -1153,7 +1149,7 @@ Generated on #{Time.now}.
       catalog.apply do |transaction|
         if transaction.any_failed?
           report = transaction.report
-          status_failures = report.resource_statuses.values.select { |r| r.failed? }
+          status_failures = report.resource_statuses.values.select(&:failed?)
           status_fail_msg = status_failures
                             .collect(&:events)
                             .flatten
@@ -1251,9 +1247,9 @@ Generated on #{Time.now}.
   #   in {https://projects.puppetlabs.com/issues/16637 #16637}
   def which_configuration_file
     if explicit_config_file? or Puppet.features.root? then
-      return main_config_file
+      main_config_file
     else
-      return user_config_file
+      user_config_file
     end
   end
 
@@ -1275,7 +1271,7 @@ Generated on #{Time.now}.
   def screen_non_puppet_conf_settings(puppet_conf)
     puppet_conf.sections.values.each do |section|
       forbidden = section.settings.select { |setting| Puppet::Settings::EnvironmentConf::ENVIRONMENT_CONF_ONLY_SETTINGS.include?(setting.name) }
-      raise(SettingsError, "Cannot set #{forbidden.map { |s| s.name }.join(", ")} settings in puppet.conf") if !forbidden.empty?
+      raise(SettingsError, "Cannot set #{forbidden.map(&:name).join(', ')} settings in puppet.conf") unless forbidden.empty?
     end
   end
 
@@ -1369,7 +1365,7 @@ Generated on #{Time.now}.
         catalog.add_resource resource
       end
       group = setting.group
-      if group && !%w{root wheel}.include?(group) && catalog.resource(:group, group).nil?
+      if group && !%w[root wheel].include?(group) && catalog.resource(:group, group).nil?
         catalog.add_resource Puppet::Resource.new(:group, group, :parameters => { :ensure => :present })
       end
     end
@@ -1383,7 +1379,7 @@ Generated on #{Time.now}.
   # Read the file in.
   # @api private
   def read_file(file)
-    return Puppet::FileSystem.read(file, :encoding => 'utf-8')
+    Puppet::FileSystem.read(file, :encoding => 'utf-8')
   end
 
   # Private method for internal test use only; allows to do a comprehensive clear of all settings between tests.
@@ -1410,14 +1406,13 @@ Generated on #{Time.now}.
     # If they've specified neither, then the interpolation will fail and we'll
     #  get an exception.
     #
-    begin
-      return true if self[:config]
-    rescue InterpolationError
-      # This means we failed to interpolate, which means that they didn't
-      #  explicitly specify either :config or :confdir... so we'll fall out to
-      #  the default value.
-      return false
-    end
+
+    true if self[:config]
+  rescue InterpolationError
+    # This means we failed to interpolate, which means that they didn't
+    #  explicitly specify either :config or :confdir... so we'll fall out to
+    #  the default value.
+    false
   end
   private :explicit_config_file?
 
@@ -1448,7 +1443,7 @@ Generated on #{Time.now}.
       end
       if set
         value = set.lookup(name)
-        if !value.nil?
+        unless value.nil?
           return value
         end
       end
@@ -1516,7 +1511,7 @@ Generated on #{Time.now}.
       when String
         failed_environment_interpolation = false
         interpolated_value = value.gsub(/\$(\w+)|\$\{(\w+)\}/) do |expression|
-          varname = $2 || $1
+          varname = ::Regexp.last_match(2) || ::Regexp.last_match(1)
           interpolated_expression =
             if varname != ENVIRONMENT_SETTING || ok_to_interpolate_environment(setting_name)
               if varname == ENVIRONMENT_SETTING && @environment
@@ -1567,7 +1562,7 @@ Generated on #{Time.now}.
     def set(name, value)
       default = @defaults[name]
 
-      if !default
+      unless default
         raise ArgumentError, _("Attempt to assign a value to unknown setting %{name}") % { name: name.inspect }
       end
 
@@ -1588,7 +1583,7 @@ Generated on #{Time.now}.
     end
 
     def inspect
-      %Q{<#{self.class}:#{self.object_id} @name="#{@name}" @values="#{@values}">}
+      %Q(<#{self.class}:#{object_id} @name="#{@name}" @values="#{@values}">)
     end
   end
 
@@ -1612,7 +1607,7 @@ Generated on #{Time.now}.
     end
 
     def inspect
-      %Q{<#{self.class}:#{self.object_id} @name="#{@name}" @section="#{@section}">}
+      %Q(<#{self.class}:#{object_id} @name="#{@name}" @section="#{@section}">)
     end
   end
 
@@ -1649,7 +1644,7 @@ Generated on #{Time.now}.
     end
 
     def inspect
-      %Q{<#{self.class}:#{self.object_id} @environment_name="#{@environment_name}" @conf="#{@conf}">}
+      %Q(<#{self.class}:#{object_id} @environment_name="#{@environment_name}" @conf="#{@conf}">)
     end
   end
 end

data/lib/puppet/ssl/base.rb

@@ -17,7 +17,7 @@ class Puppet::SSL::Base
   end
 
   def self.to_multiple_s(instances)
-    instances.collect { |inst| inst.to_s }.join(SEPARATOR)
+    instances.collect(&:to_s).join(SEPARATOR)
   end
 
   def self.wraps(klass)
@@ -119,9 +119,7 @@ class Puppet::SSL::Base
   end
 
   def digest(algorithm = nil)
-    unless algorithm
-      algorithm = digest_algorithm
-    end
+    algorithm ||= digest_algorithm
 
     Puppet::SSL::Digest.new(algorithm, content.to_der)
   end

data/lib/puppet/ssl/certificate_request.rb

@@ -209,29 +209,27 @@ class Puppet::SSL::CertificateRequest < Puppet::SSL::Base
   # we need to prevent that field from being written to directly.
   PRIVATE_CSR_ATTRIBUTES = [
     'extReq',   '1.2.840.113549.1.9.14',
-    'msExtReq', '1.3.6.1.4.1.311.2.1.14',
+    'msExtReq', '1.3.6.1.4.1.311.2.1.14'
   ]
 
   def add_csr_attributes(csr, csr_attributes)
     csr_attributes.each do |oid, value|
-      begin
-        if PRIVATE_CSR_ATTRIBUTES.include? oid
-          raise ArgumentError, _("Cannot specify CSR attribute %{oid}: conflicts with internally used CSR attribute") % { oid: oid }
-        end
+      if PRIVATE_CSR_ATTRIBUTES.include? oid
+        raise ArgumentError, _("Cannot specify CSR attribute %{oid}: conflicts with internally used CSR attribute") % { oid: oid }
+      end
 
-        encoded = OpenSSL::ASN1::PrintableString.new(value.to_s)
+      encoded = OpenSSL::ASN1::PrintableString.new(value.to_s)
 
-        attr_set = OpenSSL::ASN1::Set.new([encoded])
-        csr.add_attribute(OpenSSL::X509::Attribute.new(oid, attr_set))
-        Puppet.debug("Added csr attribute: #{oid} => #{attr_set.inspect}")
-      rescue OpenSSL::X509::AttributeError => e
-        raise Puppet::Error, _("Cannot create CSR with attribute %{oid}: %{message}") % { oid: oid, message: e.message }, e.backtrace
-      end
+      attr_set = OpenSSL::ASN1::Set.new([encoded])
+      csr.add_attribute(OpenSSL::X509::Attribute.new(oid, attr_set))
+      Puppet.debug("Added csr attribute: #{oid} => #{attr_set.inspect}")
+    rescue OpenSSL::X509::AttributeError => e
+      raise Puppet::Error, _("Cannot create CSR with attribute %{oid}: %{message}") % { oid: oid, message: e.message }, e.backtrace
     end
   end
 
   PRIVATE_EXTENSIONS = [
-    'subjectAltName', '2.5.29.17',
+    'subjectAltName', '2.5.29.17'
   ]
 
   # @api private
@@ -240,16 +238,14 @@ class Puppet::SSL::CertificateRequest < Puppet::SSL::Base
 
     if options[:extension_requests]
       options[:extension_requests].each_pair do |oid, value|
-        begin
-          if PRIVATE_EXTENSIONS.include? oid
-            raise Puppet::Error, _("Cannot specify CSR extension request %{oid}: conflicts with internally used extension request") % { oid: oid }
-          end
-
-          ext = OpenSSL::X509::Extension.new(oid, OpenSSL::ASN1::UTF8String.new(value.to_s).to_der, false)
-          extensions << ext
-        rescue OpenSSL::X509::ExtensionError => e
-          raise Puppet::Error, _("Cannot create CSR with extension request %{oid}: %{message}") % { oid: oid, message: e.message }, e.backtrace
+        if PRIVATE_EXTENSIONS.include? oid
+          raise Puppet::Error, _("Cannot specify CSR extension request %{oid}: conflicts with internally used extension request") % { oid: oid }
         end
+
+        ext = OpenSSL::X509::Extension.new(oid, OpenSSL::ASN1::UTF8String.new(value.to_s).to_der, false)
+        extensions << ext
+      rescue OpenSSL::X509::ExtensionError => e
+        raise Puppet::Error, _("Cannot create CSR with extension request %{oid}: %{message}") % { oid: oid, message: e.message }, e.backtrace
       end
     end
 

data/lib/puppet/ssl/certificate_request_attributes.rb

@@ -23,18 +23,18 @@ class Puppet::SSL::CertificateRequestAttributes
     Puppet.info(_("csr_attributes file loading from %{path}") % { path: path })
     if Puppet::FileSystem.exist?(path)
       hash = Puppet::Util::Yaml.safe_load_file(path, [Symbol]) || {}
-      if !hash.is_a?(Hash)
+      unless hash.is_a?(Hash)
         raise Puppet::Error, _("invalid CSR attributes, expected instance of Hash, received instance of %{klass}") % { klass: hash.class }
       end
 
       @custom_attributes = hash.delete('custom_attributes') || {}
       @extension_requests = hash.delete('extension_requests') || {}
-      if not hash.keys.empty?
+      unless hash.keys.empty?
         raise Puppet::Error, _("unexpected attributes %{keys} in %{path}") % { keys: hash.keys.inspect, path: @path.inspect }
       end
 
       return true
     end
-    return false
+    false
   end
 end

data/lib/puppet/ssl/oids.rb

@@ -73,7 +73,7 @@ module Puppet::SSL::Oids
     ["1.3.6.1.4.1.34380.1.3.1", 'pp_authorization', 'Certificate Extension Authorization'],
     ["1.3.6.1.4.1.34380.1.3.2", 'pp_auth_auto_renew', 'Auto-Renew Certificate Attribute'],
     ["1.3.6.1.4.1.34380.1.3.13", 'pp_auth_role', 'Puppet Node Role Name for Authorization'],
-    ["1.3.6.1.4.1.34380.1.3.39", 'pp_cli_auth', 'Puppetserver CA CLI Authorization'],
+    ["1.3.6.1.4.1.34380.1.3.39", 'pp_cli_auth', 'Puppetserver CA CLI Authorization']
   ]
 
   @did_register_puppet_oids = false
@@ -82,7 +82,7 @@ module Puppet::SSL::Oids
   # extensions. Without registering these OIDs, OpenSSL will fail when it
   # encounters such an extension in a CSR.
   def self.register_puppet_oids
-    if !@did_register_puppet_oids
+    unless @did_register_puppet_oids
       PUPPET_OIDS.each do |oid_defn|
         OpenSSL::ASN1::ObjectId.register(*oid_defn)
       end