puppet 4.10.4 → 4.10.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2e3344150cb64ddf6fd3ccfa7da942b6b993abff
+  data.tar.gz: ed957f24eef19e4e9bbe540d444b12cd2d2a5e16
+SHA512:
+  metadata.gz: 5d49f0c0f6a79566f905a2d98080bf65e6857629d78c3aba8a8219573e420f00c933e57126c052aea8257e03094e39264028b34862321e5b4fd080bcdf9e7981
+  data.tar.gz: caaf06d2b18158bbc63fd41ed54b22620dda2996f73c2af0ea20765050db58c5036c3f0e9edd870b28a4fe0a206685946665da12105b6b98dece6c738a921dd8

data/lib/puppet/application/lookup.rb

@@ -243,7 +243,7 @@ Copyright (c) 2015 Puppet Inc., LLC Licensed under the Apache 2.0 License
     #  raise "No node was given via the '--node' flag for the scope of the lookup.\n#{RUN_HELP}"
     #end
 
-    if (options[:sort_merge_arrays] || options[:merge_hash_arrays] || options[:prefix]) && options[:merge] != 'deep'
+    if (options[:sort_merged_arrays] || options[:merge_hash_arrays] || options[:prefix]) && options[:merge] != 'deep'
       raise "The options #{DEEP_MERGE_OPTIONS} are only available with '--merge deep'\n#{RUN_HELP}"
     end
 
@@ -260,7 +260,7 @@ Copyright (c) 2015 Puppet Inc., LLC Licensed under the Apache 2.0 License
 
       if merge == 'deep'
         merge_options = {'strategy' => 'deep',
-          'sort_merge_arrays' => !options[:sort_merge_arrays].nil?,
+          'sort_merged_arrays' => !options[:sort_merged_arrays].nil?,
           'merge_hash_arrays' => !options[:merge_hash_arrays].nil?}
 
         if options[:prefix]

data/lib/puppet/configurer/fact_handler.rb

@@ -32,6 +32,6 @@ module Puppet::Configurer::FactHandler
 
     text = facts.render(:pson)
 
-    {:facts_format => :pson, :facts => CGI.escape(text)}
+    {:facts_format => :pson, :facts => Puppet::Util.uri_query_encode(text)}
   end
 end

data/lib/puppet/face/epp.rb

@@ -316,34 +316,36 @@ Puppet::Face.define(:epp, '0.0.1') do
       options[:header] = options[:header].nil? ? true : options[:header]
 
       compiler = create_compiler(options)
-
-      # Print to a buffer since the face needs to return the resulting string
-      # and the face API is "all or nothing"
-      #
-      buffer = StringIO.new
-      status = true
-      if options[:e]
-        buffer.print render_inline(options[:e], compiler, options)
-      elsif args.empty?
-        if ! STDIN.tty?
-          buffer.print render_inline(STDIN.read, compiler, options)
+      compiler.with_context_overrides('For rendering epp') do
+
+        # Print to a buffer since the face needs to return the resulting string
+        # and the face API is "all or nothing"
+        #
+        buffer = StringIO.new
+        status = true
+        if options[:e]
+          buffer.print render_inline(options[:e], compiler, options)
+        elsif args.empty?
+          if ! STDIN.tty?
+            buffer.print render_inline(STDIN.read, compiler, options)
+          else
+            raise Puppet::Error, "No input to process given on command line or stdin"
+          end
         else
-          raise Puppet::Error, "No input to process given on command line or stdin"
-        end
-      else
-        show_filename = args.count > 1
-        file_nbr = 0
-        args.each do |file|
-          begin
-            buffer.print render_file(file, compiler, options, show_filename, file_nbr += 1)
-          rescue Puppet::ParseError => detail
-            Puppet.err(detail.message)
-            status = false
+          show_filename = args.count > 1
+          file_nbr = 0
+          args.each do |file|
+            begin
+              buffer.print render_file(file, compiler, options, show_filename, file_nbr += 1)
+            rescue Puppet::ParseError => detail
+              Puppet.err(detail.message)
+              status = false
+            end
           end
         end
+        raise Puppet::Error, "error while rendering epp" unless status
+        buffer.string
       end
-      raise Puppet::Error, "error while rendering epp" unless status
-      buffer.string
     end
   end
 

data/lib/puppet/file_serving/metadata.rb

@@ -31,14 +31,14 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
 
   def content_uri=(path)
     begin
