puppet 4.10.12-universal-darwin → 5.0.0-universal-darwin

data/lib/puppet/indirector/json.rb

@@ -4,8 +4,7 @@ require 'puppet/util'
 # The base class for JSON indirection terminus implementations.
 #
 # This should generally be preferred to the YAML base for any future
-# implementations, since it is ~ three times faster despite being pure Ruby
-# rather than a C implementation.
+# implementations, since it is faster and can load untrusted data safely.
 class Puppet::Indirector::JSON < Puppet::Indirector::Terminus
   def find(request)
     load_json_from_file(path(request.key), request.key)
@@ -15,16 +14,16 @@ class Puppet::Indirector::JSON < Puppet::Indirector::Terminus
     filename = path(request.key)
     FileUtils.mkdir_p(File.dirname(filename))
 
-    Puppet::Util.replace_file(filename, 0660) {|f| f.print to_json(request.instance).force_encoding(Encoding::ASCII_8BIT) }
+    Puppet::Util.replace_file(filename, 0660) {|f| f.print to_json(request.instance).force_encoding(Encoding::BINARY) }
   rescue TypeError => detail
-    Puppet.log_exception(detail, "Could not save #{self.name} #{request.key}: #{detail}")
+    Puppet.log_exception(detail, _("Could not save %{json} %{request}: %{detail}") % { json: self.name, request: request.key, detail: detail })
   end
 
   def destroy(request)
     Puppet::FileSystem.unlink(path(request.key))
   rescue => detail
     unless detail.is_a? Errno::ENOENT
-      raise Puppet::Error, "Could not destroy #{self.name} #{request.key}: #{detail}", detail.backtrace
+      raise Puppet::Error, _("Could not destroy %{json} %{request}: %{detail}") % { json: self.name, request: request.key, detail: detail }, detail.backtrace
     end
     1                           # emulate success...
   end
@@ -38,8 +37,8 @@ class Puppet::Indirector::JSON < Puppet::Indirector::Terminus
   # Return the path to a given node's file.
   def path(name, ext = '.json')
     if name =~ Puppet::Indirector::BadNameRegexp then
-      Puppet.crit("directory traversal detected in #{self.class}: #{name.inspect}")
-      raise ArgumentError, "invalid key"
+      Puppet.crit(_("directory traversal detected in %{json}: %{name}") % { json: self.class, name: name.inspect })
+      raise ArgumentError, _("invalid key")
     end
 
     base = Puppet.run_mode.master? ? Puppet[:server_datadir] : Puppet[:client_datadir]
@@ -52,25 +51,25 @@ class Puppet::Indirector::JSON < Puppet::Indirector::Terminus
     json = nil
 
     begin
-      json = Puppet::FileSystem.read(file).force_encoding(Encoding::ASCII_8BIT)
+      json = Puppet::FileSystem.read(file, :encoding => Encoding::BINARY)
     rescue Errno::ENOENT
       return nil
     rescue => detail
-      raise Puppet::Error, "Could not read JSON data for #{indirection.name} #{key}: #{detail}", detail.backtrace
+      raise Puppet::Error, _("Could not read JSON data for %{name} %{key}: %{detail}") % { name: indirection.name, key: key, detail: detail }, detail.backtrace
     end
 
     begin
       return from_json(json)
     rescue => detail
-      raise Puppet::Error, "Could not parse JSON data for #{indirection.name} #{key}: #{detail}", detail.backtrace
+      raise Puppet::Error, _("Could not parse JSON data for %{name} %{key}: %{detail}") % { name: indirection.name, key: key, detail: detail }, detail.backtrace
     end
   end
 
   def from_json(text)
-    model.convert_from('pson', text)
+    model.convert_from('json', text.force_encoding(Encoding::UTF_8))
   end
 
   def to_json(object)
-    object.render('pson')
+    object.render('json')
   end
 end

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

