puppet 6.10.1-universal-darwin → 6.11.0-universal-darwin

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

@@ -0,0 +1,49 @@
+class Puppet::HTTP::Service::Ca < Puppet::HTTP::Service
+  HEADERS = { 'Accept' => 'text/plain' }.freeze
+
+  def get_certificate(name, ssl_context: nil)
+    response = @client.get(
+      with_base_url("/certificate/#{name}"),
+      headers: HEADERS,
+      ssl_context: ssl_context
+    )
+
+    return response.body.to_s if response.success?
+
+    raise Puppet::HTTP::ResponseError.new(response)
+  end
+
+  def get_certificate_revocation_list(if_modified_since: nil, ssl_context: nil)
+    request_headers = if if_modified_since
+                        h = HEADERS.dup
+                        h['If-Modified-Since'] = if_modified_since.httpdate
+                        h
+                      else
+                        HEADERS
+                      end
+
+    response = @client.get(
+      with_base_url("/certificate_revocation_list/ca"),
+      headers: request_headers,
+      ssl_context: ssl_context
+    )
+
+    return response.body.to_s if response.success?
+
+    raise Puppet::HTTP::ResponseError.new(response)
+  end
+
+  def put_certificate_request(name, csr, ssl_context: nil)
+    response = @client.put(
+      with_base_url("/certificate_request/#{name}"),
+      headers: HEADERS,
+      content_type: 'text/plain',
+      body: csr.to_pem,
+      ssl_context: ssl_context
+    )
+
+    return response.body.to_s if response.success?
+
+    raise Puppet::HTTP::ResponseError.new(response)
+  end
+end

data/lib/puppet/http/session.rb

@@ -0,0 +1,55 @@
+class Puppet::HTTP::Session
+  Route = Struct.new(:service_class, :api, :server_setting, :port_setting)
+
+  ROUTES = {
+    ca: Route.new(Puppet::HTTP::Service::Ca, '/puppet-ca/v1', :ca_server, :ca_port),
+  }.freeze
+
+  def initialize(client, resolvers)
+    @client = client
+    @resolvers = resolvers
+    @resolved_services = {}
+  end
+
+  def route_to(name, ssl_context: nil)
+    route = ROUTES[name]
+    raise ArgumentError, "Unknown service #{name}" unless route
+
+    cached = @resolved_services[name]
+    return cached if cached
+
+    errors = []
+
+    @resolvers.each do |resolver|
+      Puppet.debug("Resolving service '#{name}' using #{resolver.class}")
+      resolver.resolve(self, name) do |service|
+        begin
+          service.connect(ssl_context: ssl_context)
+          @resolved_services[name] = service
+          Puppet.debug("Resolved service '#{name}' to #{service.url}")
+          return service
+        rescue Puppet::HTTP::ConnectionError => e
+          errors << e
+          Puppet.debug("Connection to #{service.url} failed, trying next route: #{e.message}")
+        end
+      end
+    end
+
+    errors.each { |e| Puppet.log_exception(e) }
+
+    raise Puppet::HTTP::RouteError, "No more routes to #{name}"
+  end
+
+  def create_service(name, server = nil, port = nil)
+    route = ROUTES[name]
+    raise ArgumentError, "Unknown service #{name}" unless route
+
+    server ||= Puppet[route.server_setting]
+    port   ||= Puppet[route.port_setting]
+    url = URI::HTTPS.build(host: server,
+                           port: port,
+                           path: route.api
+                          ).freeze
+    route.service_class.new(@client, url)
+  end
+end

data/lib/puppet/indirector/file_bucket_file/file.rb

@@ -15,7 +15,7 @@ module Puppet::FileBucketFile
       request.options[:bucket_path] ||= Puppet[:bucketdir]
       # If filebucket mode is 'list'
       if request.options[:list_all]
-        return nil unless ::File.exists?(request.options[:bucket_path])
+        return nil unless ::File.exist?(request.options[:bucket_path])
         return list(request)
       end
       checksum, files_original_path = request_to_checksum_and_path(request)

data/lib/puppet/indirector/hiera.rb

@@ -69,6 +69,8 @@ class Puppet::Indirector::Hiera < Puppet::Indirector::Terminus
     end
   end
 
+  public
+
   def self.hiera_config
     hiera_config = Puppet.settings[:hiera_config]
     config = {}

data/lib/puppet/indirector/request.rb

@@ -272,7 +272,7 @@ class Puppet::Indirector::Request
       return
     end
 
-    @server = uri.host if uri.host
+    @server = uri.host if uri.host && !uri.host.empty?
 
     # If the URI class can look up the scheme, it will provide a port,
     # otherwise it will default to '0'.

data/lib/puppet/indirector/resource/ral.rb

