puppet 5.5.22 → 6.0.0

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

@@ -387,17 +387,9 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
 
   # Initialize our server fact hash; we add these to each client, and they
   # won't change while we're running, so it's safe to cache the values.
-  #
-  # See also set_server_facts in Puppet::Server::Compiler in puppetserver.
   def set_server_facts
     @server_facts = {}
 
-    # Add our server Puppet Enterprise version, if available.
-    pe_version_file = '/opt/puppetlabs/server/pe_version'
-    if File.readable?(pe_version_file) and !File.zero?(pe_version_file)
-      @server_facts['pe_serverversion'] = File.read(pe_version_file).chomp
-    end
-
     # Add our server version to the fact list
     @server_facts["serverversion"] = Puppet.version.to_s
 

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

@@ -8,7 +8,7 @@ class Puppet::Resource::Catalog::Json < Puppet::Indirector::JSON
     utf8 = text.force_encoding(Encoding::UTF_8)
 
     if utf8.valid_encoding?
-      model.convert_from('json', utf8)
+      model.convert_from(json_format, utf8)
     else
       Puppet.info(_("Unable to deserialize catalog from json, retrying with pson"))
       model.convert_from('pson', text.force_encoding(Encoding::BINARY))
@@ -16,9 +16,20 @@ class Puppet::Resource::Catalog::Json < Puppet::Indirector::JSON
   end
 
   def to_json(object)
-    object.render('json')
-  rescue Puppet::Network::FormatHandler::FormatError
+    object.render(json_format)
+  rescue Puppet::Network::FormatHandler::FormatError => err
     Puppet.info(_("Unable to serialize catalog to json, retrying with pson"))
+    Puppet.log_exception(err, err.message, level: :debug)
     object.render('pson').force_encoding(Encoding::BINARY)
   end
+
+  private
+
+  def json_format
+    if Puppet[:rich_data]
+      'rich_data_json'
+    else
+      'json'
+    end
+  end
 end

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

@@ -3,20 +3,4 @@ require 'puppet/indirector/yaml'
 
 class Puppet::Resource::Catalog::Yaml < Puppet::Indirector::Yaml
   desc "Store catalogs as flat files, serialized using YAML."
-
-  private
-
-  # Override these, because yaml doesn't want to convert our self-referential
-  # objects.  This is hackish, but eh.
-  def from_yaml(text)
-    if config = YAML.load(text)
-      return config
-    end
-  end
-
-  def to_yaml(config)
-    # We can't yaml-dump classes.
-    #config.edgelist_class = nil
-    YAML.dump(config)
-  end
 end

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

@@ -5,5 +5,4 @@ class Puppet::SSL::Certificate::File < Puppet::Indirector::SslFile
   desc "Manage SSL certificates on disk."
 
   store_in :certdir
-  store_ca_at :localcacert
 end

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

@@ -8,8 +8,10 @@ class Puppet::Node::Facts::Yaml < Puppet::Indirector::Yaml
   def search(request)
     node_names = []
     Dir.glob(yaml_dir_path).each do |file|
-      facts = YAML.load_file(file)
-      node_names << facts.name if node_matches?(facts, request.options)
+      facts = load_file(file)
+      if facts && node_matches?(facts, request.options)
+        node_names << facts.name
+      end
     end
     node_names
   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.exist?(request.options[:bucket_path])
+        return nil unless ::File.exists?(request.options[:bucket_path])
         return list(request)
       end
       checksum, files_original_path = request_to_checksum_and_path(request)

data/lib/puppet/indirector/hiera.rb

@@ -1,10 +1,6 @@
 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?
@@ -73,8 +69,6 @@ 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/indirection.rb

@@ -1,6 +1,5 @@
 require 'puppet/util/docs'
 require 'puppet/util/profiler'
-require 'puppet/util/methodhelper'
 require 'puppet/indirector/envelope'
 require 'puppet/indirector/request'
 
@@ -8,7 +7,6 @@ require 'puppet/indirector/request'
 # back-ends.  Each indirection has a set of associated terminus classes,
 # each of which is a subclass of Puppet::Indirector::Terminus.
 class Puppet::Indirector::Indirection
-  include Puppet::Util::MethodHelper
   include Puppet::Util::Docs
 
   attr_accessor :name, :model
@@ -89,25 +87,23 @@ class Puppet::Indirector::Indirection
     text
   end
 
