puppet 3.8.7 → 4.0.0

data/lib/puppet/file_serving/metadata.rb

@@ -17,7 +17,7 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
   PARAM_ORDER = [:mode, :ftype, :owner, :group]
 
   def checksum_type=(type)
-    raise(ArgumentError, "Unsupported checksum type #{type}") unless respond_to?("#{type}_file")
+    raise(ArgumentError, "Unsupported checksum type #{type}") unless Puppet::Util::Checksums.respond_to?("#{type}_file")
 
     @checksum_type = type
   end
@@ -27,7 +27,7 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
 
     def initialize(stat, source_permissions = nil)
       @stat = stat
-      @source_permissions_ignore = source_permissions == :ignore
+      @source_permissions_ignore = (!source_permissions || source_permissions == :ignore)
     end
 
     def owner
@@ -53,6 +53,7 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
     def initialize(stat, path, source_permissions = nil)
       super(stat, source_permissions)
       @path = path
+      raise(ArgumentError, "Unsupported Windows source permissions option #{source_permissions}") unless @source_permissions_ignore
     end
 
     { :owner => 'S-1-5-32-544',
@@ -60,45 +61,7 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
       :mode => 0644
     }.each do |method, default_value|
       define_method method do
-        return default_value if @source_permissions_ignore
-
-        # this code remains for when source_permissions is not set to :ignore
-        begin
-          Puppet::Util::Windows::Security.send("get_#{method}", @path) || default_value
-        rescue Puppet::Util::Windows::Error => detail
-          # Very carefully catch only this specific error that result from
-          # trying to read permissions on a symlinked file that is on a volume
-          # that does not support ACLs.
-          #
-          # Unfortunately readlink method will not return the target path when
-          # the given path is not the symlink.
-          #
-          # For instance, consider:
-          #   symlink c:\link points to c:\target
-          #   FileSystem.readlink('c:/link') returns 'c:/target'
-          #   FileSystem.readlink('c:/link/file') will NOT return 'c:/target/file'
-          #
-          # Since detecting this up front is costly, since the path in question
-          # needs to be recursively split and tested at each depth in the path,
-          # we catch the standard error that will result from trying to read a
-          # file that doesn't have a DACL - 1336 is ERROR_INVALID_DACL
-          #
-          # Note that this affects any manually created symlinks as well as
-          # paths like puppet:///modules
-          return default_value if detail.code == 1336
-
-          # Also handle a VirtualBox bug where ERROR_INVALID_FUNCTION is
-          # returned when following a symlink to a volume that is not NTFS.
-          # It appears that the VirtualBox file system is not propagating
-          # the standard Win32 error code above like it should.
-          #
-          # Apologies to all who enter this code path at a later date
-          if detail.code == 1 && Facter.value(:virtual) == 'virtualbox'
-            return default_value
-          end
-
-          raise
-        end
+        return default_value
       end
     end
   end
@@ -176,24 +139,4 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
     new(data.delete('path'), data)
   end
 
-  PSON.register_document_type('FileMetadata',self)
-  def to_pson_data_hash
-    {
-      'document_type' => 'FileMetadata',
-      'data'          => to_data_hash,
-      'metadata'      => {
-        'api_version' => 1
-        }
-    }
-  end
-
-  def to_pson(*args)
-    to_pson_data_hash.to_pson(*args)
-  end
-
-  def self.from_pson(data)
-    Puppet.deprecation_warning("from_pson is being removed in favour of from_data_hash.")
-    self.from_data_hash(data)
-  end
-
 end

data/lib/puppet/file_serving/mount/pluginfacts.rb

@@ -6,7 +6,7 @@ require 'puppet/file_serving/mount'
 class Puppet::FileServing::Mount::PluginFacts < Puppet::FileServing::Mount
   # Return an instance of the appropriate class.
   def find(relative_path, request)
