puppet 4.10.0 → 5.0.0

data/lib/puppet/indirector/face.rb

@@ -1,8 +1,8 @@
 require 'puppet/face'
 
 class Puppet::Indirector::Face < Puppet::Face
-  option "--terminus TERMINUS" do
-    summary "The indirector terminus to use."
+  option "--terminus _" + _("TERMINUS") do
+    summary _("The indirector terminus to use.")
     description <<-EOT
       Indirector faces expose indirected subsystems of Puppet. These
       subsystems are each able to retrieve and alter a specific type of data
@@ -46,7 +46,7 @@ class Puppet::Indirector::Face < Puppet::Face
         result = indirection.__send__(method, key, options)
       end
     rescue => detail
-      message = "Could not call '#{method}' on '#{indirection_name}': #{detail}"
+      message = _("Could not call '%{method}' on '%{indirection}': %{detail}") % { method: method, indirection: indirection_name, detail: detail }
       Puppet.log_exception(detail, message)
       raise RuntimeError, message, detail.backtrace
     end
@@ -54,8 +54,8 @@ class Puppet::Indirector::Face < Puppet::Face
     return result
   end
 
-  option "--extra HASH" do
-    summary "Extra arguments to pass to the indirection request"
+  option "--extra " + _("HASH") do
+    summary _("Extra arguments to pass to the indirection request")
     description <<-EOT
       A terminus can take additional arguments to refine the operation, which
       are passed as an arbitrary hash to the back-end.  Anything passed as
@@ -65,14 +65,14 @@ class Puppet::Indirector::Face < Puppet::Face
   end
 
   action :destroy do
-    summary "Delete an object."
-    arguments "<key>"
+    summary _("Delete an object.")
+    arguments _("<key>")
     when_invoked {|key, options| call_indirection_method :destroy, key, options[:extra] }
   end
 
   action :find do
-    summary "Retrieve an object by name."
-    arguments "[<key>]"
+    summary _("Retrieve an object by name.")
+    arguments _("[<key>]")
     when_invoked do |*args|
       # Default the key to Puppet[:certname] if none is supplied
       if args.length == 1
@@ -86,8 +86,8 @@ class Puppet::Indirector::Face < Puppet::Face
   end
 
   action :save do
-    summary "API only: create or overwrite an object."
-    arguments "<key>"
+    summary _("API only: create or overwrite an object.")
+    arguments _("<key>")
     description <<-EOT
       API only: create or overwrite an object. As the Faces framework does not
       currently accept data from STDIN, save actions cannot currently be invoked
@@ -97,14 +97,14 @@ class Puppet::Indirector::Face < Puppet::Face
   end
 
   action :search do
-    summary "Search for an object or retrieve multiple objects."
-    arguments "<query>"
+    summary _("Search for an object or retrieve multiple objects.")
+    arguments _("<query>")
     when_invoked {|key, options| call_indirection_method :search, key, options[:extra] }
   end
 
   # Print the configuration for the current terminus class
   action :info do
-    summary "Print the default terminus class for this face."
+    summary _("Print the default terminus class for this face.")
     description <<-EOT
       Prints the default terminus class for this subcommand. Note that different
       run modes may have different default termini; when in doubt, specify the
@@ -113,9 +113,9 @@ class Puppet::Indirector::Face < Puppet::Face
 
     when_invoked do |options|
       if t = indirection.terminus_class
-        "Run mode '#{Puppet.run_mode.name}': #{t}"
+        _("Run mode '%{mode}': %{terminus}") % { mode: Puppet.run_mode.name, terminus: t }
       else
-        "No default terminus class for run mode '#{Puppet.run_mode.name}'"
+        _("No default terminus class for run mode '%{mode}'") % { mode: Puppet.run_mode.name }
       end
     end
   end
@@ -137,7 +137,7 @@ class Puppet::Indirector::Face < Puppet::Face
   def indirection
     unless @indirection
       @indirection = Puppet::Indirector::Indirection.instance(indirection_name)
-      @indirection or raise "Could not find terminus for #{indirection_name}"
+      @indirection or raise _("Could not find terminus for %{indirection}") % { indirection: indirection_name }
     end
     @indirection
   end
@@ -146,7 +146,7 @@ class Puppet::Indirector::Face < Puppet::Face
     begin
       indirection.terminus_class = from
     rescue => detail
-      msg = "Could not set '#{indirection.name}' terminus to '#{from}' (#{detail}); valid terminus types are #{self.class.terminus_classes(indirection.name).join(", ") }"
+      msg = _("Could not set '%{indirection}' terminus to '%{from}' (%{detail}); valid terminus types are %{types}") % { indirection: indirection.name, from: from, detail: detail, types: self.class.terminus_classes(indirection.name).join(", ") }
       raise detail, msg, detail.backtrace
     end
   end

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

@@ -25,11 +25,11 @@ module Puppet::FileBucketFile
       if Puppet::FileSystem.exist?(contents_file) && matches(paths_file, files_original_path)
         if request.options[:diff_with]
           other_contents_file = path_for(request.options[:bucket_path], request.options[:diff_with], 'contents')