@@ -25,9 +25,7 @@ class Puppet::Resource::Ral < Puppet::Indirector::Code
       res.to_resource
     end.find_all do |res|
       conditions.all? {|property, value| res.to_resource[property].to_s == value.to_s}
-    end.sort do |a,b|
-      a.title <=> b.title
-    end
+    end.sort_by(&:title)
   end
 
   def save( request )

data/lib/puppet/indirector/resource/validator.rb

@@ -1,7 +1,7 @@
 module Puppet::Resource::Validator
   def validate_key(request)
     type, title = request.key.split('/', 2)
-    unless type.downcase == request.instance.type.downcase and title == request.instance.title
+    unless type.casecmp(request.instance.type).zero? and title == request.instance.title
       raise Puppet::Indirector::ValidationError, _("Resource instance does not match request key")
     end
   end

data/lib/puppet/interface.rb

@@ -97,7 +97,7 @@ class Puppet::Interface
         if Puppet::Interface::FaceCollection[name, :current]
           raise Puppet::Error, "Could not find version #{version} of #{name}"
         else
-          raise Puppet::Error, "Could not find Puppet Face #{name.to_s}"
+          raise Puppet::Error, "Could not find Puppet Face #{name}"
         end
       end
 
@@ -235,4 +235,5 @@ class Puppet::Interface
     define_method(name, proc)
     instance_method(name)
   end
+  private_class_method :__add_method
 end

data/lib/puppet/interface/documentation.rb

@@ -318,7 +318,7 @@ class Puppet::Interface
       when String then
         input.strip.split(/,/).map do |part|
           part = part.strip
-          if part.match(/^\d+$/)
+          if part =~ /^\d+$/
             part.to_i
           else
             found = part.split(/-/)

data/lib/puppet/loaders.rb

@@ -9,7 +9,6 @@ module Puppet
       require 'puppet/pops/loader/gem_support'
       require 'puppet/pops/loader/module_loaders'
       require 'puppet/pops/loader/dependency_loader'
-      require 'puppet/pops/loader/null_loader'
       require 'puppet/pops/loader/static_loader'
       require 'puppet/pops/loader/runtime3_type_loader'
       require 'puppet/pops/loader/ruby_function_instantiator'

data/lib/puppet/metatype/manager.rb

@@ -121,7 +121,7 @@ module Manager
 
     # Now set up autoload any providers that might exist for this type.
 
-    klass.providerloader = Puppet::Util::Autoload.new(klass, "puppet/provider/#{klass.name.to_s}")
+    klass.providerloader = Puppet::Util::Autoload.new(klass, "puppet/provider/#{klass.name}")
 
     # We have to load everything so that we can figure out the default provider.
     klass.providerloader.loadall(Puppet.lookup(:current_environment))

data/lib/puppet/module.rb

@@ -237,7 +237,7 @@ class Puppet::Module
     @metadata = data = read_metadata
     return if data.empty?
 
-    @forge_name = data['name'].gsub('-', '/') if data['name']
+    @forge_name = data['name'].tr('-', '/') if data['name']
 
     [:source, :author, :version, :license, :dependencies].each do |attr|
       value = data[attr.to_s]

data/lib/puppet/module/task.rb

@@ -76,11 +76,23 @@ class Puppet::Module
     # Find task's required lib files and retrieve paths for both 'files' and 'implementation:files' metadata keys
     def self.find_extra_files(metadata, envname = nil)
       return [] if metadata.nil?
+      
+      files = metadata.fetch('files', [])
+      unless files.is_a?(Array)
+        msg = _("The 'files' task metadata expects an array, got %{files}.") % {files: files}
+        raise InvalidMetadata.new(msg, 'puppet.tasks/invalid-metadata')
+      end
+      impl_files = metadata.fetch('implementations', []).flat_map do |impl| 
+        file_array = impl.fetch('files', [])
+        unless file_array.is_a?(Array)
+          msg = _("The 'files' task metadata expects an array, got %{files}.") % {files: file_array}
+          raise InvalidMetadata.new(msg, 'puppet.tasks/invalid-metadata')
+        end
+        file_array
+      end
 
-      files = metadata.fetch('files', []) +
-        metadata.fetch('implementations', []).flat_map { |impl| impl.fetch('files', []) }
-
-      files.uniq.flat_map do |file|
+      combined_files = files + impl_files
+      combined_files.uniq.flat_map do |file|
         module_name, mount, endpath = file.split("/", 3)
         # If there's a mount directory with no trailing slash this will be nil
         # We want it to be empty to construct a path
@@ -142,6 +154,10 @@ class Puppet::Module
         end
 
         implementations = metadata['implementations'].map do |impl|