-    return nil unless mod = request.environment.modules.find { |mod|  mod.pluginfact(relative_path) }
+    return nil unless mod = request.environment.modules.find { |m|  m.pluginfact(relative_path) }
 
     path = mod.pluginfact(relative_path)
 

data/lib/puppet/file_serving/mount/plugins.rb

@@ -6,7 +6,7 @@ require 'puppet/file_serving/mount'
 class Puppet::FileServing::Mount::Plugins < Puppet::FileServing::Mount
   # Return an instance of the appropriate class.
   def find(relative_path, request)
-    return nil unless mod = request.environment.modules.find { |mod|  mod.plugin(relative_path) }
+    return nil unless mod = request.environment.modules.find { |m|  m.plugin(relative_path) }
 
     path = mod.plugin(relative_path)
 

data/lib/puppet/file_serving/terminus_helper.rb

@@ -3,6 +3,21 @@ require 'puppet/file_serving/fileset'
 
 # Define some common methods for FileServing termini.
 module Puppet::FileServing::TerminusHelper
+  # Create model instance for a file in a file server.
+  def path2instance(request, path, options = {})
+    result = model.new(path, :relative_path => options[:relative_path])
+    result.checksum_type = request.options[:checksum_type] if request.options[:checksum_type]
+    result.links = request.options[:links] if request.options[:links]
+
+    # :ignore_source_permissions is here pending investigation in PUP-3906.
+    if options[:ignore_source_permissions]
+      result.collect
+    else
+      result.collect(request.options[:source_permissions])
+    end
+    result
+  end
+
   # Create model instances for all files in a fileset.
   def path2instances(request, *paths)
     filesets = paths.collect do |path|
@@ -11,11 +26,7 @@ module Puppet::FileServing::TerminusHelper
     end
 
     Puppet::FileServing::Fileset.merge(*filesets).collect do |file, base_path|
-      inst = model.new(base_path, :relative_path => file)
-      inst.checksum_type = request.options[:checksum_type] if request.options[:checksum_type]
-      inst.links = request.options[:links] if request.options[:links]
-      inst.collect
-      inst
+      path2instance(request, base_path, :ignore_source_permissions => true, :relative_path => file)
     end
   end
 end

data/lib/puppet/file_system/file_impl.rb

@@ -75,10 +75,6 @@ class Puppet::FileSystem::FileImpl
     path.read
   end
 
-  def read_preserve_line_endings(path)
-    read(path)
-  end
-
   def binread(path)
     raise NotImplementedError
   end

data/lib/puppet/file_system/memory_file.rb

@@ -60,11 +60,6 @@ class Puppet::FileSystem::MemoryFile
     to_path
   end
 
-  # Used by Ruby 1.8.7 file system abstractions when operating on Pathname like things.
-  def to_str
-    to_path
-  end
-
   def inspect
     "<Puppet::FileSystem::MemoryFile:#{to_s}>"
   end

data/lib/puppet/file_system/memory_impl.rb

@@ -44,10 +44,6 @@ class Puppet::FileSystem::MemoryImpl
     handle.read
   end
 
-  def read_preserve_line_endings(path)
-    read(path)
-  end
-
   def open(path, *args, &block)
     handle = assert_path(path).handle
     if block_given?

data/lib/puppet/file_system/{file19.rb → posix.rb}

@@ -1,4 +1,4 @@
-class Puppet::FileSystem::File19 < Puppet::FileSystem::FileImpl
+class Puppet::FileSystem::Posix < Puppet::FileSystem::FileImpl
   def binread(path)
     path.binread
   end

data/lib/puppet/file_system/{file19windows.rb → windows.rb}

@@ -1,7 +1,7 @@
-require 'puppet/file_system/file19'
+require 'puppet/file_system/posix'
 require 'puppet/util/windows'
 
-class Puppet::FileSystem::File19Windows < Puppet::FileSystem::File19
+class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
 
   def exist?(path)
     if ! Puppet.features.manages_symlinks?
