puppet 8.3.1-x86-mingw32 → 8.5.0-x86-mingw32

data/lib/puppet/settings.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../puppet'
 require 'getoptlong'
 require_relative '../puppet/util/watched_file'
@@ -6,6 +7,7 @@ require_relative '../puppet/util/command_line/puppet_option_parser'
 require 'forwardable'
 require 'fileutils'
 require 'concurrent'
+require_relative 'concurrent/lock'
 
 # The class for handling configuration files.
 class Puppet::Settings
@@ -56,18 +58,18 @@ class Puppet::Settings
   # returns reasonable application default settings values for a given run_mode.
   def self.app_defaults_for_run_mode(run_mode)
     {
-        :name      => run_mode.to_s,
-        :run_mode  => run_mode.name,
-        :confdir   => run_mode.conf_dir,
-        :codedir   => run_mode.code_dir,
-        :vardir    => run_mode.var_dir,
-        :publicdir => run_mode.public_dir,
-        :rundir    => run_mode.run_dir,
-        :logdir    => run_mode.log_dir,
+      :name => run_mode.to_s,
+      :run_mode => run_mode.name,
+      :confdir => run_mode.conf_dir,
+      :codedir => run_mode.code_dir,
+      :vardir => run_mode.var_dir,
+      :publicdir => run_mode.public_dir,
+      :rundir => run_mode.run_dir,
+      :logdir => run_mode.log_dir,
     }
   end
 
-  def self.default_certname()
+  def self.default_certname
     hostname = hostname_fact
     domain = domain_fact
     if domain and domain != ""
@@ -78,11 +80,11 @@ class Puppet::Settings
     fqdn.to_s.gsub(/\.$/, '')
   end
 
-  def self.hostname_fact()
+  def self.hostname_fact
     Puppet.runtime[:facter].value 'networking.hostname'
   end
 
-  def self.domain_fact()
+  def self.domain_fact
     Puppet.runtime[:facter].value 'networking.domain'
   end
 
@@ -119,9 +121,10 @@ class Puppet::Settings
     newhash = {}
     hash.each do |key, val|
       key = key.to_s
-      if val.is_a? Hash
+      case val
+      when Hash
         newhash[key] = stringifyhash(val)
-      elsif val.is_a? Symbol
+      when Symbol
         newhash[key] = val.to_s
       else
         newhash[key] = val
@@ -147,8 +150,23 @@ class Puppet::Settings
     @configuration_file = nil
 
     # And keep a per-environment cache
-    @cache = Concurrent::Hash.new { |hash, key| hash[key] = Concurrent::Hash.new }
-    @values = Concurrent::Hash.new { |hash, key| hash[key] = Concurrent::Hash.new }
+    # We can't use Concurrent::Map because we want to preserve insertion order
+    @cache_lock = Puppet::Concurrent::Lock.new
+    @cache = Concurrent::Hash.new do |hash, key|
+      @cache_lock.synchronize do
+        break hash[key] if hash.key?(key)
+
+        hash[key] = Concurrent::Hash.new
+      end
+    end
+    @values_lock = Puppet::Concurrent::Lock.new
+    @values = Concurrent::Hash.new do |hash, key|
+      @values_lock.synchronize do
+        break hash[key] if hash.key?(key)
+
+        hash[key] = Concurrent::Hash.new
+      end
+    end
 
     # The list of sections we've used.
     @used = []
@@ -202,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|
+    self.each { |_name, setting|
       setting.getopt_args.each { |args| options << args }
     }
 
@@ -213,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|
+    self.each { |_name, setting|
       options << setting.optparse_args
     }
 
@@ -223,7 +241,7 @@ class Puppet::Settings
   # Is our setting a boolean setting?
   def boolean?(param)
     param = param.to_sym
-    @config.include?(param) and @config[param].kind_of?(BooleanSetting)
+    @config.include?(param) and @config[param].is_a?(BooleanSetting)
   end
 
   # Remove all set values, potentially skipping cli values.
@@ -264,7 +282,6 @@ class Puppet::Settings
   #
   # @api private
   def clear_environment_settings(environment)
-
     if environment.nil?
       return
     end
@@ -297,7 +314,7 @@ class Puppet::Settings
     @used = []
   end
 
-  def global_defaults_initialized?()
+  def global_defaults_initialized?
     @global_defaults_initialized
   end
 
@@ -344,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') do # rubocop:disable Lint/AssignmentInCondition
       args.delete_at option_index
       args.delete_at option_index
     end