-  def initialize(model, name, options = {})
+  def initialize(model, name, doc: nil, indirected_class: nil, cache_class: nil, terminus_class: nil, terminus_setting: nil, extend: nil)
     @model = model
     @name = name
     @termini = {}
 
-    @cache_class = nil
-    @terminus_class = nil
+    @doc = doc
 
     raise(ArgumentError, _("Indirection %{name} is already defined") % { name: @name }) if @@indirections.find { |i| i.name == @name }
     @@indirections << self
 
-    @indirected_class = options.delete(:indirected_class)
-    if mod = options[:extend]
-      extend(mod)
-      options.delete(:extend)
-    end
+    @indirected_class = indirected_class
+    self.extend(extend) if extend
 
-    # This is currently only used for cache_class and terminus_class.
-    set_options(options)
+    # These setters depend on the indirection already being installed so they have to be at the end
+    self.cache_class = cache_class if cache_class
+    self.terminus_class = terminus_class if terminus_class
+    self.terminus_setting = terminus_setting if terminus_setting
   end
 
   # Set up our request object.

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

@@ -5,7 +5,6 @@ class Puppet::SSL::Key::File < Puppet::Indirector::SslFile
   desc "Manage SSL private and public keys on disk."
 
   store_in :privatekeydir
-  store_ca_at :cakey
 
   def allow_remote_requests?
     false
@@ -13,11 +12,7 @@ class Puppet::SSL::Key::File < Puppet::Indirector::SslFile
 
   # Where should we store the public key?
   def public_key_path(name)
-    if ca?(name)
-      Puppet[:capub]
-    else
-      File.join(Puppet[:publickeydir], name.to_s + ".pem")
-    end
+    File.join(Puppet[:publickeydir], name.to_s + ".pem")
   end
 
   # Remove the public key, in addition to the private key

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

@@ -38,11 +38,9 @@ class Puppet::Node::Exec < Puppet::Indirector::Exec
   # Turn our outputted objects into a Puppet::Node instance.
   def create_node(name, result, facts = nil)
     node = Puppet::Node.new(name)
-    set = false
     [:parameters, :classes, :environment].each do |param|
       if value = result[param]
         node.send(param.to_s + "=", value)
-        set = true
       end
     end
 
@@ -52,7 +50,7 @@ class Puppet::Node::Exec < Puppet::Indirector::Exec
 
   # Translate the yaml string into Ruby objects.
   def translate(name, output)
-    YAML.load(output).inject({}) do |hash, data|
+    Puppet::Util::Yaml.safe_load(output, [Symbol]).inject({}) do |hash, data|
       case data[0]
       when String
         hash[data[0].intern] = data[1]

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

@@ -4,10 +4,4 @@ require 'puppet/indirector/yaml'
 class Puppet::Node::Yaml < Puppet::Indirector::Yaml
   desc "Store node information as flat files, serialized using YAML,
     or deserialize stored YAML nodes."
-
-  protected
-
-  def fix(object)
-    object
-  end
 end

data/lib/puppet/indirector/request.rb

@@ -185,7 +185,11 @@ class Puppet::Indirector::Request
     return yield(self) if !self.server.nil?
 
     if Puppet.settings[:use_srv_records]
-      Puppet::Network::Resolver.each_srv_record(Puppet.settings[:srv_domain], srv_service) do |srv_server, srv_port|
+      # 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
@@ -196,37 +200,26 @@ class Puppet::Indirector::Request
       end
     end
 
