puppet 4.5.3-universal-darwin → 4.6.1-universal-darwin

data/lib/puppet/info_service/class_information_service.rb

@@ -36,8 +36,7 @@ class Puppet::InfoService::ClassInformationService
   private
 
   def type_parser
-    # Safe to cache this as it would otherwise constantly build up the visitor cache
-    @@type_parser ||= Puppet::Pops::Types::TypeParser.new
+    Puppet::Pops::Types::TypeParser.singleton
   end
 
   def literal_evaluator

data/lib/puppet/interface/documentation.rb

@@ -29,7 +29,7 @@ class Puppet::Interface
       # We use module_eval, which I don't like much, because we can't have an
       # argument to a block with a default value in Ruby 1.8, and I don't like
       # the side-effects (eg: no argument count validation) of using blocks
-      # without as metheds.  When we are 1.9 only (hah!) you can totally
+      # without as methods.  When we are 1.9 only (hah!) you can totally
       # replace this with some up-and-up define_method. --daniel 2011-04-29
       module_eval(<<-EOT, __FILE__, __LINE__ + 1)
         def #{name}(value = nil)

data/lib/puppet/loaders.rb

@@ -3,6 +3,7 @@ module Puppet
     require 'puppet/pops/loaders'
 
     module Loader
+      require 'puppet/pops/loader/typed_name'
       require 'puppet/pops/loader/loader'
       require 'puppet/pops/loader/base_loader'
       require 'puppet/pops/loader/gem_support'
@@ -14,6 +15,7 @@ module Puppet
       require 'puppet/pops/loader/ruby_function_instantiator'
       require 'puppet/pops/loader/puppet_function_instantiator'
       require 'puppet/pops/loader/type_definition_instantiator'
+      require 'puppet/pops/loader/puppet_resource_type_impl_instantiator'
       require 'puppet/pops/loader/loader_paths'
       require 'puppet/pops/loader/simple_environment_loader'
       require 'puppet/pops/loader/predefined_loader'

data/lib/puppet/metatype/manager.rb

@@ -183,13 +183,13 @@ module Manager
   # Defaults to an instance of {Puppet::Util::Autoload} if no other auto loader has been set.
   # @return [Puppet::Util::Autoload] the loader to use.
   # @api private
-  def typeloader
-    unless defined?(@typeloader)
-      @typeloader = Puppet::Util::Autoload.new(self, "puppet/type")
-    end
-
-    @typeloader
+def typeloader
+  unless defined?(@typeloader)
+    @typeloader = Puppet::Util::Autoload.new(self, "puppet/type")
   end
+
+  @typeloader
+end
 end
 end
 

data/lib/puppet/module.rb

@@ -10,6 +10,7 @@ class Puppet::Module
   class UnsupportedPlatform < Error; end
   class IncompatiblePlatform < Error; end
   class MissingMetadata < Error; end
+  class FaultyMetadata < Error; end
   class InvalidName < Error; end
   class InvalidFilePattern < Error; end
 
@@ -92,7 +93,13 @@ class Puppet::Module
     begin
       metadata =  JSON.parse(File.read(metadata_file, :encoding => 'utf-8'))
     rescue JSON::JSONError => e
-      Puppet.debug("#{name} has an invalid and unparsable metadata.json file.  The parse error: #{e.message}")
+      msg = "#{name} has an invalid and unparsable metadata.json file. The parse error: #{e.message}"
+      case Puppet[:strict]
+      when :off, :warning
+        Puppet.warning(msg)
+      when :error
+        raise FaultyMetadata, msg
+      end
       return false
     end
 

data/lib/puppet/module_tool.rb

@@ -149,7 +149,7 @@ module Puppet
         options[:environment]
       elsif options[:environment]
         # This use of looking up an environment is correct since it honours
-        # a reguest to get a particular environment via environment name.
+        # a request to get a particular environment via environment name.
         Puppet.lookup(:environments).get!(options[:environment])
       else
         Puppet.lookup(:current_environment)