@@ -361,14 +378,13 @@ class Puppet::Settings
   def self.clean_opt(opt, val)
     # rewrite --[no-]option to --no-option if that's what was given
     if opt =~ /\[no-\]/ and !val
-      opt = opt.gsub(/\[no-\]/,'no-')
+      opt = opt.gsub(/\[no-\]/, 'no-')
     end
     # otherwise remove the [no-] prefix to not confuse everybody
     opt = opt.gsub(/\[no-\]/, '')
     [opt, val]
   end
 
-
   def app_defaults_initialized?
     @app_defaults_initialized
   end
@@ -417,8 +433,8 @@ class Puppet::Settings
         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
+        # 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
   end
@@ -460,14 +476,15 @@ class Puppet::Settings
   def handlearg(opt, value = nil)
     @cache.clear
 
-    if value.is_a?(FalseClass)
+    case value
+    when FalseClass
       value = "false"
-    elsif value.is_a?(TrueClass)
+    when TrueClass
       value = "true"
     end
 
     value &&= @translate[value]
-    str = opt.sub(/^--/,'')
+    str = opt.sub(/^--/, '')
 
     bool = true
     newstr = str.sub(/^no-/, '')
@@ -510,23 +527,23 @@ class Puppet::Settings
     val = value(:configprint)
     if val == "all"
       hash = {}
-      each do |name, obj|
-        val = value(name,env)
+      each do |name, _obj|
+        val = value(name, env)
         val = val.inspect if val == ""
         hash[name] = val
       end
-      hash.sort { |a,b| a[0].to_s <=> b[0].to_s }.each do |name, v|
+      hash.sort { |a, b| a[0].to_s <=> b[0].to_s }.each do |name, v|
         puts "#{name} = #{v}"
       end
     else
       val.split(/\s*,\s*/).sort.each do |v|
         if include?(v)
-          #if there is only one value, just print it for back compatibility
+          # if there is only one value, just print it for back compatibility
           if v == val
-            puts value(val,env)
+            puts value(val, env)
             break
           end
-          puts "#{v} = #{value(v,env)}"
+          puts "#{v} = #{value(v, env)}"
         else
           puts "invalid setting: #{v}"
           return false
@@ -549,6 +566,7 @@ class Puppet::Settings
   def print_configs
     return print_config_options if value(:configprint) != ""
     return generate_config if value(:genconfig)
+
     generate_manifest if value(:genmanifest)
   end
 
@@ -570,11 +588,11 @@ class Puppet::Settings
   def preferred_run_mode=(mode)
     mode = mode.to_s.downcase.intern
     raise ValidationError, "Invalid run mode '#{mode}'" unless [:server, :master, :agent, :user].include?(mode)
+
     @preferred_run_mode_name = mode
     # Changing the run mode has far-reaching consequences. Flush any cached
     # settings so they will be re-generated.
     flush_cache
-    mode
   end
 
   def parse_config(text, file = "text")
@@ -620,13 +638,14 @@ class Puppet::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 ]
+            @hooks_to_call_on_application_initialization |= [setting]
           else
             setting.handle(ChainedValues.new(
               preferred_run_mode,
               env,
               value_sets,
-              @config).interpolate(setting.name))
+              @config
+            ).interpolate(setting.name))
           end
           break
         end
@@ -644,7 +663,7 @@ class Puppet::Settings
       begin
         text = read_file(file)
       rescue => detail
-        message = _("Could not load %{file}: %{detail}") % { file: file, detail: detail}
+        message = _("Could not load %{file}: %{detail}") % { file: file, detail: detail }
         if require_config
           Puppet.log_and_raise(detail, message)
         else