@@ -91,14 +91,6 @@ class Puppet::FileSystem::File19Windows < Puppet::FileSystem::File19
     Puppet::Util::Windows::Security.set_mode(mode, path.to_s)
   end
 
-  def read_preserve_line_endings(path)
-    contents = path.read( :mode => 'rb', :encoding => Encoding::UTF_8)
-    contents = path.read( :mode => 'rb', :encoding => Encoding::default_external) unless contents.valid_encoding?
-    contents = path.read unless contents.valid_encoding?
-
-    contents
-  end
-
   private
 
   def raise_if_symlinks_unsupported

data/lib/puppet/file_system.rb

@@ -6,15 +6,12 @@ module Puppet::FileSystem
   require 'puppet/file_system/uniquefile'
 
   # create instance of the file system implementation to use for the current platform
-  @impl = if RUBY_VERSION =~ /^1\.8/
-           require 'puppet/file_system/file18'
-           Puppet::FileSystem::File18
-         elsif Puppet::Util::Platform.windows?
-           require 'puppet/file_system/file19windows'
-           Puppet::FileSystem::File19Windows
+  @impl = if Puppet::Util::Platform.windows?
+           require 'puppet/file_system/windows'
+           Puppet::FileSystem::Windows
          else
-           require 'puppet/file_system/file19'
-           Puppet::FileSystem::File19
+           require 'puppet/file_system/posix'
+           Puppet::FileSystem::Posix
          end.new()
 
   # Allows overriding the filesystem for the duration of the given block.
@@ -94,7 +91,7 @@ module Puppet::FileSystem
   # access using flock. This means that if the file is on a filesystem that
   # does not support flock, this method will provide no protection.
   #
-  # While polling to aquire the lock the process will wait ever increasing
+  # While polling to acquire the lock the process will wait ever increasing
   # amounts of time in order to prevent multiple processes from wasting
   # resources.
   #
@@ -129,19 +126,6 @@ module Puppet::FileSystem
     @impl.read(assert_path(path))
   end
 
-  # Read a file keeping the original line endings intact. This
-  # attempts to open files using binary mode using some encoding
-  # overrides and falling back to IO.read when none of the
-  # encodings are valid.
-  #
-  # @return [String] The contents of the file
-  #
-  # @api public
-  #
-  def self.read_preserve_line_endings(path)
-    @impl.read_preserve_line_endings(assert_path(path))
-  end
-
   # @return [String] The binary contents of the file
   #
   # @api public

data/lib/puppet/forge/repository.rb

@@ -4,10 +4,7 @@ require 'uri'
 require 'puppet/util/http_proxy'
 require 'puppet/forge'
 require 'puppet/forge/errors'
-
-if Puppet.features.zlib? && Puppet[:zlib]
-  require 'zlib'
-end
+require 'puppet/network/http'
 
 class Puppet::Forge
   # = Repository
@@ -32,7 +29,7 @@ class Puppet::Forge
       SocketError,
     ]
 
-    if Puppet.features.zlib? && Puppet[:zlib]
+    if Puppet.features.zlib?
       NET_HTTP_EXCEPTIONS << Zlib::GzipFile::Error
     end
 
@@ -65,9 +62,9 @@ class Puppet::Forge
         "User-Agent" => user_agent,
       }
 
-      if Puppet.features.zlib? && Puppet[:zlib] && RUBY_VERSION >= "1.9"
+      if Puppet.features.zlib?
         headers = headers.merge({
-          "Accept-Encoding" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
+          "Accept-Encoding" => Puppet::Network::HTTP::Compression::ACCEPT_ENCODING
         })
       end
 
@@ -98,7 +95,7 @@ class Puppet::Forge
       http_object.start do |http|
         response = http.request(request)
 
-        if Puppet.features.zlib? && Puppet[:zlib]
+        if Puppet.features.zlib?
           if response && response.key?("content-encoding")
             case response["content-encoding"]
             when "gzip"