-          raise "could not find diff_with #{request.options[:diff_with]}" unless Puppet::FileSystem.exist?(other_contents_file)
-          raise "Unable to diff on this platform" unless Puppet[:diff] != ""
+          raise _("could not find diff_with %{diff}") % { diff: request.options[:diff_with] } unless Puppet::FileSystem.exist?(other_contents_file)
+          raise _("Unable to diff on this platform") unless Puppet[:diff] != ""
           return diff(Puppet::FileSystem.path_string(contents_file), Puppet::FileSystem.path_string(other_contents_file))
         else
-          Puppet.info "FileBucket read #{checksum}"
+          Puppet.info _("FileBucket read %{checksum}") % { checksum: checksum }
           model.new(Puppet::FileSystem.binread(contents_file))
         end
       else
@@ -39,7 +39,7 @@ module Puppet::FileBucketFile
 
     def list(request)
       if request.remote?
-        raise Puppet::Error, "Listing remote file buckets is not allowed"
+        raise Puppet::Error, _("Listing remote file buckets is not allowed")
       end
 
       fromdate = request.options[:fromdate] || "0:0:0 1-1-1970"
@@ -47,12 +47,12 @@ module Puppet::FileBucketFile
       begin
         to = Time.parse(todate)
       rescue ArgumentError
-        raise Puppet::Error, "Error while parsing 'todate'"
+        raise Puppet::Error, _("Error while parsing 'todate'")
       end
       begin
         from = Time.parse(fromdate)
       rescue ArgumentError
-        raise Puppet::Error, "Error while parsing 'fromdate'"
+        raise Puppet::Error, _("Error while parsing 'fromdate'")
       end
       # Setting hash's default value to [], needed by the following loop
       bucket = Hash.new {[]}
@@ -72,6 +72,7 @@ module Puppet::FileBucketFile
       # Sort the results
       bucket.each { |filename, contents|
         contents.sort_by! do |item|
+          # NOTE: Ruby 2.4 may reshuffle item order even if the keys in sequence are sorted already
           item[0]
         end
       }
@@ -193,9 +194,9 @@ module Puppet::FileBucketFile
       if path == '' # Treat "md5/<checksum>/" like "md5/<checksum>"
         path = nil
       end
-      raise ArgumentError, "Unsupported checksum type #{checksum_type.inspect}" if checksum_type != Puppet[:digest_algorithm]
+      raise ArgumentError, _("Unsupported checksum type %{checksum_type}") % { checksum_type: checksum_type.inspect } if checksum_type != Puppet[:digest_algorithm]
       expected = method(checksum_type + "_hex_length").call
