puppet 6.15.0-universal-darwin → 6.19.1-universal-darwin

data/lib/puppet/http/response.rb

@@ -89,11 +89,30 @@ class Puppet::HTTP::Response
   end
 
   # @api private
+  #
+  # Get a header case-insensitively.
+  # @param [String] name The header name
+  # @return [String] The header value
+  #
   def [](name)
     @nethttp[name]
   end
 
   # @api private
+  #
+  # Yield each header name and value. Returns an enumerator if no block is given.
+  #
+  # @yieldparam [String] header name
+  # @yieldparam [String] header value
+  #
+  def each_header(&block)
+    @nethttp.each_header(&block)
+  end
+
+  # @api private
+  #
+  # Drain the response body.
+  #
   def drain
     body
     true

data/lib/puppet/http/service.rb

@@ -10,7 +10,7 @@ class Puppet::HTTP::Service
 
   # @api private
   # @return [Array<Symbol>] available services
-  SERVICE_NAMES = [:ca, :fileserver, :puppet, :report].freeze
+  SERVICE_NAMES = [:ca, :fileserver, :puppet, :puppetserver, :report].freeze
 
   # @api private
   # @return [Array<Symbol>] format types that are unsupported
@@ -43,6 +43,8 @@ class Puppet::HTTP::Service
       Puppet::HTTP::Service::FileServer.new(client, session, server, port)
     when :puppet
       ::Puppet::HTTP::Service::Compiler.new(client, session, server, port)
+    when :puppetserver
+      ::Puppet::HTTP::Service::Puppetserver.new(client, session, server, port)
     when :report
       Puppet::HTTP::Service::Report.new(client, session, server, port)
     else

data/lib/puppet/http/service/compiler.rb

@@ -22,7 +22,7 @@ class Puppet::HTTP::Service::Compiler < Puppet::HTTP::Service
   #   create the service.
   #
   def initialize(client, session, server, port)
-    url = build_url(API, server || Puppet[:server], port || Puppet[:masterport])
+    url = build_url(API, server || Puppet[:server], port || Puppet[:serverport])
     super(client, session, url)
   end
 

data/lib/puppet/http/service/file_server.rb

@@ -27,7 +27,7 @@ class Puppet::HTTP::Service::FileServer < Puppet::HTTP::Service
   #   create the service.
   #
   def initialize(client, session, server, port)
-    url = build_url(API, server || Puppet[:server], port || Puppet[:masterport])
+    url = build_url(API, server || Puppet[:server], port || Puppet[:serverport])
     super(client, session, url)
   end
 

data/lib/puppet/http/service/puppetserver.rb

@@ -0,0 +1,39 @@
+# The puppetserver service.
+#
+# @api private
+#
+class Puppet::HTTP::Service::Puppetserver < Puppet::HTTP::Service
+  # @param [Puppet::HTTP::Client] client
+  # @param [Puppet::HTTP::Session] session
+  # @param [String] server If an explicit server is given,
+  #   create a service using that server. If server is nil, the default value
+  #   is used to create the service.
+  # @param [Integer] port If an explicit port is given, create
+  #   a service using that port. If port is nil, the default value is used to
+  #   create the service.
+  # @api private
+  #
+  def initialize(client, session, server, port)
+    url = build_url('', server || Puppet[:server], port || Puppet[:serverport])
+    super(client, session, url)
+  end
+
+  # Request the puppetserver's simple status
+  #
+  # @param [Puppet::SSL::SSLContext] ssl_context to use when establishing
+  # the connection.
+  # @return Puppet::HTTP::Response The HTTP response
+  # @api private
+  #
+  def get_simple_status(ssl_context: nil)
+    response = @client.get(
+      with_base_url("/status/v1/simple/master"),
+      headers: add_puppet_headers({}),
+      options: {ssl_context: ssl_context}
+    )
+
+    process_response(response)
+
+    [response, response.body.to_s]
+  end
+end

data/lib/puppet/http/session.rb