@@ -145,6 +142,13 @@ class Puppet::Forge
         proxy.cert_store = cert_store
       end
 
+      if Puppet[:http_debug]
+        proxy.set_debug_output($stderr)
+      end
+
+      proxy.open_timeout = Puppet[:http_connect_timeout]
+      proxy.read_timeout = Puppet[:http_read_timeout]
+
       proxy
     end
 

data/lib/puppet/functions/assert_type.rb

@@ -16,15 +16,15 @@
 #
 Puppet::Functions.create_function(:assert_type) do
   dispatch :assert_type do
-    param 'Type', 'type'
-    param 'Any', 'value'
-    optional_block_param 'Callable[Type, Type]', 'block'
+    param 'Type', :type
+    param 'Any', :value
+    optional_block_param 'Callable[Type, Type]', :block
   end
 
   dispatch :assert_type_s do
-    param 'String', 'type_string'
-    param 'Any', 'value'
-    optional_block_param 'Callable[Type, Type]', 'block'
+    param 'String', :type_string
+    param 'Any', :value
+    optional_block_param 'Callable[Type, Type]', :block
   end
 
   # @param type [Type] the type the value must be an instance of
@@ -43,7 +43,7 @@ Puppet::Functions.create_function(:assert_type) do
         # is just confusing. (OTOH: may need to revisit, or provide a better "type diff" output.
         #
         actual = Puppet::Pops::Types::TypeCalculator.generalize!(inferred_type)
-        raise Puppet::ParseError, "assert_type(): Expected type #{type} does not match actual: #{actual}"
+        raise Puppet::Pops::Types::TypeAssertionError.new("assert_type(): Expected type #{type} does not match actual: #{actual}", type,actual)
       end
     end
     value

data/lib/puppet/functions/each.rb

@@ -34,9 +34,7 @@
 #       "hello".each |$char| { ... }                      # 'h', 'e', 'l', 'l', 'o'
 #       3.each |$number| { ... }                          # 0, 1, 2
 #
-# @since 3.2 for Array and Hash
-# @since 3.5 for other enumerables
-# @note requires `parser = future`
+# @since 4.0.0
 #
 Puppet::Functions.create_function(:each) do
   dispatch :foreach_Hash_2 do

data/lib/puppet/functions/epp.rb

@@ -37,8 +37,8 @@
 # scope where the `epp` function is called from.
 #
 # @see function inline_epp for examples of EPP
-# @since 3.5
-# @note Requires Future Parser
+# @since 4.0.0
+#
 Puppet::Functions.create_function(:epp, Puppet::Functions::InternalFunction) do
 
   dispatch :epp do
@@ -50,4 +50,4 @@ Puppet::Functions.create_function(:epp, Puppet::Functions::InternalFunction) do
   def epp(scope, path, parameters = nil)
     Puppet::Pops::Evaluator::EppEvaluator.epp(scope, path, scope.compiler.environment, parameters)
   end
-end
+end

data/lib/puppet/functions/filter.rb

@@ -31,9 +31,7 @@
 #      $a = {"raspberry"=>0, "blueberry"=>1, "orange"=>1}
 #      $a.filter |$key, $x| { $x =~ /berry$/ and $x >= 1 } # blueberry
 #
-# @since 3.4 for Array and Hash
-# @since 3.5 for other enumerables
-# @note requires `parser = future`
+# @since 4.0.0
 #
 Puppet::Functions.create_function(:filter) do
   dispatch :filter_Hash_2 do
@@ -57,14 +55,14 @@ Puppet::Functions.create_function(:filter) do
   end
 
   def filter_Hash_1(hash)
-    result = hash.select {|x, y| yield([x, y]) == true }
+    result = hash.select {|x, y| yield([x, y]) }
     # Ruby 1.8.7 returns Array
     result = Hash[result] unless result.is_a? Hash
     result
   end
 
   def filter_Hash_2(hash)
