puppet 6.16.0-x86-mingw32 → 7.0.0-x86-mingw32

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

@@ -32,8 +32,14 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
     # Initialize core Puppet facts, such as puppetversion
     Puppet.initialize_facts
 
-    result = Puppet::Node::Facts.new(request.key, Facter.to_hash)
-    result.add_local_facts
+    result = if request.options[:resolve_options]
+               raise(Puppet::Error, _("puppet facts show requires version 4.0.40 or greater of Facter.")) unless Facter.respond_to?(:resolve)
+               find_with_options(request)
+             else
+               Puppet::Node::Facts.new(request.key, Facter.to_hash)
+             end
+
+    result.add_local_facts unless request.options[:resolve_options]
     result.sanitize
     result
   end
@@ -55,13 +61,13 @@ 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
 
       true
     end
-
+    dirs << request.options[:custom_dir] if request.options[:custom_dir]
     Facter.search(*dirs)
   end
 
@@ -71,7 +77,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,10 +85,25 @@ 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
 
+    dirs << request.options[:external_dir] if request.options[:external_dir]
     Facter.search_external dirs
   end
+
+  private
+
+  def find_with_options(request)
+    options = request.options
+    options_for_facter = String.new
+    options_for_facter += options[:user_query].join(' ')
+    options_for_facter += " --config #{options[:config_file]}" if options[:config_file]
+    options_for_facter += " --show-legacy" if options[:show_legacy]
+    options_for_facter += " --no-block" if options[:no_block] == false
+    options_for_facter += " --no-cache" if options[:no_cache] == false
+
+    Puppet::Node::Facts.new(request.key, Facter.resolve(options_for_facter))
+  end
 end

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

@@ -0,0 +1,27 @@
+require 'puppet/node/facts'
+require 'puppet/indirector/json'
+require 'puppet/indirector/fact_search'
+
+class Puppet::Node::Facts::Json < Puppet::Indirector::JSON
+  desc "Store client facts as flat files, serialized using JSON, or
+    return deserialized facts from disk."
+
+  include Puppet::Indirector::FactSearch
+  
+  def search(request)
+    node_names = []
+    Dir.glob(json_dir_path).each do |file|
+      facts = load_json_from_file(file, '')
+      if facts && node_matches?(facts, request.options)
+        node_names << facts.name
+      end
+    end
+    node_names
+  end
+
+  private
+
+  def json_dir_path
+    self.path("*")
+  end
+end

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

@@ -5,8 +5,6 @@ class Puppet::Node::Facts::Rest < Puppet::Indirector::REST
   desc "Find and save facts about nodes over HTTP via REST."
 
   def find(request)
