puppet 6.0.9 → 6.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90038612753ba861b1a6905e835d42a6d1b4e66056e7286b7187bfd549614eba
-  data.tar.gz: 59ced40b3a7ab88d3a0b4b2eed6ec93de212a4c2b1cec5df895fe5f467b8c291
+  metadata.gz: df72b9e51336787042c469b1bd8394ccf10741f6b5ef61b42aecc7714caebbda
+  data.tar.gz: 0603d838b217eb5511d7dd658893842820b14983b2b6b2e48454df6193fc733d
 SHA512:
-  metadata.gz: 627d7e125e3a0cc25cf6d624c3defcaf8eb7291e964ff1dad62634054aafd22a445db912dce106887c287e895387982e402996b3c8b8ea6d08872ad8e3950097
-  data.tar.gz: 48292927be7a66aac9b822ea28643ffcac30e869ca309a0a5e586554877a7f6804c3accd90d357aefa22720d8295a20b0320dc229b40c7cb7c4a80e751a11859
+  metadata.gz: 99e77773e899cf4e374046fb10c20df9fd2b21298306ffacf18502a624d6c3845e9fbd9a2c6de54da62b873df8539aee1f5d1386d466e98c747c7aed8ace9c6e
+  data.tar.gz: 26aa8663307f00ea72a8e9a2a5161b325bdd71a8c86cf8c8f0978f020a9f99d93d811bf5c64bee03fcde45d7a1aaca37c3a2b5c0a3b3de09c40f9f7b9acac588

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puppet (6.0.9)
+    puppet (6.0.10)
       CFPropertyList (~> 2.2)
       facter (>= 2.4.0, < 4)
       fast_gettext (~> 1.1.2)
@@ -32,7 +32,7 @@ GEM
       fast_gettext (~> 1.1.0)
       gettext (>= 3.0.2)
       locale
-    hashdiff (0.3.9)
+    hashdiff (0.4.0)
     hiera (3.5.0)
     hiera-eyaml (3.0.0)
       highline (~> 1.6.19)
@@ -44,25 +44,25 @@ GEM
     json-schema (2.8.1)
       addressable (>= 2.4)
     locale (2.1.2)
-    memory_profiler (0.9.13)
+    memory_profiler (0.9.14)
     method_source (0.9.2)
     minitar (0.8)
-    msgpack (1.2.10)
+    msgpack (1.3.0)
     multi_json (1.13.1)
     mustache (1.1.0)
     optimist (3.0.0)
-    packaging (0.99.29)
+    packaging (0.99.36)
       artifactory (~> 2)
       rake (~> 12.3)
     parallel (1.17.0)
-    parser (2.6.2.1)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
     powerpack (0.1.2)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.0.3)
-    puppet-resource_api (1.8.1)
+    public_suffix (3.1.1)
+    puppet-resource_api (1.8.4)
       hocon (>= 1.0)
     puppetserver-ca (1.3.1)
       facter (>= 2.0.1, < 4)
@@ -82,18 +82,18 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-collection_matchers (1.1.3)
       rspec-expectations (>= 2.99.0.beta1)
-    rspec-core (3.8.0)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.3)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+    rspec-support (3.8.2)
     rubocop (0.49.1)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -103,18 +103,18 @@ GEM
       unicode-display_width (~> 1.0, >= 1.0.1)
     rubocop-i18n (1.2.0)
       rubocop (~> 0.49.0)
-    ruby-prof (0.17.0)
-    ruby-progressbar (1.10.0)
+    ruby-prof (0.18.0)
+    ruby-progressbar (1.10.1)
     safe_yaml (1.0.5)
     semantic_puppet (1.0.2)
     text (1.3.1)