@@ -162,7 +162,7 @@ module Puppet
     # @param where [String] a description of the thing we're parsing the
     #        dependency expression for
     # @param dep [Hash] the dependency description to parse
-    # @return [Array(String, Semantic::VersionRange, String)] an tuple of the
+    # @return [Array(String, Semantic::VersionRange, String)] a tuple of the
     #         dependent module's name, the version range dependency, and the
     #         unparsed range expression.
     def self.parse_module_dependency(where, dep)

data/lib/puppet/module_tool/checksums.rb

@@ -5,7 +5,7 @@ module Puppet::ModuleTool
 
   # = Checksums
   #
-  # This class proides methods for generating checksums for data and adding
+  # This class provides methods for generating checksums for data and adding
   # them to +Metadata+.
   class Checksums
     include Puppet::Network::FormatSupport

data/lib/puppet/module_tool/errors/installer.rb

@@ -81,12 +81,12 @@ Could not install module '#{@requested_module}' (#{@requested_version})
     def initialize(options)
       @entry_path = options[:entry_path]
       @directory  = options[:directory]
-      super "Attempt to install file into #{@entry_path.inspect} under #{@directory.inspect}"
+      super "Attempt to install file with an invalid path into #{@entry_path.inspect} under #{@directory.inspect}"
     end
 
     def multiline
       <<-MSG.strip
-Could not install package
+Could not install package with an invalid path.
   Package attempted to install file into
   #{@entry_path.inspect} under #{@directory.inspect}.
       MSG

data/lib/puppet/module_tool/metadata.rb

@@ -79,7 +79,7 @@ module Puppet::ModuleTool
 
     # Provides an accessor for the now defunct 'description' property.  This
     # addresses a regression in Puppet 3.6.x where previously valid templates
-    # refering to the 'description' property were broken.
+    # referring to the 'description' property were broken.
     # @deprecated
     def description
       @data['description']

data/lib/puppet/network/http/api/indirected_routes.rb

@@ -47,10 +47,6 @@ class Puppet::Network::HTTP::API::IndirectedRoutes
     Puppet.override(:trusted_information => trusted) do
       send("do_#{method}", indirection, key, params, request, response)
     end
-  rescue Puppet::Network::HTTP::Error::HTTPError => e
-    return do_http_control_exception(response, e)
-  rescue StandardError => e
-    return do_exception(response, e)
   end
 
   def uri2indirection(http_method, uri, params)
@@ -60,7 +56,8 @@ class Puppet::Network::HTTP::API::IndirectedRoutes
     environment = params.delete(:environment)
 
     if indirection_name !~ /^\w+$/
-      raise ArgumentError, "The indirection name must be purely alphanumeric, not '#{indirection_name}'"
+      raise Puppet::Network::HTTP::Error::HTTPBadRequestError.new(
+        "The indirection name must be purely alphanumeric, not '#{indirection_name}'")
     end
 
     # this also depluralizes the indirection_name if it is a search
@@ -69,21 +66,25 @@ class Puppet::Network::HTTP::API::IndirectedRoutes
     # check whether this indirection matches the prefix and version in the
     # request
     if url_prefix != IndirectionType.url_prefix_for(indirection_name)
-      raise ArgumentError, "Indirection '#{indirection_name}' does not match url prefix '#{url_prefix}'"
+      raise Puppet::Network::HTTP::Error::HTTPBadRequestError.new(
+        "Indirection '#{indirection_name}' does not match url prefix '#{url_prefix}'")
     end
 
     indirection = Puppet::Indirector::Indirection.instance(indirection_name.to_sym)
     if !indirection
       raise Puppet::Network::HTTP::Error::HTTPNotFoundError.new(
-        "Could not find indirection '#{indirection_name}'", Puppet::Network::HTTP::Issues::HANDLER_NOT_FOUND)
+        "Could not find indirection '#{indirection_name}'",
+        Puppet::Network::HTTP::Issues::HANDLER_NOT_FOUND)
     end
 
     if !environment