-    result = hash.select {|x, y| yield(x, y) == true }
+    result = hash.select {|x, y| yield(x, y) }
     # Ruby 1.8.7 returns Array
     result = Hash[result] unless result.is_a? Hash
     result

data/lib/puppet/functions/hiera.rb

@@ -1,29 +1,8 @@
 require 'hiera/puppet_function'
 
-#  Performs a standard priority lookup and returns the most specific value for a given key.
-#  The returned value can be data of any type (strings, arrays, or hashes).
+# @see lib/puppet/parser/functions/hiera.rb for documentation
+# TODO: Move docs here when the format has been determined.
 #
-#  The function can be called in one of three ways:
-#  1. Using 1 to 3 arguments where the arguments are:
-#     'key'      [String] Required
-#           The key to lookup.
-#     'default`  [Any] Optional
-#           A value to return when there's no match for `key`. Optional
-#     `override` [Any] Optional
-#           An argument in the third position, providing a data source
-#           to consult for matching values, even if it would not ordinarily be
-#           part of the matched hierarchy. If Hiera doesn't find a matching key
-#           in the named override data source, it will continue to search through the
-#           rest of the hierarchy.
-#
-#  2. Using a 'key' and an optional 'override' parameter like in #1 but with a block to
-#     provide the default value. The block is called with one parameter (the key) and
-#     should return the value.
-#
-#  3. Like #1 but with all arguments passed in an array.
-#
-#  More thorough examples of `hiera` are available at:
-#  <http://docs.puppetlabs.com/hiera/1/puppet.html#hiera-lookup-functions>
 Puppet::Functions.create_function(:hiera, Hiera::PuppetFunction) do
   init_dispatch
 end

data/lib/puppet/functions/hiera_array.rb

@@ -1,34 +1,12 @@
 require 'hiera/puppet_function'
 
-# Returns all matches throughout the hierarchy --- not just the first match --- as a flattened array of unique values.
-#  If any of the matched values are arrays, they're flattened and included in the results.
+# @see lib/puppet/parser/functions/hiera_array.rb for documentation
+# TODO: Move docs here when the format has been determined.
 #
-#  The function can be called in one of three ways:
-#  1. Using 1 to 3 arguments where the arguments are:
-#     'key'      [String] Required
-#           The key to lookup.
-#     'default`  [Any] Optional
-#           A value to return when there's no match for `key`. Optional
-#     `override` [Any] Optional
-#           An argument in the third position, providing a data source
-#           to consult for matching values, even if it would not ordinarily be
-#           part of the matched hierarchy. If Hiera doesn't find a matching key
-#           in the named override data source, it will continue to search through the
-#           rest of the hierarchy.
-#
-#  2. Using a 'key' and an optional 'override' parameter like in #1 but with a block to
-#     provide the default value. The block is called with one parameter (the key) and
-#     should return the value.
-#
-#  3. Like #1 but with all arguments passed in an array.
-#  If any matched value is a hash, puppet will raise a type mismatch error.
-#
-#  More thorough examples of `hiera` are available at:
-#  <http://docs.puppetlabs.com/hiera/1/puppet.html#hiera-lookup-functions>
 Puppet::Functions.create_function(:hiera_array, Hiera::PuppetFunction) do
   init_dispatch
 
   def merge_type
     :array
   end
-end
+end

data/lib/puppet/functions/hiera_hash.rb

@@ -1,32 +1,8 @@
 require 'hiera/puppet_function'
 
-# Returns a merged hash of matches from throughout the hierarchy. In cases where two or
-# more hashes share keys, the hierarchy  order determines which key/value pair will be
-#  used in the returned hash, with the pair in the highest priority data source winning.
+# @see lib/puppet/parser/functions/hiera_hash.rb for documentation
+# TODO: Move docs here when the format has been determined.
 #