-      uri = URI.parse(URI.escape(path))
+      uri = URI.parse(Puppet::Util.uri_encode(path))
     rescue URI::InvalidURIError => detail
       raise(ArgumentError, "Could not understand URI #{path}: #{detail}")
     end
     raise(ArgumentError, "Cannot use opaque URLs '#{path}'") unless uri.hierarchical?
     raise(ArgumentError, "Must use URLs of type puppet as content URI") if uri.scheme != "puppet"
 
-    @content_uri = path
+    @content_uri = path.encode(Encoding::UTF_8)
   end
 
   class MetaStat

data/lib/puppet/forge.rb

@@ -53,12 +53,13 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
   #   bad HTTP response
   def search(term)
     matches = []
-    uri = "/v3/modules?query=#{URI.escape(term)}"
+    uri = "/v3/modules?query=#{term}"
     if Puppet[:module_groups]
-      uri += "&module_groups=#{Puppet[:module_groups]}"
+      uri += "&module_groups=#{Puppet[:module_groups].gsub('+', ' ')}"
     end
 
     while uri
+      # make_http_request URI encodes parameters
       response = make_http_request(uri)
 
       if response.code == '200'
@@ -90,11 +91,12 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
     name = input.tr('/', '-')
     uri = "/v3/releases?module=#{name}"
     if Puppet[:module_groups]
-      uri += "&module_groups=#{Puppet[:module_groups]}"
+      uri += "&module_groups=#{Puppet[:module_groups].gsub('+', ' ')}"
     end
     releases = []
 
     while uri
+      # make_http_request URI encodes parameters
       response = make_http_request(uri)
 
       if response.code == '200'

data/lib/puppet/forge/cache.rb

@@ -24,6 +24,7 @@ class Puppet::Forge
         uri = url.is_a?(::URI) ? url : ::URI.parse(url)
         unless cached_file.file?
           if uri.scheme == 'file'
+            # CGI.unescape butchers Uris that are escaped properly
             FileUtils.cp(URI.unescape(uri.path), cached_file)
           else
             # TODO: Handle HTTPS; probably should use repository.contact

data/lib/puppet/forge/repository.rb

@@ -57,6 +57,7 @@ class Puppet::Forge
       end
     end
 