-      raise ArgumentError, "An environment parameter must be specified"
+      raise Puppet::Network::HTTP::Error::HTTPBadRequestError.new(
+        "An environment parameter must be specified")
     end
 
     if ! Puppet::Node::Environment.valid_name?(environment)
-      raise ArgumentError, "The environment must be purely alphanumeric, not '#{environment}'"
+      raise Puppet::Network::HTTP::Error::HTTPBadRequestError.new(
+        "The environment must be purely alphanumeric, not '#{environment}'")
     end
 
     configured_environment = Puppet.lookup(:environments).get(environment)
@@ -92,16 +93,22 @@ class Puppet::Network::HTTP::API::IndirectedRoutes
       params[:environment] = configured_environment
     end
 
-    check_authorization(method, "#{url_prefix}/#{indirection_name}/#{key}", params)
+    begin
+      check_authorization(method, "#{url_prefix}/#{indirection_name}/#{key}", params)
+    rescue Puppet::Network::AuthorizationError => e
+      raise Puppet::Network::HTTP::Error::HTTPNotAuthorizedError.new(e.message)
+    end
 
     if configured_environment.nil?
-      raise ArgumentError, "Could not find environment '#{environment}'"
+      raise Puppet::Network::HTTP::Error::HTTPNotFoundError.new(
+        "Could not find environment '#{environment}'")
     end
 
     params.delete(:bucket_path)
 
     if key == "" or key.nil?
-      raise ArgumentError, "No request key specified in #{uri}"
+      raise Puppet::Network::HTTP::Error::HTTPBadRequestError.new(
+        "No request key specified in #{uri}")
     end
 
     [indirection, method, key, params]
@@ -109,24 +116,6 @@ class Puppet::Network::HTTP::API::IndirectedRoutes
 
   private
 
-  def do_http_control_exception(response, exception)
-    msg = exception.message
-    Puppet.info(msg)
-    response.respond_with(exception.status, "text/plain", msg)
-  end
-
-  def do_exception(response, exception, status=400)
-    if exception.is_a?(Puppet::Network::AuthorizationError)
-      # make sure we return the correct status code
-      # for authorization issues
-      status = 403 if status == 400
-    end
-
-    Puppet.log_exception(exception)
-
-    response.respond_with(status, "text/plain", exception.to_s)
-  end
-
   # Execute our find.
   def do_find(indirection, key, params, request, response)
     unless result = indirection.find(key, params)
@@ -207,10 +196,12 @@ class Puppet::Network::HTTP::API::IndirectedRoutes
   end
 
   def indirection_method(http_method, indirection)
-    raise ArgumentError, "No support for http method #{http_method}" unless METHOD_MAP[http_method]
+    raise Puppet::Network::HTTP::Error::HTTPMethodNotAllowedError.new(
+      "No support for http method #{http_method}") unless METHOD_MAP[http_method]
 
     unless method = METHOD_MAP[http_method][plurality(indirection)]
-      raise ArgumentError, "No support for plurality #{plurality(indirection)} for #{http_method} operations"
+      raise Puppet::Network::HTTP::Error::HTTPBadRequestError.new(
+        "No support for plurality #{plurality(indirection)} for #{http_method} operations")
     end
 
     method

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

@@ -103,7 +103,21 @@ class Puppet::Network::HTTP::RackREST
     # NOTE: The SSL_CLIENT_CERT environment variable will be the empty string
     # when Puppet agent nodes have not yet obtained a signed certificate.
     if cert.nil? || cert.empty?