+          unless impl['requirements'].is_a?(Array) || impl['requirements'].nil?
+            msg = _("Task metadata for task %{name} does not specify requirements as an array" % { name: name })
+            raise InvalidMetadata.new(msg, 'puppet.tasks/invalid-metadata')
+          end
           path = executables.find { |real_impl| File.basename(real_impl) == impl['name'] }
           unless path
             msg = _("Task metadata for task %{name} specifies missing implementation %{implementation}" % { name: name, implementation: impl['name'] })

data/lib/puppet/module_tool/applications/installer.rb

@@ -306,7 +306,7 @@ module Puppet::ModuleTool
           @environment.modules_by_path[options[:target_dir]].each do |mod|
             if mod.has_metadata?
               metadata = {
-                :name    => mod.forge_name.gsub('/', '-'),
+                :name    => mod.forge_name.tr('/', '-'),
                 :version => mod.version
               }
               next if release[:module] == metadata[:name]

data/lib/puppet/module_tool/applications/uninstaller.rb

@@ -49,7 +49,7 @@ module Puppet::ModuleTool
 
       def find_installed_module
         @environment.modules_by_path.values.flatten.each do |mod|
-          mod_name = (mod.forge_name || mod.name).gsub('/', '-')
+          mod_name = (mod.forge_name || mod.name).tr('/', '-')
           if mod_name == @name
             @unfiltered << {
               :name    => mod_name,
@@ -100,7 +100,7 @@ module Puppet::ModuleTool
           if mod.has_metadata? && !changes.empty?
             raise LocalChangesError,
               :action            => :uninstall,
-              :module_name       => (mod.forge_name || mod.name).gsub('/', '-'),
+              :module_name       => (mod.forge_name || mod.name).tr('/', '-'),
               :requested_version => @options[:version],
               :installed_version => mod.version
           end
@@ -108,7 +108,7 @@ module Puppet::ModuleTool
 
         if !@options[:force] && !mod.required_by.empty?
           raise ModuleIsRequiredError,
-            :module_name       => (mod.forge_name || mod.name).gsub('/', '-'),
+            :module_name       => (mod.forge_name || mod.name).tr('/', '-'),
             :required_by       => mod.required_by,
             :requested_version => @options[:version],
             :installed_version => mod.version

data/lib/puppet/module_tool/metadata.rb

@@ -101,7 +101,7 @@ module Puppet::ModuleTool
 
       contents = data.keys.map do |k|
         value = (Puppet::Util::Json.dump(data[k], :pretty => true) rescue data[k].to_json)
-        %Q("#{k.to_s}": #{value})
+        %Q("#{k}": #{value})
       end
 
       "{\n" + contents.join(",\n").gsub(/^/, '  ') + "\n}\n"

data/lib/puppet/module_tool/shared_behaviors.rb

@@ -8,12 +8,12 @@ module Puppet::ModuleTool::Shared
     @installed  = Hash.new { |h,k| h[k] = [] }
 
     @environment.modules_by_path.values.flatten.each do |mod|
-      mod_name = (mod.forge_name || mod.name).gsub('/', '-')
+      mod_name = (mod.forge_name || mod.name).tr('/', '-')
       @installed[mod_name] << mod
       d = @local["#{mod_name}@#{mod.version}"]
       (mod.dependencies || []).each do |hash|
         name, conditions = hash['name'], hash['version_requirement']
-        name = name.gsub('/', '-')
+        name = name.tr('/', '-')
         d[name] = conditions
         @conditions[name] << {
           :module => mod_name,
@@ -34,7 +34,7 @@ module Puppet::ModuleTool::Shared
     info = forge.remote_dependency_info(author, modname, @options[:version])
     info.each do |pair|
       mod_name, releases = pair
-      mod_name = mod_name.gsub('/', '-')
+      mod_name = mod_name.tr('/', '-')
       releases.each do |rel|
         semver = SemanticPuppet::Version.parse(rel['version']) rescue SemanticPuppet::Version::MIN
         @versions[mod_name] << { :vstring => rel['version'], :semver => semver }
@@ -42,7 +42,7 @@ module Puppet::ModuleTool::Shared
         @urls["#{mod_name}@#{rel['version']}"] = rel['file']
         d = @remote["#{mod_name}@#{rel['version']}"]
         (rel['dependencies'] || []).each do |name, conditions|
-          d[name.gsub('/', '-')] = conditions
+          d[name.tr('/', '-')] = conditions
         end
       end
     end

data/lib/puppet/module_tool/tar/mini.rb

@@ -93,7 +93,7 @@ class Puppet::ModuleTool::Tar::Mini
   def find_valid_files(tarfile)
     Archive::Tar::Minitar.open(tarfile).collect do |entry|
       flag = entry.typeflag
-      if flag.nil? || flag =~ /[[:digit:]]/ && (0..7).include?(flag.to_i)
+      if flag.nil? || flag =~ /[[:digit:]]/ && (0..7).cover?(flag.to_i)
         entry.full_name
       else
         Puppet.debug "Invalid tar flag '#{flag}' will not be extracted: #{entry.name}"

data/lib/puppet/network/http.rb

@@ -18,12 +18,8 @@ module Puppet::Network::HTTP
   require 'puppet/network/http/handler'
   require 'puppet/network/http/response'
   require 'puppet/network/http/request'
-  require 'puppet/network/http/site'
-  require 'puppet/network/http/session'
-  require 'puppet/network/http/factory'
-  require 'puppet/network/http/base_pool'
-  require 'puppet/network/http/nocache_pool'
-  require 'puppet/network/http/pool'
   require 'puppet/network/http/memory_response'
   require 'puppet/network/http/compression'
+
+  require 'puppet/http'
 end

data/lib/puppet/network/http/api/indirected_routes.rb

@@ -120,6 +120,17 @@ class Puppet::Network::HTTP::API::IndirectedRoutes
     [indirection, method, key, params]
   end
 
+  def self.request_to_uri(request)
+    uri, body = request_to_uri_and_body(request)
+    "#{uri}?#{body}"
+  end
+
+  def self.request_to_uri_and_body(request)
+    url_prefix = IndirectionType.url_prefix_for(request.indirection_name.to_s)
+    indirection = request.method == :search ? pluralize(request.indirection_name.to_s) : request.indirection_name.to_s
+    ["#{url_prefix}/#{indirection}/#{Puppet::Util.uri_encode(request.key)}", "environment=#{request.environment.name}&#{request.query_string}"]
+  end
+
   private
 
   # Execute our find.
@@ -255,20 +266,10 @@ class Puppet::Network::HTTP::API::IndirectedRoutes
     method
   end
 
-  def self.request_to_uri(request)
-    uri, body = request_to_uri_and_body(request)
-    "#{uri}?#{body}"
-  end
-
-  def self.request_to_uri_and_body(request)
-    url_prefix = IndirectionType.url_prefix_for(request.indirection_name.to_s)
-    indirection = request.method == :search ? pluralize(request.indirection_name.to_s) : request.indirection_name.to_s
-    ["#{url_prefix}/#{indirection}/#{Puppet::Util.uri_encode(request.key)}", "environment=#{request.environment.name}&#{request.query_string}"]
-  end
-
   def self.pluralize(indirection)
     return(indirection == "status" ? "statuses" : indirection + "s")
   end
+  private_class_method :pluralize
 
   def plurality(indirection)
     # NOTE These specific hooks for paths are ridiculous, but it's a *many*-line

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

@@ -325,19 +325,17 @@ module Puppet::Network::HTTP
     rescue => exception
       elapsed = (Time.now - start).to_f.round(3)
       uri = [@site.addr, request.path.split('?')[0]].join('/')
-      eclass = exception.class
-
-      err = case exception
-            when EOFError
-              eclass.new(_('request %{uri} interrupted after %{elapsed} seconds') % {uri: uri, elapsed: elapsed})
-            when Timeout::Error
-              eclass.new(_('request %{uri} timed out after %{elapsed} seconds') % {uri: uri, elapsed: elapsed})
-            else
-              eclass.new(_('request %{uri} failed: %{msg}') % {uri: uri, msg: exception.message})
-            end
 
-      err.set_backtrace(exception.backtrace) unless exception.backtrace.empty?
-      raise err
+      case exception
+      when EOFError
+        Puppet.log_exception(exception, _('request %{uri} interrupted after %{elapsed} seconds') % {uri: uri, elapsed: elapsed})
+      when Timeout::Error
+        Puppet.log_exception(exception, _('request %{uri} timed out after %{elapsed} seconds') % {uri: uri, elapsed: elapsed})
+      else
+        Puppet.log_exception(exception, _('request %{uri} failed: %{msg}') % {uri: uri, msg: exception.message})
+      end
+
+      raise exception
     end
 
     def with_connection(site, &block)

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

@@ -89,6 +89,8 @@ class Puppet::Network::HTTP::Pool < Puppet::Network::HTTP::BasePool
   #
   # @api private
   def setsockopts(netio)
+    return unless netio
+
     socket = netio.io
     socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true)
   end

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

@@ -8,6 +8,10 @@
 class Puppet::Network::HTTP::Site
   attr_reader :scheme, :host, :port
 
+  def self.from_uri(uri)
+    self.new(uri.scheme, uri.host, uri.port)
+  end
+
   def initialize(scheme, host, port)
     @scheme = scheme
     @host = host
@@ -15,7 +19,7 @@ class Puppet::Network::HTTP::Site
   end
 
   def addr
-    "#{@scheme}://#{@host}:#{@port.to_s}"
+    "#{@scheme}://#{@host}:#{@port}"
   end
   alias to_s addr