@@ -13,7 +13,7 @@ prevent clients getting confusing 'success' behaviour."
   [:find, :head, :search, :save, :destroy].each do |name|
     define_method(name) do |request|
       if request.remote?
-        raise Puppet::Error, "this master is not a CA"
+        raise Puppet::Error, _("this master is not a CA")
       else
         @file.send(name, request)
       end

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

@@ -30,7 +30,7 @@ class Puppet::SSL::Key::File < Puppet::Indirector::SslFile
     begin
       Puppet::FileSystem.unlink(key_path)
     rescue => detail
-      raise Puppet::Error, "Could not remove #{request.key} public key: #{detail}", detail.backtrace
+      raise Puppet::Error, _("Could not remove %{request} public key: %{detail}") % { request: request.key, detail: detail }, detail.backtrace
     end
   end
 
@@ -44,7 +44,7 @@ class Puppet::SSL::Key::File < Puppet::Indirector::SslFile
         f.print request.instance.content.public_key.to_pem
       end
     rescue => detail
-      raise Puppet::Error, "Could not write #{request.key}: #{detail}", detail.backtrace
+      raise Puppet::Error, _("Could not write %{request}: %{detail}") % { request: request.key, detail: detail }, detail.backtrace
     end
   end
 end

data/lib/puppet/indirector/ldap.rb

@@ -30,7 +30,7 @@ class Puppet::Indirector::Ldap < Puppet::Indirector::Terminus
   # Find the ldap node, return the class list and parent node specially,
   # and everything else in a parameter hash.
   def ldapsearch(filter)
-    raise ArgumentError.new("You must pass a block to ldapsearch") unless block_given?
+    raise ArgumentError.new(_("You must pass a block to ldapsearch")) unless block_given?
 
     found = false
     count = 0
@@ -47,10 +47,10 @@ class Puppet::Indirector::Ldap < Puppet::Indirector::Terminus
         # Try reconnecting to ldap if we get an exception and we haven't yet retried.
         count += 1
         @connection = nil
-        Puppet.warning "Retrying LDAP connection"
+        Puppet.warning _("Retrying LDAP connection")
         retry
       else
-        error = Puppet::Error.new("LDAP Search failed")
+        error = Puppet::Error.new(_("LDAP Search failed"))
         error.set_backtrace(detail.backtrace)
         raise error
       end
@@ -62,13 +62,14 @@ class Puppet::Indirector::Ldap < Puppet::Indirector::Terminus
   # Create an ldap connection.
   def connection
     unless @connection
-      raise Puppet::Error, "Could not set up LDAP Connection: Missing ruby/ldap libraries" unless Puppet.features.ldap?
+      #TRANSLATORS "ruby/ldap libraries" are code dependencies
+      raise Puppet::Error, _("Could not set up LDAP Connection: Missing ruby/ldap libraries") unless Puppet.features.ldap?
       begin
         conn = Puppet::Util::Ldap::Connection.instance
         conn.start
         @connection = conn.connection
       rescue => detail
-        message = "Could not connect to LDAP: #{detail}"
+        message = _("Could not connect to LDAP: %{detail}") % { detail: detail }
         Puppet.log_exception(detail, message)
         raise Puppet::Error, message, detail.backtrace
       end

data/lib/puppet/indirector/memory.rb

@@ -11,7 +11,7 @@ class Puppet::Indirector::Memory < Puppet::Indirector::Terminus
   end
 
   def destroy(request)
-    raise ArgumentError.new("Could not find #{request.key} to destroy") unless @instances.include?(request.key)
+    raise ArgumentError.new(_("Could not find %{request} to destroy") % { request: request.key }) unless @instances.include?(request.key)
     @instances.delete(request.key)
   end
 

data/lib/puppet/indirector/msgpack.rb

@@ -8,7 +8,7 @@ require 'puppet/util'
 class Puppet::Indirector::Msgpack < Puppet::Indirector::Terminus
   def initialize(*args)
     if ! Puppet.features.msgpack?