-      nil
+      # When running with unicorn, the SSL_CLIENT_CERT variable is not available
+      # in the environment, therefore we have to pass a header: 'X-SSL-Client-Cert'
+      cert = request.env['HTTP_X_SSL_CLIENT_CERT']
+      if cert.nil? || cert.empty?
+        nil
+      else
+        # in contrast to the environment variable, the client cert is passed in
+        # as single string, therefore restore the certificate to a valid pem
+        # encoded certificate
+        cert.gsub!(/ /, "\n")
+        cert.gsub!(/BEGIN\nCERT/, "BEGIN CERT")
+        cert.gsub!(/END\nCERT/, "END CERT")
+        cert = Puppet::SSL::Certificate.from_instance(OpenSSL::X509::Certificate.new(cert))
+        cert
+      end
     else
       Puppet::SSL::Certificate.from_instance(OpenSSL::X509::Certificate.new(cert))
     end

data/lib/puppet/network/rights.rb

@@ -53,17 +53,7 @@ class Rights
 
     # if we end up here, then that means we either didn't match or failed, in any
     # case will return an error to the outside world
-    host_description = args[:node] ? "#{args[:node]}(#{args[:ip]})" : args[:ip]
-
-    msg = "#{host_description} access to #{name} [#{args[:method]}]"
-
-    if args[:authenticated]
-      msg += " authenticated "
-    end
-
-    if right
-      msg += " at #{right.file}:#{right.line}"
-    end
+    msg = "#{name} [#{args[:method]}]"
 
     AuthorizationError.new("Forbidden request: #{msg}")
   end

data/lib/puppet/node/environment.rb

@@ -48,7 +48,7 @@ class Puppet::Node::Environment
     obj.send(:initialize,
              name.intern,
              expand_dirs(extralibs() + modulepath),
-             manifest == NO_MANIFEST ? manifest : File.expand_path(manifest),
+             manifest == NO_MANIFEST ? manifest : Puppet::FileSystem.expand_path(manifest),
              config_version)
     obj
   end
@@ -166,6 +166,10 @@ class Puppet::Node::Environment
   #     (optional)
   attr_reader :config_version
 
+  # Cached loaders - management of value handled by Puppet::Pops::Loaders
+  # @api private
+  attr_accessor :loaders
+
   # Checks to make sure that this environment did not have a manifest set in
   # its original environment.conf if Puppet is configured with
   # +disable_per_environment_manifest+ set true.  If it did, the environment's
@@ -467,7 +471,7 @@ class Puppet::Node::Environment
 
   def self.expand_dirs(dirs)
     dirs.collect do |dir|
-      File.expand_path(dir)
+      Puppet::FileSystem.expand_path(dir)
     end
   end
 
@@ -521,7 +525,7 @@ class Puppet::Node::Environment
     raise error
   end
 
-  # Return an empty toplevel hostclass to indicate that no file was loaded
+  # Return an empty top-level hostclass to indicate that no file was loaded
   #
   # @return [Puppet::Parser::AST::Hostclass]
   def empty_parse_result

data/lib/puppet/node/facts.rb

@@ -59,7 +59,7 @@ class Puppet::Node::Facts
     end
   end
 
-  # Sanitize fact values by converting everything not a string, boolean
+  # Sanitize fact values by converting everything not a string, Boolean
   # numeric, array or hash into strings.
   def sanitize
     values.each do |fact, value|

data/lib/puppet/parameter.rb

@@ -295,6 +295,10 @@ class Puppet::Parameter
   #
   attr_accessor :parent
 
+  # @!attribute [rw] sensitive
+  #   @return [true, false] If this parameter has been tagged as sensitive.
+  attr_accessor :sensitive
+
   # Returns a string representation of the resource's containment path in
   # the catalog.
   # @return [String]
@@ -376,7 +380,7 @@ class Puppet::Parameter
     tmp
   end
 
-  # Returns an array of strings representing the containment heirarchy
+  # Returns an array of strings representing the containment hierarchy
   # (types/classes) that make up the path to the resource from the root
   # of the catalog.  This is mostly used for logging purposes.
   #
@@ -479,7 +483,7 @@ class Puppet::Parameter
   #   calls both validate and munge on the given value, so no late binding.
   #
   # The given value is validated and then munged (if munging has been specified). The result is store