-    return super unless use_http_client?
-
     session = Puppet.lookup(:http_session)
     api = session.route_to(:puppet)
     _, facts = api.get_facts(
@@ -18,19 +16,17 @@ class Puppet::Node::Facts::Rest < Puppet::Indirector::REST
     if e.response.code == 404
       return nil unless request.options[:fail_on_404]
 
-      _, body = parse_response(e.response.nethttp)
+      _, body = parse_response(e.response)
       msg = _("Find %{uri} resulted in 404 with the message: %{body}") % { uri: elide(e.response.url.path, 100), body: body }
       raise Puppet::Error, msg
     else
-      raise convert_to_http_error(e.response.nethttp)
+      raise convert_to_http_error(e.response)
     end
   end
 
   def save(request)
     raise ArgumentError, _("PUT does not accept options") unless request.options.empty?
 
-    return legacy_save(request) unless use_http_client?
-
     session = Puppet.lookup(:http_session)
     api = session.route_to(:puppet)
     api.put_facts(
@@ -43,21 +39,6 @@ class Puppet::Node::Facts::Rest < Puppet::Indirector::REST
     nil
   rescue Puppet::HTTP::ResponseError => e
     # always raise even if fail_on_404 is false
-    raise convert_to_http_error(e.response.nethttp)
-  end
-
-  private
-
-  def legacy_save(request)
-    response = do_request(request) do |req|
-      http_put(req, IndirectedRoutes.request_to_uri(req), req.instance.render, headers.merge({ "Content-Type" => req.instance.mime }))
-    end
-
-    if is_http_200?(response)
-      content_type, body = parse_response(response)
-      deserialize_save(content_type, body)
-    else
-      raise convert_to_http_error(response)
-    end
+    raise convert_to_http_error(e.response)
   end
 end

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

@@ -1,10 +1,13 @@
 require 'puppet/node/facts'
 require 'puppet/indirector/yaml'
+require 'puppet/indirector/fact_search'
 
 class Puppet::Node::Facts::Yaml < Puppet::Indirector::Yaml
   desc "Store client facts as flat files, serialized using YAML, or
     return deserialized facts from disk."
 
+  include Puppet::Indirector::FactSearch
+
   def search(request)
     node_names = []
     Dir.glob(yaml_dir_path).each do |file|
@@ -20,65 +23,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
-
-  def node_matches?(facts, options)
-    options.each do |key, value|
-      type, name, operator = key.to_s.split(".")
-      operator ||= 'eq'
-
-      return false unless node_matches_option?(type, name, operator, value, facts)
-    end
-    return true
-  end
-
-  def node_matches_option?(type, name, operator, value, facts)
-    case type
-    when "meta"
-      case name
-      when "timestamp"
-        compare_timestamp(operator, facts.timestamp, Time.parse(value))
-      end
-    when "facts"
-      compare_facts(operator, facts.values[name], value)
-    end
-  end
-
-  def compare_facts(operator, value1, value2)
-    return false unless value1
-
-    case operator
-    when "eq"
-      value1.to_s == value2.to_s
-    when "le"
-      value1.to_f <= value2.to_f
-    when "ge"
-      value1.to_f >= value2.to_f
-    when "lt"
-      value1.to_f < value2.to_f
-    when "gt"
-      value1.to_f > value2.to_f
-    when "ne"
-      value1.to_s != value2.to_s
-    end
-  end
-
-  def compare_timestamp(operator, value1, value2)
-    case operator
-    when "eq"
-      value1 == value2
-    when "le"
-      value1 <= value2
-    when "ge"
-      value1 >= value2
-    when "lt"
-      value1 < value2
-    when "gt"
-      value1 > value2
-    when "ne"
-      value1 != value2
-    end
-  end
 end

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

@@ -6,8 +6,6 @@ module Puppet::FileBucketFile
     desc "This is a REST based mechanism to send/retrieve file to/from the filebucket"
 
     def head(request)
-      return super unless use_http_client?
-
       session = Puppet.lookup(:http_session)
       api = session.route_to(:puppet)
       api.head_filebucket_file(
@@ -17,12 +15,10 @@ module Puppet::FileBucketFile
       )
     rescue Puppet::HTTP::ResponseError => e
       return nil if e.response.code == 404
-      raise convert_to_http_error(e.response.nethttp)
+      raise convert_to_http_error(e.response)
     end
 
     def find(request)
-      return super unless use_http_client?
-
       session = Puppet.lookup(:http_session)
       api = session.route_to(:puppet)
       _, filebucket_file = api.get_filebucket_file(
@@ -36,12 +32,10 @@ module Puppet::FileBucketFile
       )
       filebucket_file
     rescue Puppet::HTTP::ResponseError => e
-      raise convert_to_http_error(e.response.nethttp)
+      raise convert_to_http_error(e.response)
     end
 
     def save(request)
-      return super unless use_http_client?
-
       session = Puppet.lookup(:http_session)
       api = session.route_to(:puppet)
       api.put_filebucket_file(
@@ -50,7 +44,7 @@ module Puppet::FileBucketFile
         environment: request.environment.to_s,
       )
     rescue Puppet::HTTP::ResponseError => e
-      raise convert_to_http_error(e.response.nethttp)
+      raise convert_to_http_error(e.response)
     end
   end
 end

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

@@ -5,11 +5,7 @@ require 'puppet/indirector/rest'
 class Puppet::Indirector::FileContent::Rest < Puppet::Indirector::REST
   desc "Retrieve file contents via a REST HTTP interface."
 
-  use_srv_service(:fileserver)
-
   def find(request)
-    return super unless use_http_client?
-
     content = StringIO.new
     content.binmode
 
@@ -18,7 +14,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
@@ -29,11 +25,11 @@ class Puppet::Indirector::FileContent::Rest < Puppet::Indirector::REST
     if e.response.code == 404
       return nil unless request.options[:fail_on_404]
 
-      _, body = parse_response(e.response.nethttp)
+      _, body = parse_response(e.response)
       msg = _("Find %{uri} resulted in 404 with the message: %{body}") % { uri: elide(e.response.url.path, 100), body: body }
       raise Puppet::Error, msg
     else
-      raise convert_to_http_error(e.response.nethttp)
+      raise convert_to_http_error(e.response)
     end
   end
 end

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

@@ -9,19 +9,39 @@ class Puppet::Indirector::FileMetadata::Http < Puppet::Indirector::GenericHttp
   include Puppet::FileServing::TerminusHelper
 
   def find(request)
+    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})
 
