puppet 4.10.12 → 5.0.0

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

@@ -3,4 +3,22 @@ require 'puppet/indirector/json'
 
 class Puppet::Resource::Catalog::Json < Puppet::Indirector::JSON
   desc "Store catalogs as flat files, serialized using JSON."
+
+  def from_json(text)
+    utf8 = text.force_encoding(Encoding::UTF_8)
+
+    if utf8.valid_encoding?
+      model.convert_from('json', utf8)
+    else
+      Puppet.info(_("Unable to deserialize catalog from json, retrying with pson"))
+      model.convert_from('pson', text.force_encoding(Encoding::BINARY))
+    end
+  end
+
+  def to_json(object)
+    object.render('json')
+  rescue Puppet::Network::FormatHandler::FormatError
+    Puppet.info(_("Unable to serialize catalog to json, retrying with pson"))
+    object.render('pson').force_encoding(Encoding::BINARY)
+  end
 end

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

@@ -13,7 +13,7 @@ CA to 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/certificate_request/ca.rb

@@ -9,14 +9,14 @@ class Puppet::SSL::CertificateRequest::Ca < Puppet::Indirector::SslFile
   def save(request)
     if host = Puppet::SSL::Host.indirection.find(request.key)
       if Puppet[:allow_duplicate_certs]
-        Puppet.notice "#{request.key} already has a #{host.state} certificate; new certificate will overwrite it"
+        Puppet.notice _("%{request} already has a %{host} certificate; new certificate will overwrite it") % { request: request.key, host: host.state }
       else
-        raise "#{request.key} already has a #{host.state} certificate; ignoring certificate request"
+        raise _("%{request} already has a %{host} certificate; ignoring certificate request") % { request: request.key, host: host.state }
       end
     end
 
     result = super
-    Puppet.notice "#{request.key} has a waiting certificate request"
+    Puppet.notice _("%{request} has a waiting certificate request") % { request: request.key }
     result
   end
 end

data/lib/puppet/indirector/certificate_request/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/certificate_revocation_list/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/certificate_status/file.rb

@@ -12,7 +12,7 @@ class Puppet::Indirector::CertificateStatus::File < Puppet::Indirector::Code
     on the CA."
 
   def ca
-    raise ArgumentError, "This process is not configured as a certificate authority" unless Puppet::SSL::CertificateAuthority.ca?
+    raise ArgumentError, _("This process is not configured as a certificate authority") unless Puppet::SSL::CertificateAuthority.ca?
     Puppet::SSL::CertificateAuthority.new
   end
 
@@ -28,21 +28,21 @@ class Puppet::Indirector::CertificateStatus::File < Puppet::Indirector::Code
       end
     end
 
-    return "Nothing was deleted" if deleted.empty?
-    "Deleted for #{request.key}: #{deleted.join(", ")}"
+    return _("Nothing was deleted") if deleted.empty?
+    _("Deleted for %{request}: %{deleted}") % { request: request.key, deleted: deleted.join(", ") }
   end
 
   def save(request)
     if request.instance.desired_state == "signed"
       certificate_request = Puppet::SSL::CertificateRequest.indirection.find(request.key)
-      raise Puppet::Error, "Cannot sign for host #{request.key} without a certificate request" unless certificate_request
+      raise Puppet::Error, _("Cannot sign for host %{request} without a certificate request") % { request: request.key } unless certificate_request
       ca.sign(request.key)
     elsif request.instance.desired_state == "revoked"
       certificate = Puppet::SSL::Certificate.indirection.find(request.key)
-      raise Puppet::Error, "Cannot revoke host #{request.key} because has it doesn't have a signed certificate" unless certificate
+      raise Puppet::Error, _("Cannot revoke host %{request} because has it doesn't have a signed certificate") % { request: request.key } unless certificate
       ca.revoke(request.key)
     else
-      raise Puppet::Error, "State #{request.instance.desired_state} invalid; Must specify desired state of 'signed' or 'revoked' for host #{request.key}"
+      raise Puppet::Error, _("State %{state} invalid; Must specify desired state of 'signed' or 'revoked' for host %{request}") % { state: request.instance.desired_state, request: request.key }
     end
 
   end

data/lib/puppet/indirector/exec.rb

@@ -11,14 +11,14 @@ class Puppet::Indirector::Exec < Puppet::Indirector::Terminus
     raise Puppet::DevError, "Exec commands must be an array" unless external_command.is_a?(Array)
 
     # Make sure it's fully qualified.
-    raise ArgumentError, "You must set the exec parameter to a fully qualified command" unless Puppet::Util.absolute_path?(external_command[0])
+    raise ArgumentError, _("You must set the exec parameter to a fully qualified command") unless Puppet::Util.absolute_path?(external_command[0])
 
     # Add our name to it.
     external_command << name
     begin
       output = execute(external_command, :failonfail => true, :combine => false)
     rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error, "Failed to find #{name} via exec: #{detail}", detail.backtrace
+      raise Puppet::Error, _("Failed to find %{name} via exec: %{detail}") % { name: name, detail: detail }, detail.backtrace
     end
 
     if output =~ /\A\s*\Z/ # all whitespace

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
 
@@ -218,7 +219,7 @@ module Puppet::FileBucketFile
     #   and content as that in the bucket_file
     # @api private
     def verify_identical_file(contents_file, bucket_file)
-      (bucket_file.to_binary.bytesize == Puppet::FileSystem.size(contents_file)) &&
+      (bucket_file.size == Puppet::FileSystem.size(contents_file)) &&
         (bucket_file.stream() {|s| Puppet::FileSystem.compare_stream(contents_file, s) })
     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
 
@@ -161,11 +162,11 @@ class Puppet::Indirector::Indirection
   def expire(key, options={})
     request = request(:expire, key, nil, options)
 
-    return nil unless cache? && !request.ignore_cache_save?
+    return nil unless cache?
 
     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
@@ -194,8 +195,8 @@ class Puppet::Indirector::Indirection
       result = terminus.find(request)
       if not result.nil?
         result.expiration ||= self.expiration if result.respond_to?(:expiration)
-        if cache? && !request.ignore_cache_save?
-          Puppet.info "Caching #{self.name} for #{request.key}"
+        if cache?
+          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
 
@@ -285,7 +286,7 @@ class Puppet::Indirector::Indirection
     result = terminus.save(request)
 
     # If caching is enabled, save our document there
-    cache.save(request) if cache? && !request.ignore_cache_save?
+    cache.save(request) if cache?
 
     result
   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