puppet 6.27.0 → 7.0.0

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/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
 
@@ -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/rest.rb

@@ -5,11 +5,7 @@ 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)
@@ -26,17 +22,15 @@ 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)
@@ -46,7 +40,6 @@ class Puppet::Indirector::FileMetadata::Rest < Puppet::Indirector::REST
       environment: request.environment.to_s,
       recurse: request.options[:recurse],
       recurselimit: request.options[:recurselimit],
-      max_files: request.options[:max_files],
       ignore: request.options[:ignore],
       links: request.options[:links],
       checksum_type: request.options[:checksum_type],
@@ -57,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/indirection.rb

@@ -313,7 +313,7 @@ class Puppet::Indirector::Indirection
     request = request(:save, key, instance, options)
     terminus = prepare(request)
 
-    result = terminus.save(request) if !request.ignore_terminus?
+    result = terminus.save(request)
 
     # If caching is enabled, save our document there
     cache.save(request) if cache? && !request.ignore_cache_save?

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

@@ -6,8 +6,6 @@ class Puppet::Node::Rest < Puppet::Indirector::REST
     to override its environment."
 
   def find(request)
-    return super unless use_http_client?
-
     session = Puppet.lookup(:http_session)
     api = session.route_to(:puppet)
     _, node = api.get_node(
@@ -21,11 +19,11 @@ class Puppet::Node::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/report/rest.rb

@@ -3,13 +3,8 @@ require 'semantic_puppet'
 
 class Puppet::Transaction::Report::Rest < Puppet::Indirector::REST
   desc "Get server report over HTTP via REST."
-  use_server_setting(:report_server)
-  use_port_setting(:report_port)
-  use_srv_service(:report)
 
   def save(request)
-    return super unless use_http_client?
-
     session = Puppet.lookup(:http_session)
     api = session.route_to(:report)
     response = api.put_report(
@@ -22,13 +17,13 @@ class Puppet::Transaction::Report::Rest < Puppet::Indirector::REST
   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
 
   # This is called by the superclass when not using our httpclient.
   def handle_response(request, response)
-    if !response.is_a?(Net::HTTPSuccess)
-      server_version = response[Puppet::Network::HTTP::HEADER_PUPPET_VERSION]
+    if !response.success?
+      server_version = response[Puppet::Network::HEADER_PUPPET_VERSION]
       if server_version &&
          SemanticPuppet::Version.parse(server_version).major < Puppet::Indirector::REST::MAJOR_VERSION_JSON_DEFAULT &&
          Puppet[:preferred_serialization_format] != 'pson'

data/lib/puppet/indirector/request.rb

@@ -1,7 +1,6 @@
 require 'cgi'
 require 'uri'
 require 'puppet/indirector'
-require 'puppet/network/resolver'
 require 'puppet/util/psych_support'
 require 'puppet/util/warnings'
 
@@ -109,47 +108,6 @@ class Puppet::Indirector::Request
     method == :search
   end
 
-  # Create the query string, if options are present.
-  def query_string
-    return "" if options.nil? || options.empty?
-    encode_params(expand_into_parameters(options.to_a))
-  end
-
-  def expand_into_parameters(data)
-    data.inject([]) do |params, key_value|
-      key, value = key_value
-
-      expanded_value = case value
-                       when Array
-                         value.collect { |val| [key, val] }
-                       else
-                         [key_value]
-                       end
-
-      params.concat(expand_primitive_types_into_parameters(expanded_value))
-    end
-  end
-
-  def expand_primitive_types_into_parameters(data)
-    data.inject([]) do |params, key_value|
-      key, value = key_value
-      case value
-      when nil
-        params
-      when true, false, String, Symbol, Integer, Float
-        params << [key, value]
-      else
-        raise ArgumentError, _("HTTP REST queries cannot handle values of type '%{klass}'") % { klass: value.class }
-      end
-    end
-  end
-
-  def encode_params(params)
-    params.collect do |key, value|
-      "#{key}=#{Puppet::Util.uri_query_encode(value.to_s)}"
-    end.join("&")
-  end
-
   def initialize_from_hash(hash)
     @indirection_name = hash['indirection_name'].to_sym
     @method = hash['method'].to_sym
@@ -182,65 +140,6 @@ class Puppet::Indirector::Request
     return(uri ? uri : "/#{indirection_name}/#{key}")
   end
 
-  def do_request(srv_service=:puppet, default_server=nil, default_port=nil, &block)
-    # We were given a specific server to use, so just use that one.
-    # This happens if someone does something like specifying a file
-    # source using a puppet:// URI with a specific server.
-    return yield(self) if !self.server.nil?
-
-    if Puppet.settings[:use_srv_records]
-      # We may want to consider not creating a new resolver here
-      # every request eventually, to take advantage of the resolver's
-      # caching behavior.
-      resolver = Puppet::Network::Resolver.new
-      resolver.each_srv_record(Puppet.settings[:srv_domain], srv_service) do |srv_server, srv_port|
-        begin
-          self.server = srv_server
-          self.port   = srv_port
-          return yield(self)
-        rescue SystemCallError => e
-          Puppet.warning _("Error connecting to %{srv_server}:%{srv_port}: %{message}") % { srv_server: srv_server, srv_port: srv_port, message: e.message }
-        end
-      end
-    end
-
-    if default_server
-      self.server = default_server
-    else
-      self.server = Puppet.lookup(:server) do
-        primary_server = Puppet.settings[:server_list][0]
-        if primary_server
-          #TRANSLATORS 'server_list' is the name of a setting and should not be translated
-          debug_once _("Selected server from first entry of the `server_list` setting: %{server}") % {server: primary_server[0]}
-          primary_server[0]
-        else
-          #TRANSLATORS 'server' is the name of a setting and should not be translated
-          debug_once _("Selected server from the `server` setting: %{server}") % {server: Puppet.settings[:server]}
-          Puppet.settings[:server]
-        end
-      end
-    end
-
-    if default_port
-      self.port = default_port
-    else
-      self.port = Puppet.lookup(:serverport) do
-        primary_server = Puppet.settings[:server_list][0]
-        if primary_server
-          #TRANSLATORS 'server_list' is the name of a setting and should not be translated
-          debug_once _("Selected port from the first entry of the `server_list` setting: %{port}") % {port: primary_server[1]}
-          primary_server[1]
-        else
-          #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
-
-    return yield(self)
-  end
-
   def remote?
     self.node or self.ip
   end

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

@@ -24,12 +24,7 @@ class Puppet::Resource::Ral < Puppet::Indirector::Code
     type(request).instances.map do |res|
       res.to_resource
     end.find_all do |res|
-      conditions.all? do |property, value|
-        # even though `res` is an instance of Puppet::Resource, calling
-        # `res[:name]` on it returns nil, and for some reason it is necessary
-        # to invoke the Puppet::Resource#copy_as_resource copy constructor...
-        res.copy_as_resource[property].to_s == value.to_s
-      end
+      conditions.all? {|property, value| res.to_resource[property].to_s == value.to_s}
     end.sort_by(&:title)
   end