-#  The function can be called in one of three ways:
-#  1. Using 1 to 3 arguments where the arguments are:
-#     'key'      [String] Required
-#           The key to lookup.
-#     'default`  [Any] Optional
-#           A value to return when there's no match for `key`. Optional
-#     `override` [Any] Optional
-#           An argument in the third position, providing a data source
-#           to consult for matching values, even if it would not ordinarily be
-#           part of the matched hierarchy. If Hiera doesn't find a matching key
-#           in the named override data source, it will continue to search through the
-#           rest of the hierarchy.
-#
-#  2. Using a 'key' and an optional 'override' parameter like in #1 but with a block to
-#     provide the default value. The block is called with one parameter (the key) and
-#     should return the value.
-#
-#  3. Like #1 but with all arguments passed in an array.
-#  `hiera_hash` expects that all values returned will be hashes. If any of the values
-#  found in the data sources are strings or arrays, puppet will raise a type mismatch error.
-#
-#  More thorough examples of `hiera_hash` are available at:
-#  <http://docs.puppetlabs.com/hiera/1/puppet.html#hiera-lookup-functions>
 Puppet::Functions.create_function(:hiera_hash, Hiera::PuppetFunction) do
   init_dispatch
 

data/lib/puppet/functions/hiera_include.rb

@@ -1,41 +1,8 @@
 require 'hiera/puppet_function'
 
-# Assigns classes to a node using an array merge lookup that retrieves the value for a user-specified key
-#   from a Hiera data source.
+# @see lib/puppet/parser/functions/hiera_include.rb for documentation
+# TODO: Move docs here when the format has been determined.
 #
-#  To use `hiera_include`, the following configuration is required:
-#  - A key name to use for classes, e.g. `classes`.
-#  - A line in the puppet `sites.pp` file (e.g. `/etc/puppet/manifests/sites.pp`)
-#    reading `hiera_include('classes')`. Note that this line must be outside any node
-#    definition and below any top-scope variables in use for Hiera lookups.
-#  - Class keys in the appropriate data sources. In a data source keyed to a node's role,
-#    one might have:
-#
-#            ---
-#            classes:
-#              - apache
-#              - apache::passenger
-#  The function can be called in one of three ways:
-#  1. Using 1 to 3 arguments where the arguments are:
-#     'key'      [String] Required
-#           The key to lookup.
-#     'default`  [Any] Optional
-#           A value to return when there's no match for `key`. Optional
-#     `override` [Any] Optional
-#           An argument in the third position, providing a data source
-#           to consult for matching values, even if it would not ordinarily be
-#           part of the matched hierarchy. If Hiera doesn't find a matching key
-#           in the named override data source, it will continue to search through the
-#          rest of the hierarchy.
-#
-#  2. Using a 'key' and an optional 'override' parameter like in #1 but with a block to
-#     provide the default value. The block is called with one parameter (the key) and
-#     should return the array to be used in the subsequent call to include.
-#
-#  3. Like #1 but with all arguments passed in an array.
-#
-#  More thorough examples of `hiera_include` are available at:
-#  <http://docs.puppetlabs.com/hiera/1/puppet.html#hiera-lookup-functions>
 Puppet::Functions.create_function(:hiera_include, Hiera::PuppetFunction) do
   init_dispatch
 
@@ -43,8 +10,8 @@ Puppet::Functions.create_function(:hiera_include, Hiera::PuppetFunction) do
     :array
   end
 
-  def post_lookup(scope, key, value)
+  def post_lookup(key, value)
     raise Puppet::ParseError, "Could not find data item #{key}" if value.nil?
-    call_function_with_scope(scope, 'include', value) unless value.empty?
+    call_function('include', value) unless value.empty?
   end
 end

data/lib/puppet/functions/inline_epp.rb

@@ -70,8 +70,7 @@
 #     Hello <%= $x %> <%= $y %>!
 #     END
 #
-# @since 3.5
-# @note Requires Future Parser
+# @since 4.0.0
 #
 Puppet::Functions.create_function(:inline_epp, Puppet::Functions::InternalFunction) do