-      raise "MessagePack terminus not supported without msgpack library"
+      raise _("MessagePack terminus not supported without msgpack library")
     end
     super
   end
@@ -23,14 +23,14 @@ class Puppet::Indirector::Msgpack < Puppet::Indirector::Terminus
 
     Puppet::Util.replace_file(filename, 0660) {|f| f.print to_msgpack(request.instance) }
   rescue TypeError => detail
-    Puppet.log_exception(detail, "Could not save #{self.name} #{request.key}: #{detail}")
+    Puppet.log_exception(detail, _("Could not save %{name} %{request}: %{detail}") % { name: self.name, request: request.key, detail: detail })
   end
 
   def destroy(request)
     Puppet::FileSystem.unlink(path(request.key))
   rescue => detail
     unless detail.is_a? Errno::ENOENT
-      raise Puppet::Error, "Could not destroy #{self.name} #{request.key}: #{detail}", detail.backtrace
+      raise Puppet::Error, _("Could not destroy %{name} %{request}: %{detail}") % { name: self.name, request: request.key, detail: detail }, detail.backtrace
     end
     1                           # emulate success...
   end
@@ -44,8 +44,8 @@ class Puppet::Indirector::Msgpack < Puppet::Indirector::Terminus
   # Return the path to a given node's file.
   def path(name, ext = '.msgpack')
     if name =~ Puppet::Indirector::BadNameRegexp then
-      Puppet.crit("directory traversal detected in #{self.class}: #{name.inspect}")
-      raise ArgumentError, "invalid key"
+      Puppet.crit(_("directory traversal detected in %{indirection}: %{name}") % { indirection: self.class, name: name.inspect })
+      raise ArgumentError, _("invalid key")
     end
 
     base = Puppet.run_mode.master? ? Puppet[:server_datadir] : Puppet[:client_datadir]
@@ -62,13 +62,14 @@ class Puppet::Indirector::Msgpack < Puppet::Indirector::Terminus
     rescue Errno::ENOENT
       return nil
     rescue => detail
-      raise Puppet::Error, "Could not read MessagePack data for #{indirection.name} #{key}: #{detail}", detail.backtrace
+      #TRANSLATORS "MessagePack" is a program name and should not be translated
+      raise Puppet::Error, _("Could not read MessagePack data for %{indirection} %{key}: %{detail}") % { indirection: indirection.name, key: key, detail: detail }, detail.backtrace
     end
 
     begin
       return from_msgpack(msgpack)
     rescue => detail
-      raise Puppet::Error, "Could not parse MessagePack data for #{indirection.name} #{key}: #{detail}", detail.backtrace
+      raise Puppet::Error, _("Could not parse MessagePack data for %{indirection} %{key}: %{detail}") % { indirection: indirection.name, key: key, detail: detail }, detail.backtrace
     end
   end
 

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

@@ -8,7 +8,7 @@ class Puppet::Node::Exec < Puppet::Indirector::Exec
 
   def command
     command = Puppet[:external_nodes]
-    raise ArgumentError, "You must set the 'external_nodes' parameter to use the external node terminus" unless command != "none"
+    raise ArgumentError, _("You must set the 'external_nodes' parameter to use the external node terminus") unless command != _("none")
     command.split
   end
 
@@ -19,11 +19,13 @@ class Puppet::Node::Exec < Puppet::Indirector::Exec
     # Translate the output to ruby.
     result = translate(request.key, output)
 
+    facts = request.options[:facts].is_a?(Puppet::Node::Facts) ? request.options[:facts] : nil
+
     # Set the requested environment if it wasn't overridden
     # If we don't do this it gets set to the local default
     result[:environment] ||= request.environment
 
-    create_node(request.key, result)
+    create_node(request.key, result, facts)
   end
 
   private
@@ -34,7 +36,7 @@ class Puppet::Node::Exec < Puppet::Indirector::Exec
   end
 
   # Turn our outputted objects into a Puppet::Node instance.