-      raise "Invalid checksum #{checksum.inspect}" if checksum !~ /^[0-9a-f]{#{expected}}$/
+      raise _("Invalid checksum %{checksum}") % { checksum: checksum.inspect } if checksum !~ /^[0-9a-f]{#{expected}}$/
       [checksum, path]
     end
 

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

@@ -22,6 +22,6 @@ class Puppet::Indirector::FileMetadata::Http < Puppet::Indirector::GenericHttp
   end
 
   def search(request)
-    raise Puppet::Error, "cannot lookup multiple files"
+    raise Puppet::Error, _("cannot lookup multiple files")
   end
 end

data/lib/puppet/indirector/file_server.rb

@@ -15,7 +15,15 @@ class Puppet::Indirector::FileServer < Puppet::Indirector::Terminus
 
     # If we're not serving this mount, then access is denied.
     return false unless mount
-    mount.allowed?(request.node, request.ip)
+
+    # 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
   end
 
   # Find our key using the fileserver.
@@ -36,7 +44,7 @@ class Puppet::Indirector::FileServer < Puppet::Indirector::Terminus
     mount, relative_path = configuration.split_path(request)
 
     unless mount and paths = mount.search(relative_path, request)
-      Puppet.info "Could not find filesystem info for file '#{request.key}' in environment #{request.environment}"
+      Puppet.info _("Could not find filesystem info for file '%{request}' in environment %{env}") % { request: request.key, env: request.environment }
       return nil
     end
     path2instances(request, *paths)

data/lib/puppet/indirector/hiera.rb

@@ -4,7 +4,8 @@ require 'hiera/scope'
 class Puppet::Indirector::Hiera < Puppet::Indirector::Terminus
   def initialize(*args)
     if ! Puppet.features.hiera?
-      raise "Hiera terminus not supported without hiera library"
+      #TRANSLATORS "Hiera" is the name of a code library and should not be translated
+      raise _("Hiera terminus not supported without hiera library")
     end
     super
   end
@@ -63,7 +64,8 @@ class Puppet::Indirector::Hiera < Puppet::Indirector::Terminus
         convert_merge(strategy)
       end
     else
-      raise Puppet::DataBinding::LookupError, "Unrecognized value for request 'merge' parameter: '#{merge}'"
+      #TRANSLATORS "merge" is a parameter name and should not be translated
+      raise Puppet::DataBinding::LookupError, _("Unrecognized value for request 'merge' parameter: '%{merge}'") % { merge: merge }
     end
   end
 
@@ -74,7 +76,7 @@ class Puppet::Indirector::Hiera < Puppet::Indirector::Terminus
     if Puppet::FileSystem.exist?(hiera_config)
       config = Hiera::Config.load(hiera_config)
     else
-      Puppet.warning "Config file #{hiera_config} not found, using Hiera defaults"
+      Puppet.warning _("Config file %{hiera_config} not found, using Hiera defaults") % { hiera_config: hiera_config }
     end
 
     config[:logger] = 'puppet'

data/lib/puppet/indirector/indirection.rb

@@ -60,7 +60,8 @@ class Puppet::Indirector::Indirection
 
   # Set the time-to-live for instances created through this indirection.
   def ttl=(value)
-    raise ArgumentError, "Indirection TTL must be an integer" unless value.is_a?(Fixnum)
+    #TRANSLATORS "TTL" stands for "time to live" and refers to a duration of time
+    raise ArgumentError, _("Indirection TTL must be an integer") unless value.is_a?(Integer)
     @ttl = value
   end
 
@@ -165,7 +166,7 @@ class Puppet::Indirector::Indirection
 
     return nil unless instance = cache.find(request(:find, key, nil, options))
 
-    Puppet.info "Expiring the #{self.name} cache of #{instance.name}"
+    Puppet.info _("Expiring the %{cache} cache of %{instance}") % { cache: self.name, instance: instance.name }
 
     # Set an expiration date in the past
     instance.expiration = Time.now - 60
@@ -195,7 +196,7 @@ class Puppet::Indirector::Indirection
       if not result.nil?
         result.expiration ||= self.expiration if result.respond_to?(:expiration)
         if cache?
-          Puppet.info "Caching #{self.name} for #{request.key}"
+          Puppet.info _("Caching %{indirection} for %{request}") % { indirection: self.name, request: request.key }
           begin
             cache.save request(:save, key, result, options)
           rescue => detail
@@ -206,7 +207,7 @@ class Puppet::Indirector::Indirection
 
         filtered = result
         if terminus.respond_to?(:filter)
-          Puppet::Util::Profiler.profile("Filtered result for #{self.name} #{request.key}", [:indirector, :filter, self.name, request.key]) do
+          Puppet::Util::Profiler.profile(_("Filtered result for %{indirection} %{request}") % { indirection: self.name, request: request.key }, [:indirector, :filter, self.name, request.key]) do
             begin
               filtered = terminus.filter(result)
             rescue Puppet::Error => detail
@@ -235,14 +236,14 @@ class Puppet::Indirector::Indirection
     # See if our instance is in the cache and up to date.
     return nil unless cache? and ! request.ignore_cache? and cached = cache.find(request)
     if cached.expired?
-      Puppet.info "Not using expired #{self.name} for #{request.key} from cache; expired at #{cached.expiration}"
+      Puppet.info _("Not using expired %{indirection} for %{request} from cache; expired at %{expiration}") % { indirection: self.name, request: request.key, expiration: cached.expiration }
       return nil
     end
 
     Puppet.debug "Using cached #{self.name} for #{request.key}"
     cached
   rescue => detail
-    Puppet.log_exception(detail, "Cached #{self.name} for #{request.key} failed: #{detail}")
+    Puppet.log_exception(detail, _("Cached %{indirection} for %{request} failed: %{detail}") % { indirection: self.name, request: request.key, detail: detail })
     nil
   end
 
@@ -309,16 +310,13 @@ class Puppet::Indirector::Indirection
     end
   end
 
-  # Setup a request, pick the appropriate terminus, check the request's authorization, and return it.
+  # Pick the appropriate terminus, check the request's authorization, and return it.
+  # @param [Puppet::Indirector::Request] request instance
+  # @return [Puppet::Indirector::Terminus] terminus instance (usually a subclass
+  #   of Puppet::Indirector::Terminus) for this request
   def prepare(request)
     # Pick our terminus.
-    if respond_to?(:select_terminus)
-      unless terminus_name = select_terminus(request)
-        raise ArgumentError, "Could not determine appropriate terminus for #{request.description}"
-      end
-    else
-      terminus_name = terminus_class
-    end
+    terminus_name = terminus_class
 
     dest_terminus = terminus(terminus_name)
     check_authorization(request, dest_terminus)
@@ -331,7 +329,7 @@ class Puppet::Indirector::Indirection
   def make_terminus(terminus_class)
     # Load our terminus class.
     unless klass = Puppet::Indirector::Terminus.terminus_class(self.name, terminus_class)
-      raise ArgumentError, "Could not find terminus #{terminus_class} for indirection #{self.name}"
+      raise ArgumentError, _("Could not find terminus %{terminus_class} for indirection %{indirection}") % { terminus_class: terminus_class, indirection: self.name }
     end
     klass.new
   end

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