-    if default_server
-      self.server = default_server
-    else
-      self.server = Puppet.lookup(:server) do
-        if primary_server = Puppet.settings[:server_list][0]
-          #TRANSLATORS 'server_list' is the name of a setting and should not be translated
-          Puppet.debug _("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
-          Puppet.debug _("Selected server from the `server` setting: %{server}") % {server: Puppet.settings[:server]}
-          Puppet.settings[:server]
-        end
+    # ... Fall back onto the default server.
+    bound_server = Puppet.lookup(:server) do
+      if primary_server = Puppet.settings[:server_list][0]
+        primary_server[0]
+      else
+        Puppet.settings[:server]
       end
     end
 
-    if default_port
-      self.port = default_port
-    else
-      self.port = Puppet.lookup(:serverport) do
-        if primary_server = Puppet.settings[:server_list][0]
-          #TRANSLATORS 'server_list' is the name of a setting and should not be translated
-          Puppet.debug _("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
-          Puppet.debug _("Selected port from the `masterport` setting: %{port}") % {port: Puppet.settings[:masterport]}
-          Puppet.settings[:masterport]
-        end
+    bound_port = Puppet.lookup(:serverport) do
+      if primary_server = Puppet.settings[:server_list][0]
+        primary_server[1]
+      else
+        Puppet.settings[:masterport]
       end
     end
+    self.server = default_server || bound_server
+    self.port   = default_port || bound_port
+
+    Puppet.debug "No more servers left, falling back to #{self.server}:#{self.port}" if Puppet.settings[:use_srv_records]
 
     return yield(self)
   end

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

@@ -25,7 +25,9 @@ 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_by(&:title)
+    end.sort do |a,b|
+      a.title <=> b.title
+    end
   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.casecmp(request.instance.type).zero? and title == request.instance.title
+    unless type.downcase == request.instance.type.downcase and title == request.instance.title
       raise Puppet::Indirector::ValidationError, _("Resource instance does not match request key")
     end
   end

data/lib/puppet/indirector/rest.rb

@@ -1,6 +1,7 @@
 require 'net/http'
 require 'uri'
 require 'puppet/util/json'
+require 'puppet/util/connection'
 require 'semantic_puppet'
 
 require 'puppet/network/http'
@@ -39,75 +40,16 @@ class Puppet::Indirector::REST < Puppet::Indirector::Terminus
     @srv_service || :puppet
   end
 
-  # The logic for server and port is kind of gross. In summary:
-  # IF an endpoint-specific setting is requested AND that setting has been set by the user
-  #    Use that setting.
-  #         The defaults for these settings are the "normal" server/masterport settings, so
-  #         when they are unset we instead want to "fall back" to the failover-selected
-  #         host/port pair.
-  # ELSE IF we have a failover-selected host/port
-  #    Use what the failover logic came up with
-  # ELSE IF the server_list setting is in use
-  #    Use the first entry - failover hasn't happened yet, but that
-  #    setting is still authoritative
-  # ELSE
-  #    Go for the legacy server/masterport settings, and hope for the best
+  # Select the server to use based on the settings configuration
+  # for this indirection, taking into account the HA server list.
   def self.server
-    setting = server_setting()
-    if setting && setting != :server && Puppet.settings.set_by_config?(setting)
-      Puppet.debug _("Selected server from the %{setting} setting: %{server}") % {setting: setting, server: Puppet.settings[setting]}
-      Puppet.settings[setting]
-    else
-      server = Puppet.lookup(:server) do
-        if primary_server = Puppet.settings[:server_list][0]
-          #TRANSLATORS 'server_list' is the name of a setting and should not be translated
-          Puppet.debug _("Dynamically-bound server lookup failed; using first entry from the `server_list` setting: %{server}") % {server: primary_server[0]}
-          primary_server[0]
-        else
-          setting ||= :server
-          Puppet.debug _("Dynamically-bound server lookup failed, falling back to %{setting} setting: %{server}") % {setting: setting, server: Puppet.settings[setting]}
-          Puppet.settings[setting]
-        end
-      end
-      server
-    end
+    Puppet::Util::Connection.determine_server(server_setting)
   end
 
-  # For port there's a little bit of an extra snag: setting a specific
-  # server setting and relying on the default port for that server is
-  # common, so we also want to check if the assocaited SERVER setting
-  # has been set by the user. If either of those are set we ignore the
-  # failover-selected port.
+  # Select the port to use based on the settings configuration
+  # for this indirection, taking into account the HA server list.
   def self.port
-    setting = port_setting()
-    srv_setting = server_setting()
-    if (setting && setting != :masterport && Puppet.settings.set_by_config?(setting)) ||
-        (srv_setting && srv_setting != :server && Puppet.settings.set_by_config?(srv_setting))
-      Puppet.debug _("Selected port from the %{setting} setting: %{port}") % {setting: setting, port: Puppet.settings[setting].to_i}
-      Puppet.settings[setting].to_i
-    else
-      port = Puppet.lookup(:serverport) do
-        if primary_server = Puppet.settings[:server_list][0]
-          # Port might not be set, so we want to fallback in that
-          # case. We know we don't need to use `setting` here, since
-          # the default value of every port setting is `masterport`
-          if primary_server[1]
-            #TRANSLATORS 'server_list' is the name of a setting and should not be translated
-            Puppet.debug _("Dynamically-bound port lookup failed; using first entry from 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
-            Puppet.debug _("Dynamically-bound port lookup failed; falling back to `masterport` setting: %{port}") % {port: Puppet.settings[:masterport]}
-            Puppet.settings[:masterport]
-          end
-        else
-          setting ||= :masterport
-          Puppet.debug _("Dynamically-bound port lookup failed; falling back to %{setting} setting: %{port}") % {setting: setting, port: Puppet.settings[setting]}
-          Puppet.settings[setting]
-        end
-      end
-      port.to_i
-    end
+    Puppet::Util::Connection.determine_port(port_setting, server_setting)
   end
 
   # Provide appropriate headers.

data/lib/puppet/indirector/ssl_file.rb

@@ -12,13 +12,8 @@ class Puppet::Indirector::SslFile < Puppet::Indirector::Terminus
     @file_setting = setting
   end
 
-  # Specify where a specific ca file should be stored.
-  def self.store_ca_at(setting)
-    @ca_setting = setting
-  end
-
   class << self
-    attr_reader :directory_setting, :file_setting, :ca_setting
+    attr_reader :directory_setting, :file_setting
   end
 
   # The full path to where we should store our files.
@@ -33,19 +28,6 @@ class Puppet::Indirector::SslFile < Puppet::Indirector::Terminus
     Puppet.settings[file_setting]
   end
 
-  # The full path to a ca file we would be managing.
-  def self.ca_location
-    return nil unless ca_setting
-    Puppet.settings[ca_setting]
-  end
-
-  # We assume that all files named 'ca' are pointing to individual ca files,
-  # rather than normal host files.  It's a bit hackish, but all the other
-  # solutions seemed even more hackish.
-  def ca?(name)
-    name == Puppet::SSL::Host.ca_name
-  end
-
   def initialize
     Puppet.settings.use(:main, :ssl)
 
@@ -58,9 +40,7 @@ class Puppet::Indirector::SslFile < Puppet::Indirector::Terminus
       raise ArgumentError, _("invalid key")
     end
 
-    if ca?(name) and ca_location
-      ca_location
-    elsif collection_directory
+    if collection_directory
       File.join(collection_directory, name.to_s + ".pem")
     else
       file_location
@@ -127,10 +107,6 @@ class Puppet::Indirector::SslFile < Puppet::Indirector::Terminus
     self.class.file_location
   end
 
-  def ca_location
-    self.class.ca_location
-  end
-
   # A hack method to deal with files that exist with a different case.
   # Just renames it; doesn't read it in or anything.
   # LAK:NOTE This is a copy of the method in sslcertificates/support.rb,
@@ -164,25 +140,8 @@ class Puppet::Indirector::SslFile < Puppet::Indirector::Terminus
     # * SSL::Key may be a .export(OpenSSL::Cipher::DES.new(:EDE3, :CBC), pass) or .to_pem
     # * All other classes are translated to strings by calling .to_pem
 
-    # Serialization of:
-    # Puppet::SSL::Certificate by Puppet::SSL::Certificate::Ca, Puppet::SSL::Certificate::File
-    # -----BEGIN CERTIFICATE-----
-    # Puppet::SSL::Key by Puppet::SSL::Key::Ca, Puppet::SSL::Key::File
-    # -----BEGIN RSA PRIVATE KEY-----
-    if ca?(name) and ca_location
-      Puppet.settings.setting(self.class.ca_setting).open('w:ASCII') { |f| yield f }
-    # Serialization of:
-    # Puppet::SSL::CertificateRevocationList by Puppet::SSL::CertificateRevocationList::Ca, Puppet::SSL::CertificateRevocationList::File
-    # -----BEGIN X509 CRL-----
-    elsif file_location
+    if file_location
       Puppet.settings.setting(self.class.file_setting).open('w:ASCII') { |f| yield f }
-    # Serialization of:
-    # Puppet::SSL::Certificate by Puppet::SSL::Certificate::Ca, Puppet::SSL::Certificate::File
-    # -----BEGIN CERTIFICATE-----
-    # Puppet::SSL::CertificateRequest by Puppet::SSL::CertificateRequest::Ca, Puppet::SSL::CertificateRequest::File
-    # -----BEGIN CERTIFICATE REQUEST-----
-    # Puppet::SSL::Key by Puppet::SSL::Key::Ca, Puppet::SSL::Key::File
-    # -----BEGIN RSA PRIVATE KEY-----
     elsif setting = self.class.directory_setting
       begin
         Puppet.settings.setting(setting).open_file(path, 'w:ASCII') { |f| yield f }