-  def create_node(name, result)
+  def create_node(name, result, facts = nil)
     node = Puppet::Node.new(name)
     set = false
     [:parameters, :classes, :environment].each do |param|
@@ -44,7 +46,7 @@ class Puppet::Node::Exec < Puppet::Indirector::Exec
       end
     end
 
-    node.fact_merge
+    node.fact_merge(facts)
     node
   end
 
@@ -57,13 +59,13 @@ class Puppet::Node::Exec < Puppet::Indirector::Exec
       when Symbol
         hash[data[0]] = data[1]
       else
-        raise Puppet::Error, "key is a #{data[0].class}, not a string or symbol"
+        raise Puppet::Error, _("key is a %{klass}, not a string or symbol") % { klass: data[0].class }
       end
 
       hash
     end
 
   rescue => detail
-      raise Puppet::Error, "Could not load external node results for #{name}: #{detail}", detail.backtrace
+      raise Puppet::Error, _("Could not load external node results for %{name}: %{detail}") % { name: name, detail: detail }, detail.backtrace
   end
 end

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

@@ -30,13 +30,15 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
     names << request.key.sub(/\..+/, '') if request.key.include?(".") # we assume it's an fqdn
     names << "default"
 
+    facts = request.options[:facts].is_a?(Puppet::Node::Facts) ? request.options[:facts] : nil
+
     node = nil
     names.each do |name|
       next unless info = name2hash(name)
 
       merge_parent(info) if info[:parent]
       info[:environment] ||= request.environment
-      node = info2node(request.key, info)
+      node = info2node(request.key, info, facts)
       break
     end
 
@@ -165,7 +167,7 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
   # Convert any values if necessary.
   def convert(value)
     case value
-    when Integer, Fixnum, Bignum; value
+    when Integer; value
     when "true"; true
     when "false"; false
     else
@@ -175,7 +177,7 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
 
   # Find information for our parent and merge it into the current info.
   def find_and_merge_parent(parent, information)
-    parent_info = name2hash(parent) || raise(Puppet::Error.new("Could not find parent node '#{parent}'"))
+    parent_info = name2hash(parent) || raise(Puppet::Error.new(_("Could not find parent node '%{parent}'") % { parent: parent }))
     information[:classes] += parent_info[:classes]
     parent_info[:parameters].each do |param, value|
       # Specifically test for whether it's set, so false values are handled correctly.
@@ -186,12 +188,12 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
   end
 
   # Take a name and a hash, and return a node instance.
-  def info2node(name, info)
+  def info2node(name, info, facts = nil)
     node = Puppet::Node.new(name)
 
     add_to_node(node, info)
 
-    node.fact_merge
+    node.fact_merge(facts)
 
     node
   end
@@ -202,7 +204,7 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
     # Preload the parent array with the node name.
     parents = [info[:name]]
     while parent
-      raise ArgumentError, "Found loop in LDAP node parents; #{parent} appears twice" if parents.include?(parent)
+      raise ArgumentError, _("Found loop in LDAP node parents; %{parent} appears twice") % { parent: parent } if parents.include?(parent)
       parents << parent
       parent = find_and_merge_parent(parent, info)
     end
@@ -241,7 +243,7 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
 
     if values.length > 1
       raise Puppet::Error,
-        "Node entry #{entry.dn} specifies more than one parent: #{values.inspect}"
+        _("Node entry %{entry} specifies more than one parent: %{parents}") % { entry: entry.dn, parents: values.inspect }
     end
     return(values.empty? ? nil : values.shift)
   end

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

@@ -14,7 +14,8 @@ class Puppet::Node::Plain < Puppet::Indirector::Plain
   def find(request)
     node = super
     node.environment = request.environment
-    node.fact_merge
+    facts = request.options[:facts].is_a?(Puppet::Node::Facts) ? request.options[:facts] : nil
+    node.fact_merge(facts)
     node
   end
 end

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