+    # responsible for properly encoding a URI
     def get_request_object(path)
       headers = {
         "User-Agent" => user_agent,
@@ -72,7 +73,7 @@ class Puppet::Forge
         headers = headers.merge({"Authorization" => forge_authorization})
       end
 
-      request = Net::HTTP::Get.new(URI.escape(path), headers)
+      request = Net::HTTP::Get.new(Puppet::Util.uri_encode(path), headers)
 
       unless @uri.user.nil? || @uri.password.nil? || forge_authorization
         request.basic_auth(@uri.user, @uri.password)

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

@@ -26,7 +26,7 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
       if text_facts.is_a?(Puppet::Node::Facts)
         facts = text_facts
       elsif format == 'pson'
-        # We unescape here because the corresponding code in Puppet::Configurer::FactHandler escapes
+        # We unescape here because the corresponding code in Puppet::Configurer::FactHandler encodes with Puppet::Util.uri_query_encode
         facts = Puppet::Node::Facts.convert_from('pson', CGI.unescape(text_facts))
       else
         raise ArgumentError, "Unsupported facts format"
@@ -105,7 +105,7 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
     # This does that, while preserving any user-specified server or port.
     source_path = Pathname.new(metadata.full_path)
     path = source_path.relative_path_from(environment_path).to_s
-    source_as_uri = URI.parse(URI.escape(source))
+    source_as_uri = URI.parse(Puppet::Util.uri_encode(source))
     server = source_as_uri.host
     port = ":#{source_as_uri.port}" if source_as_uri.port
     return "puppet://#{server}#{port}/#{path}"
@@ -130,7 +130,8 @@ class Puppet::Resource::Catalog::Compiler < Puppet::Indirector::Code
   # for the 'modules' mount and the resolved path is of the form:
   #   $codedir/environments/$environment/*/*/files/**
   def inlineable_metadata?(metadata, source, environment_path)
-    source_as_uri = URI.parse(URI.escape(source))
+    source_as_uri = URI.parse(Puppet::Util.uri_encode(source))
+
     location = Puppet::Module::FILETYPES['files']
 
     !!(source_as_uri.path =~ /^\/modules\// &&

data/lib/puppet/indirector/request.rb

@@ -41,8 +41,12 @@ class Puppet::Indirector::Request
     end
   end
 
+  # @api private
+  # @deprecated used only internally to be removed in Puppet 5
   def escaped_key
-    URI.escape(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
@@ -143,7 +147,7 @@ class Puppet::Indirector::Request
 
   def encode_params(params)
     params.collect do |key, value|
-      "#{key}=#{CGI.escape(value.to_s)}"
+      "#{key}=#{Puppet::Util.uri_query_encode(value.to_s)}"
     end.join("&")
   end
 
@@ -243,9 +247,8 @@ class Puppet::Indirector::Request
   def set_uri_key(key)
     @uri = key
     begin
-      # calling URI.escape for UTF-8 characters will % escape them
-      # and the resulting string components of the URI are now ASCII
-      uri = URI.parse(URI.escape(key))
+      # 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
     end
@@ -274,8 +277,6 @@ class Puppet::Indirector::Request
       @protocol = uri.scheme
     end
 
-    # The unescaped bytes are correct but in ASCII and must be treated
-    # as UTF-8 for the sake of performing string comparisons later
-    @key = URI.unescape(uri.path.sub(/^\//, '')).force_encoding(Encoding::UTF_8)
+    @key = URI.unescape(uri.path.sub(/^\//, ''))
   end
 end

data/lib/puppet/module.rb

@@ -68,6 +68,17 @@ class Puppet::Module
     load_metadata
 
     @absolute_path_to_manifests = Puppet::FileSystem::PathPattern.absolute(manifests)
+
+    # i18n initialization for modules
+    if Puppet::GETTEXT_AVAILABLE
+      begin
+        initialize_i18n
+      rescue Exception => e
+        Puppet.warning _("GettextSetup initialization for %{module_name} failed with: %{error_message}") % { module_name: name, error_message: e.message }
+      end
+    else
+      Puppet.warning _("GettextSetup is not available, skipping GettextSetup initialization for %{module_name}.") % { module_name: name }
+    end
   end
 
   # @deprecated The puppetversion module metadata field is no longer used.
@@ -353,8 +364,27 @@ class Puppet::Module
     self.environment == other.environment
   end
 
+  def initialize_i18n
+    module_name = @forge_name.gsub("/","-") if @forge_name
+    return if module_name.nil? || i18n_initialized?(module_name)
+
+    locales_path = File.absolute_path('locales', path)
+
+    begin
+      GettextSetup.initialize(locales_path)
+      Puppet.debug "#{module_name} initialized for i18n: #{GettextSetup.translation_repositories[module_name]}"
+    rescue
+      config_path = File.absolute_path('config.yaml', locales_path)
+      Puppet.debug "Could not find locales configuration file for #{module_name} at #{config_path}. Skipping i18n initialization."
+    end
+  end
+
   private
 
+  def i18n_initialized?(module_name)
+    GettextSetup.translation_repositories.has_key? module_name
+  end
+
   def wanted_manifests_from(pattern)
     begin
       extended = File.extname(pattern).empty? ? "#{pattern}.pp" : pattern

data/lib/puppet/network/http/rack/rest.rb

@@ -87,7 +87,8 @@ class Puppet::Network::HTTP::RackREST
     # in the indirector / HTTP layer which consumes this path, however, assumes
     # that it has already been unescaped, so it is unescaped here.
     if request.path
-      URI.unescape(request.path)
+      # don't use CGI.unescape which mangles space handling
+      URI.unescape(request.path.encode(Encoding::UTF_8))
     end
   end
 

data/lib/puppet/parser/compiler.rb

@@ -156,6 +156,10 @@ class Puppet::Parser::Compiler
   # Return a list of all of the defined classes.
   def_delegator :@catalog, :classes, :classlist
 
+  def with_context_overrides(description = '', &block)
+    Puppet.override( @context_overrides , description, &block)
+  end
+
   # Compiler our catalog.  This mostly revolves around finding and evaluating classes.
   # This is the main entry into our catalog.
   def compile

data/lib/puppet/parser/functions/assert_type.rb

@@ -56,5 +56,5 @@ For more information about data types, see the
 - Since 4.0.0
 DOC
 ) do |args|
-  Error.is4x('assert_type')
+  Puppet::Parser::Functions::Error.is4x('assert_type')
 end

data/lib/puppet/parser/functions/binary_file.rb

@@ -20,5 +20,5 @@ To search for the existence of files, use the `find_file()` function.
 - since 4.8.0
 DOC
 ) do |args|
-  Error.is4x('binary_file')
+  Puppet::Parser::Functions::Error.is4x('binary_file')
 end

data/lib/puppet/parser/functions/break.rb

@@ -35,5 +35,5 @@ Would notice the value `[10]`
 * Since 4.8.0
 DOC
 ) do |args|
-  Error.is4x('break')
+  Puppet::Parser::Functions::Error.is4x('break')
 end

data/lib/puppet/parser/functions/defined.rb

@@ -103,5 +103,5 @@ defined('$tmp_file2')
 - Since 4.0.0 includes all future parser features
 DOC
 ) do |vals|
-  Error.is4x('defined')
+  Puppet::Parser::Functions::Error.is4x('defined')
 end

data/lib/puppet/parser/functions/dig.rb

@@ -25,5 +25,5 @@ Would notice the value 100.
 * Since 4.5.0
 DOC
 ) do |args|
-  Error.is4x('dig')
+  Puppet::Parser::Functions::Error.is4x('dig')
 end

data/lib/puppet/parser/functions/each.rb

@@ -100,5 +100,5 @@ documentation.
 - Since 4.0.0
 DOC
 ) do |args|
-  Error.is4x('each')
+  Puppet::Parser::Functions::Error.is4x('each')
 end

data/lib/puppet/parser/functions/epp.rb

@@ -32,5 +32,5 @@ function fails to pass any required parameter.
 
 - Since 4.0.0") do |args|
 
-  Error.is4x('epp')
+  Puppet::Parser::Functions::Error.is4x('epp')
 end

data/lib/puppet/parser/functions/filter.rb

@@ -74,5 +74,5 @@ $filtered_data = $data.filter |$keys, $values| { $keys =~ /berry$/ and $values <
 - Since 4.0.0
 DOC
 ) do |args|
-  Error.is4x('filter')
+  Puppet::Parser::Functions::Error.is4x('filter')
 end

data/lib/puppet/parser/functions/find_file.rb

@@ -23,6 +23,6 @@ The function returns `undef` if none of the given paths were found
 - since 4.8.0
 DOC
 ) do |args|