@@ -64,20 +64,21 @@ class Puppet::HTTP::Session
     cached = @resolved_services[name]
     return cached if cached
 
-    resolution_exceptions = []
-    error_handler = proc { |e| resolution_exceptions << e }
+    canceled = false
+    canceled_handler  = lambda { |cancel| canceled = cancel }
 
     @resolvers.each do |resolver|
       Puppet.debug("Resolving service '#{name}' using #{resolver.class}")
-      service = resolver.resolve(self, name, ssl_context: ssl_context, error_handler: error_handler)
+      service = resolver.resolve(self, name, ssl_context: ssl_context, canceled_handler: canceled_handler)
       if service
         @resolved_services[name] = service
         Puppet.debug("Resolved service '#{name}' to #{service.url}")
         return service
+      elsif canceled
+        break
       end
     end
 
-    resolution_exceptions.each { |e| Puppet.log_exception(e) }
     raise Puppet::HTTP::RouteError, "No more routes to #{name}"
   end
 

data/lib/puppet/indirector.rb

@@ -46,7 +46,7 @@ module Puppet::Indirector
 
     # instantiate the actual Terminus for that type and this name (:ldap, w/ args :node)
     # & hook the instantiated Terminus into this class (Node: @indirection = terminus)
-    @indirection = Puppet::Indirector::Indirection.new(self, indirection, options)
+    @indirection = Puppet::Indirector::Indirection.new(self, indirection, **options)
   end
 
   module ClassMethods

data/lib/puppet/indirector/catalog/compiler.rb

@@ -75,7 +75,7 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
 
   # Is our compiler part of a network, or are we just local?
   def networked?
-    Puppet.run_mode.master?
+    Puppet.run_mode.server?
   end
 
   private

data/lib/puppet/indirector/exec.rb

@@ -22,7 +22,7 @@ class Puppet::Indirector::Exec < Puppet::Indirector::Terminus
     end
 
     if output =~ /\A\s*\Z/ # all whitespace
-      Puppet.debug "Empty response for #{name} from #{self.name} terminus"
+      Puppet.debug { "Empty response for #{name} from #{self.name} terminus" }
       return nil
     else
       return output

data/lib/puppet/indirector/facts/facter.rb

@@ -55,7 +55,7 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
       if Puppet::Util::Log.sendlevel?(:info)
         Puppet.info _("Loading facts")
         Dir.glob("#{dir}/*.rb").each do |file|
-          Puppet.debug "Loading facts from #{file}"
+          Puppet.debug { "Loading facts from #{file}" }
         end
       end
 
@@ -71,7 +71,7 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
     request.environment.modules.each do |m|
       if m.has_external_facts?
         dir = m.plugin_fact_directory
-        Puppet.debug "Loading external facts from #{dir}"
+        Puppet.debug { "Loading external facts from #{dir}" }
         dirs << dir
       end
     end
@@ -79,7 +79,7 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
     # Add system external fact directory if it exists
     if FileTest.directory?(Puppet[:pluginfactdest])
       dir = Puppet[:pluginfactdest]
-      Puppet.debug "Loading external facts from #{dir}"
+      Puppet.debug { "Loading external facts from #{dir}" }
       dirs << dir
     end
 

data/lib/puppet/indirector/facts/yaml.rb

@@ -20,7 +20,7 @@ class Puppet::Node::Facts::Yaml < Puppet::Indirector::Yaml
 
   # Return the path to a given node's file.
   def yaml_dir_path
-    base = Puppet.run_mode.master? ? Puppet[:yamldir] : Puppet[:clientyamldir]
+    base = Puppet.run_mode.server? ? Puppet[:yamldir] : Puppet[:clientyamldir]
     File.join(base, 'facts', '*.yaml')
   end
 

data/lib/puppet/indirector/file_content/http.rb

@@ -10,6 +10,11 @@ class Puppet::Indirector::FileContent::Http < Puppet::Indirector::GenericHttp
 
   @http_method = :get
 