@@ -11,7 +11,12 @@ require 'puppet/indirector/yaml'
 # @api private
 #
 class Puppet::Node::WriteOnlyYaml < Puppet::Indirector::Yaml
-  desc "Store node information as flat files, serialized using YAML,
+  def initialize
+    Puppet.warn_once('deprecations', 'Puppet::Node::WriteOnlyYaml', _('Puppet::Node::WriteOnlyYaml is deprecated and will be removed in a future release of Puppet.'))
+    super
+  end
+
+  desc "(Deprecated) Store node information as flat files, serialized using YAML,
     does not deserialize (write only)."
 
   # Overridden to always return nil. This is a write only terminus.

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

@@ -8,15 +8,6 @@ class Puppet::Node::Yaml < Puppet::Indirector::Yaml
   protected
 
   def fix(object)
-    # This looks very strange because when the object is read from disk the
-    # environment is a string and by assigning it back onto the object it gets
-    # converted to a Puppet::Node::Environment.
-    #
-    # The Puppet::Node class can't handle this itself because we are loading
-    # with just straight YAML, which doesn't give the object a chance to modify
-    # things as it is loaded. Instead YAML simply sets the instance variable
-    # and leaves it at that.
-    object.environment = object.environment
     object
   end
 end

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

@@ -36,7 +36,7 @@ class Puppet::Transaction::Report::Processor < Puppet::Indirector::Code
         newrep.extend(mod)
         newrep.process
       rescue => detail
-        Puppet.log_exception(detail, "Report #{name} failed: #{detail}")
+        Puppet.log_exception(detail, _("Report %{report} failed: %{detail}") % { report: name, detail: detail })
       end
     end
   end
@@ -52,7 +52,7 @@ class Puppet::Transaction::Report::Processor < Puppet::Indirector::Code
       if mod = Puppet::Reports.report(name)
         yield(mod)
       else
-        Puppet.warning "No report named '#{name}'"
+        Puppet.warning _("No report named '%{name}'") % { name: name }
       end
     end
   end

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

@@ -1,4 +1,5 @@
 require 'puppet/indirector/rest'
+require 'semantic_puppet'
 
 class Puppet::Transaction::Report::Rest < Puppet::Indirector::REST
   desc "Get server report over HTTP via REST."
@@ -6,6 +7,18 @@ class Puppet::Transaction::Report::Rest < Puppet::Indirector::REST
   use_port_setting(:report_port)
   use_srv_service(:report)
 
+  def handle_response(request, response)
+    if !response.is_a?(Net::HTTPSuccess)
+      server_version = response[Puppet::Network::HTTP::HEADER_PUPPET_VERSION]
+      if server_version &&
+         SemanticPuppet::Version.parse(server_version).major < Puppet::Indirector::REST::MAJOR_VERSION_JSON_DEFAULT &&
+         Puppet[:preferred_serialization_format] != 'pson'
+        format = Puppet[:preferred_serialization_format]
+        raise Puppet::Error.new(_("Server version %{version} does not accept reports in '%{format}', use `preferred_serialization_format=pson`") % {version: server_version, format: format})
+      end
+    end
+  end
+
   private
 
   def deserialize_save(content_type, body)

data/lib/puppet/indirector/request.rb

@@ -10,7 +10,7 @@ require 'puppet/util/psych_support'
 class Puppet::Indirector::Request
   include Puppet::Util::PsychSupport
 
-  attr_accessor :key, :method, :options, :instance, :node, :ip, :authenticated, :ignore_cache, :ignore_cache_save, :ignore_terminus
+  attr_accessor :key, :method, :options, :instance, :node, :ip, :authenticated, :ignore_cache, :ignore_terminus
 
   attr_accessor :server, :port, :uri, :protocol
 
@@ -18,7 +18,7 @@ class Puppet::Indirector::Request
 
   # trusted_information is specifically left out because we can't serialize it
   # and keep it "trusted"