-    unicode-display_width (1.5.0)
+    unicode-display_width (1.6.0)
     vcr (2.9.3)
     webmock (1.24.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    yard (0.9.19)
+    yard (0.9.20)
 
 PLATFORMS
   ruby

data/lib/hiera/scope.rb

@@ -1,5 +1,8 @@
+require 'forwardable'
 class Hiera
   class Scope
+    extend Forwardable
+
     CALLING_CLASS = 'calling_class'.freeze
     CALLING_CLASS_PATH = 'calling_class_path'.freeze
     CALLING_MODULE = 'calling_module'.freeze
@@ -79,5 +82,9 @@ class Hiera
       end
     end
     private :find_hostclass
+
+    # This is needed for type conversion to work
+    def_delegators :@real, :call_function
+
   end
 end

data/lib/puppet.rb

@@ -1,7 +1,7 @@
 require 'puppet/version'
 
 if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new("2.3.0")
-  raise LoadError, _("Puppet %{version} requires ruby 2.3.0 or greater.") % { version: Puppet.version }
+  raise LoadError, "Puppet #{Puppet.version} requires Ruby 2.3.0 or greater, found Ruby #{RUBY_VERSION.dup}."
 end
 
 Puppet::OLDEST_RECOMMENDED_RUBY_VERSION = '2.3.0'

data/lib/puppet/application/device.rb

@@ -274,8 +274,18 @@ Licensed under the Apache 2.0 License
             Puppet.settings.use :main, :agent, :ssl
 
             unless options[:resource] || options[:facts] || options[:apply]
-              # ask for a ssl cert if needed, but at least
-              # setup the ssl system for this device.
+              # Since it's too complicated to fix properly in the default settings, we workaround for PUP-9642 here.
+              # See https://github.com/puppetlabs/puppet/pull/7483#issuecomment-483455997 for details.
+              # This has to happen after `settings.use` above, so the directory is created and before `setup_host` below, where the SSL
+              # routines would fail with access errors
+              if Puppet.features.root? && !Puppet::Util::Platform.windows?
+                user = Puppet::Type.type(:user).new(name: Puppet[:user]).exists? ? Puppet[:user] : nil
+                group = Puppet::Type.type(:group).new(name: Puppet[:group]).exists? ? Puppet[:group] : nil
+                Puppet.debug("Fixing perms for #{user}:#{group} on #{Puppet[:confdir]}")
+                FileUtils.chown(user, group, Puppet[:confdir]) if user || group
+              end
+
+              # ask for a ssl cert if needed, and setup the ssl system for this device.
               ssl_host = setup_host(device.name)
 
               unless options[:libdir]
@@ -285,7 +295,7 @@ Licensed under the Apache 2.0 License
               end
             end
 
-            # this init the device singleton, so that the facts terminus
+            # this inits the device singleton, so that the facts terminus
             # and the various network_device provider can use it
             Puppet::Util::NetworkDevice.init(device)
 

data/lib/puppet/application/ssl.rb

@@ -98,6 +98,8 @@ HELP
       Puppet.settings.use(:main, :agent)
     end
 
+    Puppet::SSL::Oids.register_puppet_oids
+
     action = command_line.args.first
     case action
     when 'submit_request'

data/lib/puppet/configurer.rb

@@ -227,7 +227,7 @@ class Puppet::Configurer
         if options[:catalog].nil? && do_failover
           server, port = find_functional_server
           if server.nil?
-            raise Puppet::Error, _("Could not select a functional puppet master from server_list: '%{server_list}'") % { server_list: Puppet[:server_list] }
+            raise Puppet::Error, _("Could not select a functional puppet master from server_list: '%{server_list}'") % { server_list: Puppet.settings.value(:server_list, Puppet[:environment].to_sym, true) }
           else
             #TRANSLATORS 'server_list' is the name of a setting and should not be translated
             Puppet.debug _("Selected puppet server from the `server_list` setting: %{server}:%{port}") % { server: server, port: port }

data/lib/puppet/network/http/connection.rb

@@ -331,6 +331,8 @@ module Puppet::Network::HTTP
       end
       response
     rescue OpenSSL::SSL::SSLError => error
+      raise @verify.last_error if @verify.last_error
+
       Puppet::Util::SSL.handle_connection_error(error, @verify, site.host)
     end
   end

data/lib/puppet/network/http/factory.rb

@@ -41,6 +41,11 @@ class Puppet::Network::HTTP::Factory
     http.open_timeout = Puppet[:http_connect_timeout]
     http.keep_alive_timeout = KEEP_ALIVE_TIMEOUT if http.respond_to?(:keep_alive_timeout=)
 
+    if http.respond_to?(:max_retries)
+      # 0 means make one request and never retry
+      http.max_retries = 0
+    end
+
     if Puppet[:sourceaddress]
       Puppet.debug("Using source IP #{Puppet[:sourceaddress]}")
       http.local_host = Puppet[:sourceaddress]

data/lib/puppet/pops/types/types.rb

@@ -843,14 +843,16 @@ INTEGER_HEX = '(?:0[xX][0-9A-Fa-f]+)'
 INTEGER_OCT = '(?:0[0-7]+)'
 INTEGER_BIN = '(?:0[bB][01]+)'
 INTEGER_DEC = '(?:0|[1-9]\d*)'
+INTEGER_DEC_OR_OCT = '(?:\d+)'
 SIGN_PREFIX = '[+-]?\s*'
 
 OPTIONAL_FRACTION = '(?:\.\d+)?'
 OPTIONAL_EXPONENT = '(?:[eE]-?\d+)?'
 FLOAT_DEC = '(?:' + INTEGER_DEC + OPTIONAL_FRACTION + OPTIONAL_EXPONENT + ')'
 
-INTEGER_PATTERN = '\A' + SIGN_PREFIX + '(?:' + INTEGER_DEC + '|' + INTEGER_HEX + '|' + INTEGER_OCT + '|' + INTEGER_BIN + ')\z'
-FLOAT_PATTERN = '\A' + SIGN_PREFIX + '(?:' + FLOAT_DEC + '|' + INTEGER_HEX + '|' + INTEGER_OCT + '|' + INTEGER_BIN + ')\z'
+INTEGER_PATTERN          = '\A' + SIGN_PREFIX + '(?:' + INTEGER_DEC + '|' + INTEGER_HEX + '|' + INTEGER_OCT + '|' + INTEGER_BIN + ')\z'
+INTEGER_PATTERN_LENIENT = '\A' + SIGN_PREFIX + '(?:' + INTEGER_DEC_OR_OCT + '|' + INTEGER_HEX + '|' + INTEGER_BIN + ')\z'
+FLOAT_PATTERN            = '\A' + SIGN_PREFIX + '(?:' + FLOAT_DEC + '|' + INTEGER_HEX + '|' + INTEGER_OCT + '|' + INTEGER_BIN + ')\z'
 
 # @api public
 #
@@ -1089,7 +1091,7 @@ class PIntegerType < PNumericType
     @@new_function ||= Puppet::Functions.create_loaded_function(:new, loader) do
       local_types do
         type 'Radix       = Variant[Default, Integer[2,2], Integer[8,8], Integer[10,10], Integer[16,16]]'
-        type "Convertible = Variant[Numeric, Boolean, Pattern[/#{INTEGER_PATTERN}/], Timespan, Timestamp]"
+        type "Convertible = Variant[Numeric, Boolean, Pattern[/#{INTEGER_PATTERN_LENIENT}/], Timespan, Timestamp]"
         type 'NamedArgs   = Struct[{from => Convertible, Optional[radix] => Radix, Optional[abs] => Boolean}]'
       end
 

data/lib/puppet/provider.rb

@@ -395,7 +395,7 @@ class Puppet::Provider
   # @raise [Puppet::DevError] Error indicating that the method should have been implemented by subclass.
   # @see prefetch
   def self.instances
-    raise Puppet::DevError, _("Provider %{provider} has not defined the 'instances' class method") % { provider: self.name }
+    raise Puppet::DevError, _("To support listing resources of this type the '%{provider}' provider needs to implement an 'instances' class method returning the current set of resources. We recommend porting your module to the simpler Resource API instead: https://puppet.com/search/docs?keys=resource+api") % { provider: self.name }
   end
 
   # Creates getter- and setter- methods for each property supported by the resource type.
@@ -621,4 +621,3 @@ class Puppet::Provider
   # @return [void]
   # @api public
 end
-

data/lib/puppet/provider/package.rb

@@ -1,3 +1,5 @@
+require 'puppet/provider'
+
 class Puppet::Provider::Package < Puppet::Provider
   # Prefetch our package list, yo.
   def self.prefetch(packages)

data/lib/puppet/provider/package/dpkg.rb

@@ -81,7 +81,6 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
     unless file = @resource[:source]
       raise ArgumentError, _("You cannot install dpkg packages without a source")
     end
-
     args = []
 
     # We always unhold when installing to remove any prior hold.
@@ -146,7 +145,9 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
   end
 
   def hold
-    self.install
+    if package_not_installed?(@resource[:name])
+      self.install
+    end
     Tempfile.open('puppet_dpkg_set_selection') do |tmpfile|
       tmpfile.write("#{@resource[:name]} hold\n")
       tmpfile.flush
@@ -162,4 +163,16 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
     end
   end
 
+  def package_not_installed?(name)
+    if !name.nil? && !name.empty?
+      begin
+       dpkgquery("-W", "--showformat", self.class::DPKG_QUERY_FORMAT_STRING, name)
+      rescue Puppet::ExecutionFailure
+        # return true if exception is generated because package is not found
+        return true
+      end
+      return false
+    end
+    raise ArgumentError.new("Package name is nil or empty")
+  end
 end

data/lib/puppet/provider/package/gem.rb

@@ -1,8 +1,8 @@
-require 'puppet/provider/package'
+require 'puppet/provider/package_targetable'
 require 'uri'
 
 # Ruby gems support.
-Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package do
+Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package::Targetable do
   desc "Ruby Gem support. If a URL is passed via `source`, then that URL is
     appended to the list of remote gem repositories; to ensure that only the
     specified source is used, also pass `--clear-sources` via `install_options`.
@@ -15,9 +15,31 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
     These options should be specified as a string (e.g. '--flag'), a hash (e.g. {'--flag' => 'value'}),
     or an array where each element is either a string or a hash."
 
-  has_feature :versionable, :install_options, :uninstall_options
+  has_feature :versionable, :install_options, :uninstall_options, :targetable
 
-  commands :gemcmd => "gem"
+  # Override the specificity method to return 1 if gem is not set as default provider
+  def self.specificity
+    match = default_match
+    length = match ? match.length : 0
+
+    return 1 if length == 0
+
+    super
+  end
+
+  # Define the default provider package command name when the provider is targetable.
+  # Required by Puppet::Provider::Package::Targetable::resource_or_provider_command
+
+  def self.provider_command
+    command(:gemcmd)
+  end
+
+  # Define the default provider package command as optional when the provider is targetable.
+  # Doing do defers the evaluation of provider suitability until all commands are evaluated.
+
+  has_command(:gemcmd, 'gem') do
+    is_optional
+  end
 
   # CommandDefiner in provider.rb creates convenience execution methods that set failonfail, combine, and optionally, environment.
   # And when a child provider defines its own command via commands() or has_command(), the provider-specific path is always returned by command().
@@ -26,12 +48,29 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
   #
   # In this case, causing the puppet_gem provider to inherit the parent gem provider's convenience gemcmd() methods, with the wrong path.
 
-  def self.execute_gem_command(command_options)
-    cmd = [command(:gemcmd)] << command_options
+  def self.execute_gem_command(command, command_options)
+    validate_command(command)
+    cmd = [command] << command_options
 
     execute(cmd, {:failonfail => true, :combine => true, :custom_environment => {"HOME"=>ENV["HOME"]}})
   end
 
+  def self.instances(target_command = nil)
+    if target_command
+      command = target_command
+    else
+      command = provider_command
+      # The default provider package command is optional.
+      return [] unless command
+    end
+
+    gemlist(:command => command, :local => true).collect do |pkg|
+      # Track the command when the provider is targetable.
+      pkg[:command] = command
+      new(pkg)
+    end
+  end
+
   def self.gemlist(options)
     command_options = ["list"]
 
@@ -48,7 +87,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
     end
 
     begin
-      list = execute_gem_command(command_options).lines.
+      list = execute_gem_command(options[:command], command_options).lines.
         map {|set| gemsplit(set) }.
         reject {|x| x.nil? }
     rescue Puppet::ExecutionFailure => detail
@@ -83,12 +122,6 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
     end
   end
 
-  def self.instances(justme = false)
-    gemlist(:local => true).collect do |hash|
-      new(hash)
-    end
-  end
-
   def insync?(is)
     return false unless is && is != :absent
 
@@ -105,13 +138,13 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
     is.any? { |version| dependency.match?('', version) }
   end
 
-  def rubygem_version
+  def rubygem_version(command)
     command_options = ["--version"]
-
-    self.class.execute_gem_command(command_options)
+    self.class.execute_gem_command(command, command_options)
   end
 
   def install(useversion = true)
+    command = resource_or_provider_command
     command_options = ["install"]
     command_options += install_options if resource[:install_options]
 
@@ -122,7 +155,7 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
       command_options << "-v" << resource[:ensure] if (! resource[:ensure].is_a? Symbol) and useversion
     end
 
-    if Puppet::Util::Package.versioncmp(rubygem_version, '2.0.0') == -1
+    if Puppet::Util::Package.versioncmp(rubygem_version(command), '2.0.0') == -1
       command_options << "--no-rdoc" << "--no-ri"
     else
       command_options << "--no-document"
@@ -157,31 +190,34 @@ Puppet::Type.type(:package).provide :gem, :parent => Puppet::Provider::Package d
       command_options << resource[:name]
     end
 
-    output = self.class.execute_gem_command(command_options)
-    # Apparently some gem versions don't exit non-0 on failure
+    output = self.class.execute_gem_command(command, command_options)
+    # Apparently some gem versions don't exit non-0 on failure.
     self.fail _("Could not install: %{output}") % { output: output.chomp } if output.include?("ERROR")
   end
 
   def latest
-    # This always gets the latest version available.
-    options = {:justme => resource[:name]}
-    options.merge!({:source => resource[:source]}) unless resource[:source].nil?
-    hash = self.class.gemlist(options)
-
-    hash[:ensure][0]
+    command = resource_or_provider_command
+    options = { :command => command, :justme => resource[:name] }
+    options[:source] = resource[:source] unless resource[:source].nil?
+    pkg = self.class.gemlist(options)
+    pkg[:ensure][0]
   end
 
   def query
-    self.class.gemlist(:justme => resource[:name], :local => true)
+    command = resource_or_provider_command
+    options = { :command => command, :justme => resource[:name], :local => true }
+    pkg = self.class.gemlist(options)
+    pkg[:command] = command unless pkg.nil?
+    pkg
   end
 
   def uninstall
+    command = resource_or_provider_command
     command_options = ["uninstall"]
     command_options << "--executables" << "--all" << resource[:name]
     command_options += uninstall_options if resource[:uninstall_options]
-
-    output = self.class.execute_gem_command(command_options)
-    # Apparently some gem versions don't exit non-0 on failure
+    output = self.class.execute_gem_command(command, command_options)
+    # Apparently some gem versions don't exit non-0 on failure.
     self.fail _("Could not uninstall: %{output}") % { output: output.chomp } if output.include?("ERROR")
   end