puppet 3.6.2-x86-mingw32 → 3.7.0-x86-mingw32

data/lib/puppet/module_tool/modulefile.rb

@@ -42,7 +42,7 @@ module Puppet::ModuleTool
     # optional +version_requirement+ (e.g. "0.1.0") and +repository+ (a URL
     # string). Optional. Can be called multiple times to add many dependencies.
     def dependency(name, version_requirement = nil, repository = nil)
-      @metadata.to_hash['dependencies'] << Dependency.new(name, version_requirement, repository)
+      @metadata.add_dependency(name, version_requirement, repository)
     end
 
     # Set the source

data/lib/puppet/module_tool/skeleton/templates/generator/Gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+
+puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 3.3']
+gem 'puppet', puppetversion
+gem 'puppetlabs_spec_helper', '>= 0.1.0'
+gem 'puppet-lint', '>= 0.3.2'
+gem 'facter', '>= 1.7.0'

data/lib/puppet/module_tool/skeleton/templates/generator/manifests/init.pp.erb

@@ -23,7 +23,7 @@
 #
 # === Examples
 #
-#  class { <%= metadata.name %>:
+#  class { '<%= metadata.name %>':
 #    servers => [ 'pool.ntp.org', 'ntp.local.company.com' ],
 #  }
 #

data/lib/puppet/module_tool/skeleton/templates/generator/spec/spec_helper.rb

@@ -1,17 +1 @@
-dir = File.expand_path(File.dirname(__FILE__))
-$LOAD_PATH.unshift File.join(dir, 'lib')
-
-require 'mocha'
-require 'puppet'
-require 'rspec'
-require 'spec/autorun'
-
-Spec::Runner.configure do |config|
-    config.mock_with :mocha
-end
-
-# We need this because the RAL uses 'should' as a method.  This
-# allows us the same behaviour but with a different method name.
-class Object
-    alias :must :should
-end
+require 'puppetlabs_spec_helper/module_spec_helper'

data/lib/puppet/module_tool/tar/mini.rb

@@ -1,13 +1,13 @@
 class Puppet::ModuleTool::Tar::Mini
   def unpack(sourcefile, destdir, _)
     Zlib::GzipReader.open(sourcefile) do |reader|
-      Archive::Tar::Minitar.unpack(reader, destdir) do |action, name, stats|
+      Archive::Tar::Minitar.unpack(reader, destdir, find_valid_files(reader)) do |action, name, stats|
         case action
         when :file_done
           File.chmod(0444, "#{destdir}/#{name}")
         when :dir, :file_start
           validate_entry(destdir, name)
-          Puppet.debug("extracting #{destdir}/#{name}")
+          Puppet.debug("Extracting: #{destdir}/#{name}")
         end
       end
     end
@@ -21,6 +21,24 @@ class Puppet::ModuleTool::Tar::Mini
 
   private
 
+  # Find all the valid files in tarfile.
+  #
+  # This check was mainly added to ignore 'x' and 'g' flags from the PAX
+  # standard but will also ignore any other non-standard tar flags.
+  # tar format info: http://pic.dhe.ibm.com/infocenter/zos/v1r13/index.jsp?topic=%2Fcom.ibm.zos.r13.bpxa500%2Ftaf.htm
+  # pax format info: http://pic.dhe.ibm.com/infocenter/zos/v1r13/index.jsp?topic=%2Fcom.ibm.zos.r13.bpxa500%2Fpxarchfm.htm
+  def find_valid_files(tarfile)
+    Archive::Tar::Minitar.open(tarfile).collect do |entry|
+      flag = entry.typeflag
+      if flag.nil? || flag =~ /[[:digit:]]/ && (0..7).include?(flag.to_i)
+        entry.name
+      else
+        Puppet.debug "Invalid tar flag '#{flag}' will not be extracted: #{entry.name}"
+        next
+      end
+    end
+  end
+
   def validate_entry(destdir, path)
     if Pathname.new(path).absolute?
       raise Puppet::ModuleTool::Errors::InvalidPathInPackageError, :entry_path => path, :directory => destdir

data/lib/puppet/network/http.rb