@@ -718,26 +737,26 @@ class Puppet::Settings
   end
 
   SETTING_TYPES = {
-      :string     => StringSetting,
-      :file       => FileSetting,
-      :directory  => DirectorySetting,
-      :file_or_directory => FileOrDirectorySetting,
-      :path       => PathSetting,
-      :boolean    => BooleanSetting,
-      :integer    => IntegerSetting,
-      :port       => PortSetting,
-      :terminus   => TerminusSetting,
-      :duration   => DurationSetting,
-      :ttl        => TTLSetting,
-      :array      => ArraySetting,
-      :enum       => EnumSetting,
-      :symbolic_enum   => SymbolicEnumSetting,
-      :priority   => PrioritySetting,
-      :autosign   => AutosignSetting,
-      :server_list => ServerListSetting,
-      :http_extra_headers => HttpExtraHeadersSetting,
-      :certificate_revocation => CertificateRevocationSetting,
-      :alias => AliasSetting
+    :string => StringSetting,
+    :file => FileSetting,
+    :directory => DirectorySetting,
+    :file_or_directory => FileOrDirectorySetting,
+    :path => PathSetting,
+    :boolean => BooleanSetting,
+    :integer => IntegerSetting,
+    :port => PortSetting,
+    :terminus => TerminusSetting,
+    :duration => DurationSetting,
+    :ttl => TTLSetting,
+    :array => ArraySetting,
+    :enum => EnumSetting,
+    :symbolic_enum => SymbolicEnumSetting,
+    :priority => PrioritySetting,
+    :autosign => AutosignSetting,
+    :server_list => ServerListSetting,
+    :http_extra_headers => HttpExtraHeadersSetting,
+    :certificate_revocation => CertificateRevocationSetting,
+    :alias => AliasSetting
   }
 
   # Create a new setting.  The value is passed in because it's used to determine
@@ -755,6 +774,7 @@ class Puppet::Settings
       unless klass
         raise ArgumentError, _("Invalid setting type '%{type}'") % { type: type }
       end
+
       hash.delete(:type)
     else
       # The only implicit typing we still do for settings is to fall back to "String" type if they didn't explicitly
@@ -774,7 +794,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|
+    self.each { |_name, obj|
       if obj.section == section
         yield obj
       end
@@ -795,6 +815,7 @@ class Puppet::Settings
 
   def files
     return @files if @files
+
     @files = []
     [main_config_file, user_config_file].each do |path|
       if Puppet::FileSystem.exist?(path)
@@ -818,6 +839,7 @@ class Puppet::Settings
 
   def reuse
     return unless defined?(@used)
+
     new = @used
     @used = []
     self.use(*new)
@@ -923,7 +945,7 @@ class Puppet::Settings
     when :environment
       ValuesFromEnvironmentConf.new(source.name)
     else
-      raise Puppet::DevError, _("Unknown searchpath case: %{source_type} for the %{source} settings path element.") % { source_type: source.type, source: source}
+      raise Puppet::DevError, _("Unknown searchpath case: %{source_type} for the %{source} settings path element.") % { source_type: source.type, source: source }
     end
   end
 
@@ -1010,6 +1032,7 @@ class Puppet::Settings
       hash[:name] = name
       hash[:section] = section
       raise ArgumentError, _("Setting %{name} is already defined") % { name: name } if @config.include?(name)
+
       tryconfig = newsetting(hash)
       short = tryconfig.short
       if short
@@ -1017,6 +1040,7 @@ class Puppet::Settings
         if other
           raise ArgumentError, _("Setting %{name} is already using short name '%{short}'") % { name: other.name, short: short }
         end
+
         @shortnames[short] = tryconfig
       end
       @config[name] = tryconfig
@@ -1028,7 +1052,7 @@ class Puppet::Settings
         if tryconfig.call_hook_on_define?
           call << tryconfig
         elsif tryconfig.call_hook_on_initialize?
-          @hooks_to_call_on_application_initialization |= [ tryconfig ]
+          @hooks_to_call_on_application_initialization |= [tryconfig]
         end
       end
 
@@ -1049,11 +1073,12 @@ class Puppet::Settings
       file = @config[key]
       next if file.value.nil?
       next unless (sections.nil? or sections.include?(file.section))
+
       resource = file.to_resource
       next unless resource
       next if catalog.resource(resource.ref)
 
-      Puppet.debug {"Using settings: adding file resource '#{key}': '#{resource.inspect}'"}
+      Puppet.debug { "Using settings: adding file resource '#{key}': '#{resource.inspect}'" }
 
       catalog.add_resource(resource)
     end
@@ -1078,10 +1103,9 @@ 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(/^/, "# ")
 
-#         Add a section heading that matches our name.
+    #         Add a section heading that matches our name.
     str += "[#{preferred_run_mode}]\n"
     eachsection do |section|
       persection(section) do |obj|
@@ -1130,11 +1154,11 @@ Generated on #{Time.now}.
         if transaction.any_failed?
           report = transaction.report
           status_failures = report.resource_statuses.values.select { |r| r.failed? }
-          status_fail_msg = status_failures.
-            collect(&:events).
-            flatten.
-            select { |event| event.status == 'failure' }.
-            collect { |event| "#{event.resource}: #{event.message}" }.join("; ")
+          status_fail_msg = status_failures
+                            .collect(&:events)
+                            .flatten
+                            .select { |event| event.status == 'failure' }
+                            .collect { |event| "#{event.resource}: #{event.message}" }.join("; ")
 
           raise "Got #{status_failures.length} failure(s) while initializing: #{status_fail_msg}"
         end
@@ -1164,7 +1188,8 @@ Generated on #{Time.now}.
       section,
       environment,
       value_sets_for(environment, section),
-      @config)
+      @config
+    )
   end
 
   # Find the correct value using our search path.