-  OPTION_ATTRIBUTES = [:ip, :node, :authenticated, :ignore_terminus, :ignore_cache, :ignore_cache_save, :instance, :environment]
+  OPTION_ATTRIBUTES = [:ip, :node, :authenticated, :ignore_terminus, :ignore_cache, :instance, :environment]
 
   # Is this an authenticated request?
   def authenticated?
@@ -41,14 +41,6 @@ class Puppet::Indirector::Request
     end
   end
 
-  # @api private
-  # @deprecated used only internally to be removed in Puppet 5
-  def escaped_key
-    # Puppet::Network::HTTP::API::IndirectedRoutes is the only caller to escaped_key
-    # and these fragments only appear in the path part of a URI
-    Puppet::Util.uri_encode(key)
-  end
-
   # LAK:NOTE This is a messy interface to the cache, and it's only
   # used by the Configurer class.  I decided it was better to implement
   # it now and refactor later, when we have a better design, than
@@ -58,10 +50,6 @@ class Puppet::Indirector::Request
     ignore_cache
   end
 
-  def ignore_cache_save?
-    ignore_cache_save
-  end
-
   def ignore_terminus?
     ignore_terminus
   end
@@ -105,7 +93,7 @@ class Puppet::Indirector::Request
   end
 
   def model
-    raise ArgumentError, "Could not find indirection '#{indirection_name}'" unless i = indirection
+    raise ArgumentError, _("Could not find indirection '%{indirection}'") % { indirection: indirection_name } unless i = indirection
     i.model
   end
 
@@ -141,10 +129,10 @@ class Puppet::Indirector::Request
       case value
       when nil
         params
-      when true, false, String, Symbol, Fixnum, Bignum, Float
+      when true, false, String, Symbol, Integer, Float
         params << [key, value]
       else
-        raise ArgumentError, "HTTP REST queries cannot handle values of type '#{value.class}'"
+        raise ArgumentError, _("HTTP REST queries cannot handle values of type '%{klass}'") % { klass: value.class }
       end
     end
   end
@@ -199,7 +187,7 @@ class Puppet::Indirector::Request
           self.port   = srv_port
           return yield(self)
         rescue SystemCallError => e
-          Puppet.warning "Error connecting to #{srv_server}:#{srv_port}: #{e.message}"
+          Puppet.warning _("Error connecting to %{srv_server}:%{srv_port}: %{message}") % { srv_server: srv_server, srv_port: srv_port, message: e.message }
         end
       end
     end
@@ -211,7 +199,7 @@ class Puppet::Indirector::Request
       if primary_server = Puppet.settings[:server_list][0]
         bound_server = primary_server[0]
       else
-        bound_server = Puppet.settings[:server]
+        bound_server = nil
       end
     end
 
@@ -221,11 +209,11 @@ class Puppet::Indirector::Request
       if primary_server = Puppet.settings[:server_list][0]
         bound_port = primary_server[1]
       else
-        bound_port = Puppet.settings[:masterport]
+        bound_port = nil
       end
     end
-    self.server = default_server || bound_server
-    self.port   = default_port || bound_port
+    self.server = default_server || bound_server || Puppet.settings[:server]
+    self.port   = default_port || bound_port || Puppet.settings[:masterport]
 
     Puppet.debug "No more servers left, falling back to #{self.server}:#{self.port}" if Puppet.settings[:use_srv_records]
 
@@ -254,7 +242,7 @@ class Puppet::Indirector::Request
       # calling uri_encode for UTF-8 characters will % escape them and keep them UTF-8
       uri = URI.parse(Puppet::Util.uri_encode(key))
     rescue => detail
-      raise ArgumentError, "Could not understand URL #{key}: #{detail}", detail.backtrace
+      raise ArgumentError, _("Could not understand URL %{key}: %{detail}") % { key: key, detail: detail }, detail.backtrace
     end
 
     # Just short-circuit these to full paths