-  # as the value of this arameter.
+  # as the value of this parameter.
   # @return [Object] The given `value` after munging.
   # @raise (see #validate)
   #
@@ -501,7 +505,7 @@ class Puppet::Parameter
 
   # @return [Array<Symbol>] Returns an array of the associated resource's symbolic tags (including the parameter itself).
   # Returns an array of the associated resource's symbolic tags (including the parameter itself).
-  # At a minimun, the array contains the name of the parameter. If the associated resource
+  # At a minimum, the array contains the name of the parameter. If the associated resource
   # has tags, these tags are also included in the array.
   # @todo The original comment says = _"The properties need to return tags so that logs correctly
   #   collect them."_ what if anything of that is of interest to document. Should tags and their relationship
@@ -522,6 +526,22 @@ class Puppet::Parameter
     name.to_s
   end
 
+  # Formats the given string and conditionally redacts the provided interpolation variables, depending on if
+  # this property is sensitive.
+  #
+  # @note Because the default implementation of Puppet::Property#is_to_s returns the current value as-is, it
+  #   doesn't necessarily return a string. For the sake of sanity we just cast everything to a string for
+  #   interpolation so we don't introduce issues with unexpected property values.
+  #
+  # @see String#format
+  # @param fmt [String] The format string to interpolate.
+  # @param args [Array<String>] One or more strings to conditionally redact and interpolate into the format string.
+  #
+  # @return [String]
+  def format(fmt, *args)
+    fmt % args.map { |arg| @sensitive ? "[redacted]" : arg.to_s }
+  end
+
   # Produces a String with the value formatted for display to a human.
   # When the parameter value is a:
   #

data/lib/puppet/parameter/boolean.rb

@@ -1,6 +1,6 @@
 require 'puppet/coercion'
 
-# This specialized {Puppet::Parameter} handles boolean options, accepting lots
+# This specialized {Puppet::Parameter} handles Boolean options, accepting lots
 # of strings and symbols for both truthiness and falsehood.
 #
 class Puppet::Parameter::Boolean < Puppet::Parameter

data/lib/puppet/parameter/value.rb

@@ -11,7 +11,7 @@ class Puppet::Parameter::Value
 
   # Adds an alias for this value.
   # Makes the given _name_ be an alias for this acceptable value.
-  # @param name [Symbol] the additonal alias this value should be known as
+  # @param name [Symbol] the additional alias this value should be known as
   # @api private
   #
   def alias(name)

data/lib/puppet/parser.rb

@@ -10,7 +10,6 @@ require 'puppet/parser/functions'
 require 'puppet/parser/files'
 require 'puppet/parser/relationship'
 
-require 'puppet/resource/type_collection_helper'
 require 'puppet/resource/type'
 require 'monitor'
 

data/lib/puppet/parser/ast/pops_bridge.rb

@@ -278,7 +278,7 @@ class Puppet::Parser::AST::PopsBridge
     #
     def instantiate_TypeMapping(type_mapping, modname)
       loader = Puppet::Pops::Loaders.find_loader(modname)
-      tf = Puppet::Pops::Types::TypeParser.new
+      tf = Puppet::Pops::Types::TypeParser.singleton
       lhs = tf.interpret(type_mapping.type_expr, loader)
       rhs = tf.interpret_any(type_mapping.mapping_expr, loader)
       Puppet::Pops::Loaders.implementation_registry.register_type_mapping(lhs, rhs, loader)

data/lib/puppet/parser/ast/resource.rb

@@ -5,6 +5,11 @@ class Puppet::Parser::AST::Resource < Puppet::Parser::AST::Branch
 
   attr_accessor :type, :instances, :exported, :virtual
 
+  def initialize(argshash)
+    Puppet.warn_once('deprecation', 'AST::Resource', 'Use of Puppet::Parser::AST::Resource is deprecated and not fully functional')
+    super(argshash)
+  end
+
   # Evaluates resources by adding them to the compiler for lazy evaluation
   # and returning the produced resource references.
   #