@@ -1279,18 +1304,17 @@ Generated on #{Time.now}.
 
   def issue_deprecation_warning(setting, msg = nil)
     name = setting.name
-    ref = DEPRECATION_REFS.find { |params,reference| params.include?(name) }
+    ref = DEPRECATION_REFS.find { |params, _reference| params.include?(name) }
     ref = ref[1] if ref
-    case
-    when msg
+    if msg
       msg << " #{ref}" if ref
       Puppet.deprecation_warning(msg)
-    when setting.completely_deprecated?
+    elsif setting.completely_deprecated?
       message = _("Setting %{name} is deprecated.") % { name: name }
       message += " #{ref}"
       Puppet.deprecation_warning(message, "setting-#{name}")
-    when setting.allowed_on_commandline?
-      #TRANSLATORS 'puppet.conf' is a file name and should not be translated
+    elsif setting.allowed_on_commandline?
+      # TRANSLATORS 'puppet.conf' is a file name and should not be translated
       message = _("Setting %{name} is deprecated in puppet.conf.") % { name: name }
       message += " #{ref}"
       Puppet.deprecation_warning(message, "puppet-conf-setting-#{name}")
@@ -1334,26 +1358,26 @@ Generated on #{Time.now}.
     return if Puppet::Util::Platform.windows?
     return unless self[:mkusers]
 
-    @config.each do |name, setting|
+    @config.each do |_name, setting|
       next unless setting.respond_to?(:owner)
       next unless sections.nil? or sections.include?(setting.section)
 
       user = setting.owner
       if user && user != "root" && catalog.resource(:user, user).nil?
-        resource = Puppet::Resource.new(:user, user, :parameters => {:ensure => :present})
+        resource = Puppet::Resource.new(:user, user, :parameters => { :ensure => :present })
         resource[:gid] = self[:group] if self[:group]
         catalog.add_resource resource
       end
       group = setting.group
-      if group && ! %w{root wheel}.include?(group) && catalog.resource(:group, group).nil?
-        catalog.add_resource Puppet::Resource.new(:group, group, :parameters => {:ensure => :present})
+      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
   end
 
   # Yield each search source in turn.
   def value_sets_for(environment, mode)
-    searchpath(environment, mode).collect { |source| searchpath_values(source) }.compact
+    searchpath(environment, mode).filter_map { |source| searchpath_values(source) }
   end
 
   # Read the file in.
@@ -1365,7 +1389,7 @@ Generated on #{Time.now}.
   # Private method for internal test use only; allows to do a comprehensive clear of all settings between tests.
   #
   # @return nil
-  def clear_everything_for_tests()
+  def clear_everything_for_tests
     unsafe_clear(true, true)
     @configuration_file = nil
     @global_defaults_initialized = false
@@ -1429,9 +1453,9 @@ Generated on #{Time.now}.
         end
       end
 
-      setting  = @defaults[name]
+      setting = @defaults[name]
       if setting.respond_to?(:alias_name)
-        val  = lookup(setting.alias_name)
+        val = lookup(setting.alias_name)
         return val if val
       end
 
@@ -1494,24 +1518,24 @@ Generated on #{Time.now}.
         interpolated_value = value.gsub(/\$(\w+)|\$\{(\w+)\}/) do |expression|
           varname = $2 || $1
           interpolated_expression =
-          if varname != ENVIRONMENT_SETTING || ok_to_interpolate_environment(setting_name)
-            if varname == ENVIRONMENT_SETTING && @environment
-              @environment
-            elsif varname == "run_mode"
-              @mode
-            elsif !(pval = interpolate(varname.to_sym)).nil?
-              pval
+            if varname != ENVIRONMENT_SETTING || ok_to_interpolate_environment(setting_name)
+              if varname == ENVIRONMENT_SETTING && @environment
+                @environment
+              elsif varname == "run_mode"
+                @mode
+              elsif !(pval = interpolate(varname.to_sym)).nil?
+                pval
+              else
+                raise InterpolationError, _("Could not find value for %{expression}") % { expression: expression }
+              end
             else