-  Error.is4x('find_file')
+  Puppet::Parser::Functions::Error.is4x('find_file')
 end
 

data/lib/puppet/parser/functions/inline_epp.rb

@@ -47,5 +47,5 @@ END
 - Since 3.5
 - Requires [future parser](/puppet/3.8/reference/experiments_future.html) in Puppet 3.5 to 3.8") do |arguments|
 
-  Error.is4x('inline_epp')
+  Puppet::Parser::Functions::Error.is4x('inline_epp')
 end

data/lib/puppet/parser/functions/lest.rb

@@ -45,5 +45,5 @@ Would notice the value `20`
 * Since 4.5.0
 DOC
 ) do |args|
-  Error.is4x('lest')
+  Puppet::Parser::Functions::Error.is4x('lest')
 end

data/lib/puppet/parser/functions/map.rb

@@ -72,5 +72,5 @@ $transformed_data = $data.map |$key,$value| { $value }
 - Since 4.0.0
 DOC
 ) do |args|
-  Error.is4x('map')
+  Puppet::Parser::Functions::Error.is4x('map')
 end

data/lib/puppet/parser/functions/match.rb

@@ -39,5 +39,5 @@ $matches = ["abc123","def456"].match(/([a-z]+)([1-9]+)/)
 - Since 4.0.0
 DOC
 ) do |args|
-  Error.is4x('match')
+  Puppet::Parser::Functions::Error.is4x('match')
 end

data/lib/puppet/parser/functions/new.rb

@@ -934,6 +934,6 @@ $b = binary_file('mymodule/mypicture.jpg')
 
 DOC
 ) do |args|
-  Error.is4x('new')
+  Puppet::Parser::Functions::Error.is4x('new')
 end
 

data/lib/puppet/parser/functions/next.rb

@@ -34,5 +34,5 @@ Would notice the value `[10, 200, 30]`
 * Since 4.8.0
 DOC
 ) do |args|
-  Error.is4x('next')
+  Puppet::Parser::Functions::Error.is4x('next')
 end

data/lib/puppet/parser/functions/reduce.rb

@@ -102,5 +102,5 @@ $combine = $data.reduce( [d, 4] ) |$memo, $value| {
 - Since 4.0.0
 DOC
 ) do |args|
-  Error.is4x('reduce')
+  Puppet::Parser::Functions::Error.is4x('reduce')
 end

data/lib/puppet/parser/functions/return.rb

@@ -67,5 +67,5 @@ Note that the returned value is ignored if used in a class or user defined type.
 * Since 4.8.0
 DOC
 ) do |args|
-  Error.is4x('return')
+  Puppet::Parser::Functions::Error.is4x('return')
 end