@@ -11,5 +11,10 @@ module Puppet::Network::HTTP
   require 'puppet/network/http/handler'
   require 'puppet/network/http/response'
   require 'puppet/network/http/request'
+  require 'puppet/network/http/site'
+  require 'puppet/network/http/session'
+  require 'puppet/network/http/factory'
+  require 'puppet/network/http/nocache_pool'
+  require 'puppet/network/http/pool'
   require 'puppet/network/http/memory_response'
 end

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

@@ -110,12 +110,12 @@ class Puppet::Network::HTTP::API::V1
 
     rendered_result = result
     if result.respond_to?(:render)
-      Puppet::Util::Profiler.profile("Rendered result in #{format}") do
+      Puppet::Util::Profiler.profile("Rendered result in #{format}", [:http, :v1_render, format]) do
         rendered_result = result.render(format)
       end
     end
 
-    Puppet::Util::Profiler.profile("Sent response") do
+    Puppet::Util::Profiler.profile("Sent response", [:http, :v1_response]) do
       response.respond_with(200, format, rendered_result)
     end
   end

data/lib/puppet/network/http/api/v2/environments.rb

@@ -12,10 +12,24 @@ class Puppet::Network::HTTP::API::V2::Environments
         [env.name, {
           "settings" => {
             "modulepath" => env.full_modulepath,
-            "manifest" => env.manifest
+            "manifest" => env.manifest,
+            "environment_timeout" => timeout(env),
+            "config_version" => env.config_version || '',
           }
         }]
       end]
     }))
   end
+
+  private
+
+  def timeout(env)
+    ttl = @env_loader.get_conf(env.name).environment_timeout
+    if ttl == 1.0 / 0.0 # INFINITY
+      "unlimited"
+    else
+      ttl
+    end
+  end
+
 end

data/lib/puppet/network/http/connection.rb

@@ -3,6 +3,7 @@ require 'puppet/ssl/host'
 require 'puppet/ssl/configuration'
 require 'puppet/ssl/validator'
 require 'puppet/network/authentication'
+require 'puppet/network/http'
 require 'uri'
 
 module Puppet::Network::HTTP
@@ -29,8 +30,6 @@ module Puppet::Network::HTTP
       :redirect_limit => 10,
     }
 
-    @@openssl_initialized = false
-
     # Creates a new HTTP client connection to `host`:`port`.
     # @param host [String] the host to which this client will connect to
     # @param port [Fixnum] the port to which this client will connect to
@@ -60,6 +59,8 @@ module Puppet::Network::HTTP
       @use_ssl = options[:use_ssl]
       @verify = options[:verify]
       @redirect_limit = options[:redirect_limit]
+      @site = Puppet::Network::HTTP::Site.new(@use_ssl ? 'https' : 'http', host, port)
+      @pool = Puppet.lookup(:http_pool)
     end
 
     # @!macro [new] common_options
@@ -119,59 +120,81 @@ module Puppet::Network::HTTP
 
     # TODO: These are proxies for the Net::HTTP#request_* methods, which are
     # almost the same as the "get", "post", etc. methods that we've ported above,
-    # but they are able to accept a code block and will yield to it.  For now
+    # but they are able to accept a code block and will yield to it, which is
+    # necessary to stream responses, e.g. file content.  For now
     # we're not funneling these proxy implementations through our #request
     # method above, so they will not inherit the same error handling.  In the
     # future we may want to refactor these so that they are funneled through
     # that method and do inherit the error handling.
     def request_get(*args, &block)
-      connection.request_get(*args, &block)
+      with_connection(@site) do |connection|
+        connection.request_get(*args, &block)
+      end
     end
 
     def request_head(*args, &block)
-      connection.request_head(*args, &block)
+      with_connection(@site) do |connection|
+        connection.request_head(*args, &block)
+      end
     end
 
     def request_post(*args, &block)
-      connection.request_post(*args, &block)
+      with_connection(@site) do |connection|
+        connection.request_post(*args, &block)
+      end
     end
     # end of Net::HTTP#request_* proxies
 
+    # The address to connect to.
     def address
-      connection.address
+      @site.host
     end
 
+    # The port to connect to.
     def port
-      connection.port
+      @site.port
     end
 
+    # Whether to use ssl
     def use_ssl?