-              raise InterpolationError, _("Could not find value for %{expression}") % { expression: expression }
+              failed_environment_interpolation = true
+              expression
             end
-          else
-            failed_environment_interpolation = true
-            expression
-          end
           interpolated_expression
         end
         if failed_environment_interpolation
-          #TRANSLATORS '$environment' is a Puppet specific variable and should not be translated
+          # TRANSLATORS '$environment' is a Puppet specific variable and should not be translated
           Puppet.warning(_("You cannot interpolate $environment within '%{setting_name}' when using directory environments.") % { setting_name: setting_name } +
                              ' ' + _("Its value will remain %{value}.") % { value: interpolated_value })
         end
@@ -1606,11 +1630,13 @@ Generated on #{Time.now}.
       if Puppet::Settings::EnvironmentConf::VALID_SETTINGS.include?(name) && conf
         return true
       end
+
       false
     end
 
     def lookup(name)
       return nil unless Puppet::Settings::EnvironmentConf::VALID_SETTINGS.include?(name)
+
       conf.send(name) if conf
     end
 

data/lib/puppet/ssl/base.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/ssl/openssl_loader'
 require_relative '../../puppet/ssl'
 require_relative '../../puppet/ssl/digest'
@@ -25,6 +26,7 @@ class Puppet::SSL::Base
 
   def self.wrapped_class
     raise(Puppet::DevError, _("%{name} has not declared what class it wraps") % { name: self }) unless defined?(@wrapped_class)
+
     @wrapped_class
   end
 
@@ -63,7 +65,7 @@ class Puppet::SSL::Base
   def self.from_instance(instance, name = nil)
     unless instance.is_a?(wrapped_class)
       raise ArgumentError, _("Object must be an instance of %{class_name}, %{actual_class} given") %
-          { class_name: wrapped_class, actual_class: instance.class }
+                           { class_name: wrapped_class, actual_class: instance.class }
     end
     if name.nil? and !instance.respond_to?(:subject)
       raise ArgumentError, _("Name must be supplied if it cannot be determined from the instance")
@@ -96,6 +98,7 @@ class Puppet::SSL::Base
   # Convert our thing to pem.
   def to_s
     return "" unless content
+
     content.to_pem
   end
 
@@ -106,6 +109,7 @@ class Puppet::SSL::Base
   # Provide the full text of the thing we're dealing with.
   def to_text
     return "" unless content
+
     content.to_text
   end
 
@@ -114,7 +118,7 @@ class Puppet::SSL::Base
     digest(mds).to_hex
   end
 
-  def digest(algorithm=nil)
+  def digest(algorithm = nil)
     unless algorithm
       algorithm = digest_algorithm
     end

data/lib/puppet/ssl/certificate.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative '../../puppet/ssl/base'
 
 # Manage certificates themselves.  This class has no
@@ -19,8 +20,9 @@ class Puppet::SSL::Certificate < Puppet::SSL::Base
   end
 
   def self.subject_alt_names_for(cert)
-    alts = cert.extensions.find{|ext| ext.oid == "subjectAltName"}
+    alts = cert.extensions.find { |ext| ext.oid == "subjectAltName" }
     return [] unless alts
+
     alts.value.split(/\s*,\s*/)
   end
 
@@ -30,6 +32,7 @@ class Puppet::SSL::Certificate < Puppet::SSL::Base
 
   def expiration
     return nil unless content
+
     content.not_after
   end
 
@@ -56,13 +59,12 @@ class Puppet::SSL::Certificate < Puppet::SSL::Base
     end
 
     custom_exts.map do |ext|
-      {'oid' => ext.oid, 'value' => get_ext_val(ext.oid)}
+      { 'oid' => ext.oid, 'value' => get_ext_val(ext.oid) }
     end
   end
 
   private
 
-
   # Extract the extensions sequence from the wrapped certificate's raw ASN.1 form
   def exts_seq
     # See RFC-2459 section 4.1 (https://tools.ietf.org/html/rfc2459#section-4.1)
@@ -93,5 +95,4 @@ class Puppet::SSL::Certificate < Puppet::SSL::Base
       raw_val
     end
   end
-
 end