-    if head.success?
-      metadata = Puppet::FileServing::HttpMetadata.new(head)
-      metadata.checksum_type = request.options[:checksum_type] if request.options[:checksum_type]
-      metadata.collect
-      metadata
+    return create_httpmetadata(head, checksum_type) if head.success?
+
+    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

@@ -5,17 +5,13 @@ require 'puppet/indirector/rest'
 class Puppet::Indirector::FileMetadata::Rest < Puppet::Indirector::REST
   desc "Retrieve file metadata via a REST HTTP interface."
 
-  use_srv_service(:fileserver)
-
   def find(request)
-    return super unless use_http_client?
-
     url = URI.parse(Puppet::Util.uri_encode(request.uri))
     session = Puppet.lookup(:http_session)
     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],
@@ -26,23 +22,21 @@ class Puppet::Indirector::FileMetadata::Rest < Puppet::Indirector::REST
     if e.response.code == 404
       return nil unless request.options[:fail_on_404]
 
-      _, body = parse_response(e.response.nethttp)
+      _, body = parse_response(e.response)
       msg = _("Find %{uri} resulted in 404 with the message: %{body}") % { uri: elide(e.response.url.path, 100), body: body }
       raise Puppet::Error, msg
     else
-      raise convert_to_http_error(e.response.nethttp)
+      raise convert_to_http_error(e.response)
     end
   end
 
   def search(request)
-    return super unless use_http_client?
-
     url = URI.parse(Puppet::Util.uri_encode(request.uri))
     session = Puppet.lookup(:http_session)
     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],
@@ -56,6 +50,6 @@ class Puppet::Indirector::FileMetadata::Rest < Puppet::Indirector::REST
     # since it's search, return empty array instead of nil
     return [] if e.response.code == 404
 
-    raise convert_to_http_error(e.response.nethttp)
+    raise convert_to_http_error(e.response)
   end
 end

data/lib/puppet/indirector/file_server.rb

@@ -16,14 +16,7 @@ class Puppet::Indirector::FileServer < Puppet::Indirector::Terminus
     # If we're not serving this mount, then access is denied.
     return false unless mount
 
-    # If there are no auth directives or there is an 'allow *' directive, then
-    # access is allowed.
-    if mount.empty? || mount.globalallow?
-      return true
-    end
-
-    Puppet.err _("Denying %{method} request for %{desc} on fileserver mount '%{mount_name}'. Use of auth directives for 'fileserver.conf' mount points is no longer supported. Remove these directives and use the 'auth.conf' file instead for access control.") % { method: request.method, desc: request.description, mount_name: mount.name }
-    return false
+    true
   end
 
   # Find our key using the fileserver.

data/lib/puppet/indirector/generic_http.rb

@@ -1,16 +1,5 @@
 require 'puppet/file_serving/terminus_helper'
-require 'puppet/util/http_proxy'
 
 class Puppet::Indirector::GenericHttp < Puppet::Indirector::Terminus
   desc "Retrieve data from a remote HTTP server."
-
-  class <<self
-    attr_accessor :http_method
-  end
-
-  def find(request)
-    uri = URI(request.uri)
-    method = self.class.http_method
-    Puppet::Util::HttpProxy.request_with_redirects(uri,method)
-  end
 end

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?