+  def initialize
+    Puppet.deprecation_warning(_("Puppet::Indirector::FileContent::Http is deprecated. Use Puppet::HTTP::Client instead."))
+    super
+  end
+
   def find(request)
     response = super
     model.from_binary(uncompress_body(response))

data/lib/puppet/indirector/file_content/rest.rb

@@ -18,7 +18,7 @@ class Puppet::Indirector::FileContent::Rest < Puppet::Indirector::REST
     api = session.route_to(:fileserver, url: url)
 
     api.get_file_content(
-      path: URI.unescape(url.path),
+      path: Puppet::Util.uri_unescape(url.path),
       environment: request.environment.to_s,
     ) do |data|
       content << data

data/lib/puppet/indirector/file_metadata/http.rb

@@ -8,20 +8,40 @@ class Puppet::Indirector::FileMetadata::Http < Puppet::Indirector::GenericHttp
 
   include Puppet::FileServing::TerminusHelper
 
-  @http_method = :head
-
   def find(request)
-    head = super
+    checksum_type = request.options[:checksum_type]
+    # See URL encoding comment in Puppet::Type::File::ParamSource#chunk_file_from_source
+    uri = URI(request.uri)
+    client = Puppet.runtime[:http]
+    head = client.head(uri, options: {include_system_store: true})
+
+    return create_httpmetadata(head, checksum_type) if head.success?
 
-    if head.is_a?(Net::HTTPSuccess)
-      metadata = Puppet::FileServing::HttpMetadata.new(head)
-      metadata.checksum_type = request.options[:checksum_type] if request.options[:checksum_type]
-      metadata.collect
-      metadata
+    case head.code
+    when 403, 405
+      # AMZ presigned URL and puppetserver may return 403
+      # instead of 405. Fallback to partial get
+      get = partial_get(client, uri)
+      return create_httpmetadata(get, checksum_type) if get.success?
     end
+
+    nil
   end
 
   def search(request)
     raise Puppet::Error, _("cannot lookup multiple files")
   end
+
+  private
+
+  def partial_get(client, uri)
+    client.get(uri, headers: {'Range' => 'bytes=0-0'}, options: {include_system_store: true})
+  end
+
+  def create_httpmetadata(http_request, checksum_type)
+    metadata = Puppet::FileServing::HttpMetadata.new(http_request)
+    metadata.checksum_type = checksum_type if checksum_type
+    metadata.collect
+    metadata
+  end
 end

data/lib/puppet/indirector/file_metadata/rest.rb