-      connection.use_ssl?
+      @site.use_ssl?
     end
 
     private
 
     def request_with_redirects(request, options)
       current_request = request
-      @redirect_limit.times do |redirection|
-        apply_options_to(current_request, options)
+      current_site = @site
+      response = nil
 
-        response = execute_request(current_request)
-        return response unless [301, 302, 307].include?(response.code.to_i)
+      0.upto(@redirect_limit) do |redirection|
+        return response if response
 
-        # handle the redirection
-        location = URI.parse(response['location'])
-        @connection = initialize_connection(location.host, location.port, location.scheme == 'https')
+        with_connection(current_site) do |connection|
+          apply_options_to(current_request, options)
 
-        # update to the current request path
-        current_request = current_request.class.new(location.path)
-        current_request.body = request.body
-        request.each do |header, value|
-          current_request[header] = value
+          current_response = execute_request(connection, current_request)
+
+          if [301, 302, 307].include?(current_response.code.to_i)
+
+            # handle the redirection
+            location = URI.parse(current_response['location'])
+            current_site = current_site.move_to(location)
+
+            # update to the current request path
+            current_request = current_request.class.new(location.path)
+            current_request.body = request.body
+            request.each do |header, value|
+              current_request[header] = value
+            end
+          else
+            response = current_response
+          end
         end
 
         # and try again...
       end
+
       raise RedirectionLimitExceededException, "Too many HTTP redirections for #{@host}:#{@port}"
     end
 
@@ -181,16 +204,20 @@ module Puppet::Network::HTTP
       end
     end
 
-    def connection
-      @connection || initialize_connection(@host, @port, @use_ssl)
-    end
-
-    def execute_request(request)
+    def execute_request(connection, request)
       response = connection.request(request)
 
       # Check the peer certs and warn if they're nearing expiration.
       warn_if_near_expiration(*@verify.peer_certs)
 
+      response
+    end
+
+    def with_connection(site, &block)
+      response = nil
+      @pool.with_connection(site, @verify) do |conn|
+        response = yield conn
+      end
       response
     rescue OpenSSL::SSL::SSLError => error
       if error.message.include? "certificate verify failed"
@@ -202,53 +229,12 @@ module Puppet::Network::HTTP
 
         valid_certnames = [leaf_ssl_cert.name, *leaf_ssl_cert.subject_alt_names].uniq
         msg = valid_certnames.length > 1 ? "one of #{valid_certnames.join(', ')}" : valid_certnames.first
-        msg = "Server hostname '#{connection.address}' did not match server certificate; expected #{msg}"
+        msg = "Server hostname '#{site.host}' did not match server certificate; expected #{msg}"
 
         raise Puppet::Error, msg, error.backtrace
       else
         raise
       end
     end
-
-    def initialize_connection(host, port, use_ssl)
-      args = [host, port]
-      if Puppet[:http_proxy_host] == "none"
-        args << nil << nil
-      else
-        args << Puppet[:http_proxy_host] << Puppet[:http_proxy_port]
-      end
-
-      @connection = create_connection(*args)
-
-      # Pop open the http client a little; older versions of Net::HTTP(s) didn't
-      # give us a reader for ca_file... Grr...
-      class << @connection; attr_accessor :ca_file; end
-
-      @connection.use_ssl = use_ssl
-      # Use configured timeout (#1176)
-      @connection.read_timeout = Puppet[:configtimeout]
-      @connection.open_timeout = Puppet[:configtimeout]
-
-      cert_setup
-
-      @connection
-    end
-
-    # Use cert information from a Puppet client to set up the http object.
-    def cert_setup
-      # PUP-1411, make sure that openssl is initialized before we try to connect
-      if ! @@openssl_initialized
-        OpenSSL::SSL::SSLContext.new
-        @@openssl_initialized = true
-      end
-
-      @verify.setup_connection(@connection)
-    end
-
-    # This method largely exists for testing purposes, so that we can
-    # mock the actual HTTP connection.
-    def create_connection(*args)
-      Net::HTTP.new(*args)
-    end
   end
 end

data/lib/puppet/network/http/factory.rb