@@ -15,7 +15,7 @@ class Puppet::Indirector::FileMetadata::Rest < Puppet::Indirector::REST
     api = session.route_to(:fileserver, url: url)
 
     _, file_metadata = api.get_file_metadata(
-      path: URI.unescape(url.path),
+      path: Puppet::Util.uri_unescape(url.path),
       environment: request.environment.to_s,
       links: request.options[:links],
       checksum_type: request.options[:checksum_type],
@@ -42,7 +42,7 @@ class Puppet::Indirector::FileMetadata::Rest < Puppet::Indirector::REST
     api = session.route_to(:fileserver, url: url)
 
     _, file_metadatas = api.get_file_metadatas(
-      path: URI.unescape(url.path),
+      path: Puppet::Util.uri_unescape(url.path),
       environment: request.environment.to_s,
       recurse: request.options[:recurse],
       recurselimit: request.options[:recurselimit],

data/lib/puppet/indirector/hiera.rb

@@ -1,6 +1,10 @@
 require 'puppet/indirector/terminus'
 require 'hiera/scope'
 
+# This class can't be collapsed into Puppet::Indirector::DataBindings::Hiera
+# because some community plugins rely on this class directly, see PUP-1843.
+# This class is deprecated and will be deleted in a future release.
+# Use `Puppet::DataBinding.indirection.terminus(:hiera)` instead.
 class Puppet::Indirector::Hiera < Puppet::Indirector::Terminus
   def initialize(*args)
     if ! Puppet.features.hiera?

data/lib/puppet/indirector/indirection.rb

@@ -269,7 +269,7 @@ class Puppet::Indirector::Indirection
       return nil
     end
 
-    Puppet.debug "Using cached #{self.name} for #{request.key}"
+    Puppet.debug { "Using cached #{self.name} for #{request.key}" }
     cached
   rescue => detail
     Puppet.log_exception(detail, _("Cached %{indirection} for %{request} failed: %{detail}") % { indirection: self.name, request: request.key, detail: detail })

data/lib/puppet/indirector/json.rb

@@ -41,7 +41,7 @@ class Puppet::Indirector::JSON < Puppet::Indirector::Terminus
       raise ArgumentError, _("invalid key")
     end
 
-    base = Puppet.run_mode.master? ? Puppet[:server_datadir] : Puppet[:client_datadir]
+    base = Puppet.run_mode.server? ? Puppet[:server_datadir] : Puppet[:client_datadir]
     File.join(base, self.class.indirection_name.to_s, name.to_s + ext)
   end
 

data/lib/puppet/indirector/msgpack.rb

@@ -48,7 +48,7 @@ class Puppet::Indirector::Msgpack < Puppet::Indirector::Terminus
       raise ArgumentError, _("invalid key")
     end
 
-    base = Puppet.run_mode.master? ? Puppet[:server_datadir] : Puppet[:client_datadir]
+    base = Puppet.run_mode.server? ? Puppet[:server_datadir] : Puppet[:client_datadir]
     File.join(base, self.class.indirection_name.to_s, name.to_s + ext)
   end
 

data/lib/puppet/indirector/report/processor.rb

@@ -26,9 +26,9 @@ class Puppet::Transaction::Report::Processor < Puppet::Indirector::Code
   # LAK:NOTE This isn't necessarily the best design, but it's backward
   # compatible and that's good enough for now.
   def process(report)
-    Puppet.debug "Received report to process from #{report.host}"
+    Puppet.debug { "Received report to process from #{report.host}" }
     processors do |mod|
-      Puppet.debug "Processing report from #{report.host} with processor #{mod}"
+      Puppet.debug { "Processing report from #{report.host} with processor #{mod}" }
       # We have to use a dup because we're including a module in the
       # report.
       newrep = report.dup

data/lib/puppet/indirector/request.rb

@@ -231,9 +231,9 @@ class Puppet::Indirector::Request
           debug_once _("Selected port from the first entry of the `server_list` setting: %{port}") % {port: primary_server[1]}
           primary_server[1]
         else
-          #TRANSLATORS 'masterport' is the name of a setting and should not be translated
-          debug_once _("Selected port from the `masterport` setting: %{port}") % {port: Puppet.settings[:masterport]}
-          Puppet.settings[:masterport]
+          #TRANSLATORS 'serverport' is the name of a setting and should not be translated
+          debug_once _("Selected port from the `serverport` setting: %{port}") % {port: Puppet.settings[:serverport]}
+          Puppet.settings[:serverport]
         end
       end
     end
@@ -277,7 +277,7 @@ class Puppet::Indirector::Request
     # If the URI class can look up the scheme, it will provide a port,
     # otherwise it will default to '0'.
     if uri.port.to_i == 0 and uri.scheme == "puppet"
-      @port = Puppet.settings[:masterport].to_i
+      @port = Puppet.settings[:serverport].to_i
     else
       @port = uri.port.to_i
     end
@@ -290,6 +290,6 @@ class Puppet::Indirector::Request
       @protocol = uri.scheme
     end
 
-    @key = URI.unescape(uri.path.sub(/^\//, ''))
+    @key = Puppet::Util.uri_unescape(uri.path.sub(/^\//, ''))
   end
 end

data/lib/puppet/indirector/rest.rb

@@ -55,7 +55,8 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   # Should we use puppet's http client to make requests. Will return
   # false when running in puppetserver
   def use_http_client?
-    Puppet::Network::HttpPool.http_client_class == Puppet::Network::HTTP::Connection
+    Puppet::Network::HttpPool.http_client_class == Puppet::Network::HTTP::Connection ||
+      Puppet::Network::HttpPool.http_client_class == Puppet::Network::HTTP::ConnectionAdapter
   end
 
   # Provide appropriate headers.
@@ -111,6 +112,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   end
 
   def find(request)
+    Puppet.deprecation_warning(_("Puppet::Indirector::Rest#find is deprecated. Use Puppet::HTTP::Client instead."))
     uri, body = IndirectedRoutes.request_to_uri_and_body(request)
     uri_with_query_string = "#{uri}?#{body}"
 
@@ -149,6 +151,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   end
 
   def head(request)
+    Puppet.deprecation_warning(_("Puppet::Indirector::Rest#head is deprecated. Use Puppet::HTTP::Client instead."))
     response = do_request(request) do |req|
       http_head(req, IndirectedRoutes.request_to_uri(req), headers)
     end
@@ -161,6 +164,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   end
 
   def search(request)
+    Puppet.deprecation_warning(_("Puppet::Indirector::Rest#search is deprecated. Use Puppet::HTTP::Client instead."))
     response = do_request(request) do |req|
       http_get(req, IndirectedRoutes.request_to_uri(req), headers)
     end
@@ -174,6 +178,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   end
 
   def destroy(request)
+    Puppet.deprecation_warning(_("Puppet::Indirector::Rest#destroy is deprecated. Use Puppet::HTTP::Client instead."))
     raise ArgumentError, _("DELETE does not accept options") unless request.options.empty?
 
     response = do_request(request) do |req|
@@ -189,6 +194,7 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
   end
 
   def save(request)
+    Puppet.deprecation_warning(_("Puppet::Indirector::Rest#save is deprecated. Use Puppet::HTTP::Client instead."))
     raise ArgumentError, _("PUT does not accept options") unless request.options.empty?
 
     response = do_request(request) do |req|

data/lib/puppet/indirector/yaml.rb

@@ -40,7 +40,7 @@ class Puppet::Indirector::Yaml < Puppet::Indirector::Terminus
       raise ArgumentError, _("invalid key")
     end
 
-    base = Puppet.run_mode.master? ? Puppet[:yamldir] : Puppet[:clientyamldir]
+    base = Puppet.run_mode.server? ? Puppet[:yamldir] : Puppet[:clientyamldir]
     File.join(base, self.class.indirection_name.to_s, name.to_s + ext)
   end
 

data/lib/puppet/module.rb

@@ -107,8 +107,7 @@ class Puppet::Module
     define_method(type + '?') do
       type_subpath = subpath(location)
       unless Puppet::FileSystem.exist?(type_subpath)
-        Puppet.debug("No #{type} found in subpath '#{type_subpath}' " +
-                         "(file / directory does not exist)")
+        Puppet.debug { "No #{type} found in subpath '#{type_subpath}' (file / directory does not exist)" }
         return false
       end
 

data/lib/puppet/network/format_support.rb

@@ -49,7 +49,7 @@ module Puppet::Network::FormatSupport
 
       result = put_preferred_format_first(result).map(&:name)
 
-      Puppet.debug "#{friendly_name} supports formats: #{result.join(' ')}"
+      Puppet.debug { "#{friendly_name} supports formats: #{result.join(' ')}" }
 
       result
     end
@@ -81,7 +81,7 @@ module Puppet::Network::FormatSupport
       }
 
       if preferred.empty?
-        Puppet.debug "Value of 'preferred_serialization_format' (#{preferred_format}) is invalid for #{friendly_name}, using default (#{list.first.name})"
+        Puppet.debug { "Value of 'preferred_serialization_format' (#{preferred_format}) is invalid for #{friendly_name}, using default (#{list.first.name})" }
       else
         list = preferred + list.reject { |format|
           format.mime.end_with?(preferred_format)