@@ -0,0 +1,44 @@
+require 'openssl'
+require 'net/http'
+
+# Factory for <tt>Net::HTTP</tt> objects.
+#
+# Encapsulates the logic for creating a <tt>Net::HTTP</tt> object based on the
+# specified {Puppet::Network::HTTP::Site Site} and puppet settings.
+#
+# @api private
+#
+class Puppet::Network::HTTP::Factory
+  @@openssl_initialized = false
+
+  def initialize
+    # PUP-1411, make sure that openssl is initialized before we try to connect
+    if ! @@openssl_initialized
+      OpenSSL::SSL::SSLContext.new
+      @@openssl_initialized = true
+    end
+  end
+
+  def create_connection(site)
+    Puppet.debug("Creating new connection for #{site}")
+
+    args = [site.host, site.port]
+    if Puppet[:http_proxy_host] == "none"
+      args << nil << nil
+    else
+      args << Puppet[:http_proxy_host] << Puppet[:http_proxy_port]
+    end
+
+    http = Net::HTTP.new(*args)
+    http.use_ssl = site.use_ssl?
+    # Use configured timeout (#1176)
+    http.read_timeout = Puppet[:configtimeout]
+    http.open_timeout = Puppet[:configtimeout]
+
+    if Puppet[:http_debug]
+      http.set_debug_output($stderr)
+    end
+
+    http
+  end
+end

data/lib/puppet/network/http/handler.rb

@@ -6,6 +6,7 @@ require 'puppet/network/http/api/v1'
 require 'puppet/network/authentication'
 require 'puppet/network/rights'
 require 'puppet/util/profiler'
+require 'puppet/util/profiler/aggregate'
 require 'resolv'
 
 module Puppet::Network::HTTP::Handler
@@ -55,10 +56,9 @@ module Puppet::Network::HTTP::Handler
 
     response[Puppet::Network::HTTP::HEADER_PUPPET_VERSION] = Puppet.version
 
-    configure_profiler(request_headers, request_params)
-    warn_if_near_expiration(new_request.client_cert)
+    profiler = configure_profiler(request_headers, request_params)
 
-    Puppet::Util::Profiler.profile("Processed request #{request_method} #{request_path}") do
+    Puppet::Util::Profiler.profile("Processed request #{request_method} #{request_path}", [:http, request_method, request_path]) do
       if route = @routes.find { |route| route.matches?(new_request) }
         route.process(new_request, new_response)
       else
@@ -74,6 +74,9 @@ module Puppet::Network::HTTP::Handler
     Puppet.err(http_e.message)
     new_response.respond_with(http_e.status, "application/json", http_e.to_json)
   ensure
+    if profiler
+      remove_profiler(profiler)
+    end
     cleanup(request)
   end
 
@@ -172,9 +175,12 @@ module Puppet::Network::HTTP::Handler
 
   def configure_profiler(request_headers, request_params)
     if (request_headers.has_key?(Puppet::Network::HTTP::HEADER_ENABLE_PROFILING.downcase) or Puppet[:profile])
-      Puppet::Util::Profiler.current = Puppet::Util::Profiler::WallClock.new(Puppet.method(:debug), request_params.object_id)
-    else
-      Puppet::Util::Profiler.current = Puppet::Util::Profiler::NONE
+      Puppet::Util::Profiler.add_profiler(Puppet::Util::Profiler::Aggregate.new(Puppet.method(:debug), request_params.object_id))
     end
   end
+
+  def remove_profiler(profiler)
+    profiler.shutdown
+    Puppet::Util::Profiler.remove_profiler(profiler)
+  end
 end

data/lib/puppet/network/http/nocache_pool.rb

@@ -0,0 +1,21 @@
+# A pool that does not cache HTTP connections.
+#
+# @api private
+class Puppet::Network::HTTP::NoCachePool
+  def initialize(factory = Puppet::Network::HTTP::Factory.new)
+    @factory = factory
+  end
+
+  # Yields a <tt>Net::HTTP</tt> connection.
+  #
+  # @yieldparam http [Net::HTTP] An HTTP connection
+  def with_connection(site, verify, &block)
+    http = @factory.create_connection(site)
+    verify.setup_connection(http)
+    yield http
+  end
+
+  def close
+    # do nothing
+  end
+end