puppet 3.4.3 → 3.5.0.rc1

data/lib/puppet/module_tool/applications/uninstaller.rb

@@ -10,7 +10,7 @@ module Puppet::ModuleTool
         @unfiltered  = []
         @installed   = []
         @suggestions = []
-        @environment = Puppet::Node::Environment.new(options[:environment])
+        @environment = options[:environment_instance]
       end
 
       def run
@@ -86,12 +86,15 @@ module Puppet::ModuleTool
       def validate_module
         mod = @installed.first
 
-        if !@options[:force] && mod.has_metadata? && mod.has_local_changes?
-          raise LocalChangesError,
-            :action            => :uninstall,
-            :module_name       => (mod.forge_name || mod.name).gsub('/', '-'),
-            :requested_version => @options[:version],
-            :installed_version => mod.version
+        if !@options[:force] && mod.has_metadata?
+          changes = Puppet::ModuleTool::Applications::Checksummer.run(mod.path)
+          if !changes.empty?
+            raise LocalChangesError,
+              :action            => :uninstall,
+              :module_name       => (mod.forge_name || mod.name).gsub('/', '-'),
+              :requested_version => @options[:version],
+              :installed_version => mod.version
+          end
         end
 
         if !@options[:force] && !mod.required_by.empty?

data/lib/puppet/module_tool/applications/unpacker.rb

@@ -40,7 +40,7 @@ module Puppet::ModuleTool
           begin
             Puppet::ModuleTool::Tar.instance(@module_name).unpack(@filename.to_s, build_dir.to_s, [@module_path.stat.uid, @module_path.stat.gid].join(':'))
           rescue Puppet::ExecutionFailure => e
-            raise RuntimeError, "Could not extract contents of module archive: #{e.message}"
+            raise RuntimeError, "Could not extract contents of module archive: #{e.message}", e.backtrace
           end
 
           # grab the first directory

data/lib/puppet/module_tool/applications/upgrader.rb

@@ -6,7 +6,7 @@ module Puppet::ModuleTool
 
       def initialize(name, forge, options)
         @action              = :upgrade
-        @environment         = Puppet::Node::Environment.new(Puppet.settings[:environment])
+        @environment         = options[:environment_instance]
         @module_name         = name
         @options             = options
         @force               = options[:force]
@@ -38,18 +38,21 @@ module Puppet::ModuleTool
           dir = @module.modulepath
 
           Puppet.notice "Found '#{@module_name}' (#{colorize(:cyan, results[:installed_version] || '???')}) in #{dir} ..."
-          if !@options[:force] && @module.has_metadata? && @module.has_local_changes?
-            raise LocalChangesError,
-              :action            => :upgrade,
-              :module_name       => @module_name,
-              :requested_version => @version || (@conditions[@module_name].empty? ? :latest : :best),
-              :installed_version => @module.version
+          if !@options[:force] && @module.has_metadata?
+            changes = Puppet::ModuleTool::Applications::Checksummer.run(@module.path)
+            if !changes.empty?
+              raise LocalChangesError,
+                :action            => :upgrade,
+                :module_name       => @module_name,
+                :requested_version => @version || (@conditions[@module_name].empty? ? :latest : :best),
+                :installed_version => @module.version
+            end
           end
 
           begin
             get_remote_constraints(@forge)
           rescue => e
-            raise UnknownModuleError, results.merge(:repository => @forge.uri)
+            raise UnknownModuleError, results.merge(:repository => @forge.uri), e.backtrace
           else
             raise UnknownVersionError, results.merge(:repository => @forge.uri) if @remote.empty?
           end

data/lib/puppet/module_tool/checksums.rb

@@ -16,7 +16,7 @@ module Puppet::ModuleTool
 
     # Return checksum for the +Pathname+.
     def checksum(pathname)
-      return Digest::MD5.hexdigest(Puppet::FileSystem::File.new(pathname).binread)
+      return Digest::MD5.hexdigest(Puppet::FileSystem.binread(pathname))
     end
 
     # Return checksums for object's +Pathname+, generate if it's needed.

data/lib/puppet/module_tool/contents_description.rb

@@ -1,3 +1,5 @@
+require 'puppet/module_tool'
+
 module Puppet::ModuleTool
 
   # = ContentsDescription

data/lib/puppet/module_tool/dependency.rb

@@ -1,6 +1,10 @@
+require 'puppet/module_tool'
+require 'puppet/network/format_support'
+
 module Puppet::ModuleTool
 
   class Dependency
+    include Puppet::Network::FormatSupport
 
     attr_reader :full_module_name, :username, :name, :version_requirement, :repository
 
@@ -21,10 +25,5 @@ module Puppet::ModuleTool
       result[:repository] = @repository.to_s if @repository && ! @repository.nil?
       result
     end
-
-    # Return PSON representation of this data.
-    def to_pson(*args)
-      to_data_hash.to_pson(*args)
-    end
   end
 end

data/lib/puppet/module_tool/errors.rb

@@ -1,3 +1,5 @@
+require 'puppet/module_tool'
+
 module Puppet::ModuleTool
   module Errors
     require 'puppet/module_tool/errors/base'

data/lib/puppet/module_tool/install_directory.rb

@@ -1,3 +1,6 @@
+require 'puppet/module_tool'
+require 'puppet/module_tool/errors'
+
 module Puppet
   module ModuleTool
     # Control the install location for modules.

data/lib/puppet/module_tool/metadata.rb

@@ -1,4 +1,6 @@
 require 'puppet/util/methodhelper'
+require 'puppet/module_tool'
+require 'puppet/network/format_support'
 
 module Puppet::ModuleTool
   # = Metadata
@@ -8,6 +10,7 @@ module Puppet::ModuleTool
   # +annotate+ methods in other classes.
   class Metadata
     include Puppet::Util::MethodHelper
+    include Puppet::Network::FormatSupport
 
     # The full name of the module, which is a dash-separated combination of the
     # +username+ and module +name+.
@@ -148,10 +151,5 @@ module Puppet::ModuleTool
     def to_hash()
       to_data_hash
     end
-
-    # Return the PSON record representing this instance.
-    def to_pson(*args)
-      return to_data_hash.to_pson(*args)
-    end
   end
 end

data/lib/puppet/module_tool/modulefile.rb

@@ -1,3 +1,6 @@
+require 'puppet/module_tool'
+require 'puppet/module_tool/dependency'
+
 module Puppet::ModuleTool
 
   # = Modulefile

data/lib/puppet/module_tool/shared_behaviors.rb

@@ -1,3 +1,8 @@
+require 'open-uri'
+
+require 'puppet/module_tool'
+require 'puppet/module_tool/errors'
+
 module Puppet::ModuleTool::Shared
 
   include Puppet::ModuleTool::Errors
@@ -151,7 +156,7 @@ module Puppet::ModuleTool::Shared
           cache_path = forge.retrieve(release[:file])
         end
       rescue OpenURI::HTTPError => e
-        raise RuntimeError, "Could not download module: #{e.message}"
+        raise RuntimeError, "Could not download module: #{e.message}", e.backtrace
       end
 
       [

data/lib/puppet/module_tool/skeleton.rb

@@ -1,3 +1,6 @@
+require 'pathname'
+require 'puppet/module_tool'
+
 module Puppet::ModuleTool
 
   # = Skeleton

data/lib/puppet/module_tool/tar.rb

@@ -1,3 +1,6 @@
+require 'puppet/module_tool'
+require 'puppet/util'
+
 module Puppet::ModuleTool::Tar
   require 'puppet/module_tool/tar/gnu'
   require 'puppet/module_tool/tar/solaris'

data/lib/puppet/network/auth_config_parser.rb

@@ -76,7 +76,7 @@ class AuthConfigParser
         right.info msg % val
         right.send(method, val)
       rescue Puppet::AuthStoreError => detail
-        raise Puppet::ConfigurationError, "#{detail} at line #{count} of #{@file}"
+        raise Puppet::ConfigurationError, "#{detail} at line #{count} of #{@file}", detail.backtrace
       end
     end
   end

data/lib/puppet/network/authconfig.rb

@@ -19,6 +19,9 @@ module Puppet
       { :acl => "/certificate/", :method => :find, :authenticated => :any },
       { :acl => "/certificate_request", :method => [:find, :save], :authenticated => :any },
       { :acl => "/status", :method => [:find], :authenticated => true },
+
+      # API V2.0
+      { :acl => "/v2.0/environments", :method => :find, :allow => '*', :authenticated => true },
     ]
 
     # Just proxy the setting methods to our rights stuff
@@ -58,8 +61,8 @@ module Puppet
     # check whether this request is allowed in our ACL
     # raise an Puppet::Network::AuthorizedError if the request
     # is denied.
-    def check_authorization(indirection, method, key, params)
-      if authorization_failure_exception = @rights.is_request_forbidden_and_why?(indirection, method, key, params)
+    def check_authorization(method, path, params)
+      if authorization_failure_exception = @rights.is_request_forbidden_and_why?(method, path, params)
         Puppet.warning("Denying access: #{authorization_failure_exception}")
         raise authorization_failure_exception
       end

data/lib/puppet/network/authentication.rb

@@ -13,8 +13,13 @@ module Puppet::Network::Authentication
     # Check CA cert if we're functioning as a CA
     certs << Puppet::SSL::CertificateAuthority.instance.host.certificate if Puppet::SSL::CertificateAuthority.ca?
 
-    # Always check the host cert if we have one, this will be the agent or master cert depending on the run mode
-    certs << Puppet::SSL::Host.localhost.certificate if Puppet::FileSystem::File.exist?(Puppet[:hostcert])
+    # Depending on the run mode, the localhost certificate will be for the
+    # master or the agent. Don't load the certificate if the CA cert is not
+    # present: infinite recursion will occur as another authenticated request
+    # will be spawned to download the CA cert.
+    if [Puppet[:hostcert], Puppet[:localcacert]].all? {|path| Puppet::FileSystem.exist?(path) }
+      certs << Puppet::SSL::Host.localhost.certificate
+    end
 
     # Remove nil values for caller convenience
     certs.compact.each do |cert|

data/lib/puppet/network/authorization.rb

@@ -26,8 +26,8 @@ module Puppet::Network
     end
 
     # Verify that our client has access.
-    def check_authorization(indirection, method, key, params)
-      authconfig.check_authorization(indirection, method, key, params)
+    def check_authorization(method, path, params)
+      authconfig.check_authorization(method, path, params)
     end
   end
 end

data/lib/puppet/network/format_support.rb

@@ -88,6 +88,10 @@ module Puppet::Network::FormatSupport
     to_data_hash.to_msgpack(*args)
   end
 
+  def to_pson(*args)
+    to_data_hash.to_pson(*args)
+  end
+
   def render(format = nil)
     format ||= self.class.default_format
 

data/lib/puppet/network/formats.rb

@@ -1,29 +1,24 @@
 require 'puppet/network/format_handler'
 
-Puppet::Network::FormatHandler.create_serialized_formats(:msgpack, :weight => 20, :mime => "application/x-msgpack", :required_methods => [:render_method, :intern_method]) do
+Puppet::Network::FormatHandler.create_serialized_formats(:msgpack, :weight => 20, :mime => "application/x-msgpack", :required_methods => [:render_method, :intern_method], :intern_method => :from_data_hash) do
+
+  confine :feature => :msgpack
+
   def intern(klass, text)
     data = MessagePack.unpack(text)
     return data if data.is_a?(klass)
-    klass.from_pson(data)
+    klass.from_data_hash(data)
   end
 
   def intern_multiple(klass, text)
     MessagePack.unpack(text).collect do |data|
-      klass.from_pson(data)
+      klass.from_data_hash(data)
     end
   end
 
-  def render(instance)
-    instance.to_msgpack
-  end
-
   def render_multiple(instances)
     instances.to_msgpack
   end
-
-  def supported?(klass)
-    Puppet.features.msgpack? && klass.method_defined?(:to_msgpack)
-  end
 end
 
 Puppet::Network::FormatHandler.create_serialized_formats(:yaml) do
@@ -50,7 +45,7 @@ Puppet::Network::FormatHandler.create_serialized_formats(:yaml) do
       raise Puppet::Network::FormatHandler::FormatError, "Serialized YAML did not contain a valid instance of #{klass}"
     end
 
-    klass.from_pson(data)
+    klass.from_data_hash(data)
   end
 
   def render(instance)
@@ -143,7 +138,7 @@ Puppet::Network::FormatHandler.create(:raw, :mime => "application/x-raw", :weigh
   end
 end
 
-Puppet::Network::FormatHandler.create_serialized_formats(:pson, :weight => 10, :required_methods => [:render_method, :intern_method]) do
+Puppet::Network::FormatHandler.create_serialized_formats(:pson, :weight => 10, :required_methods => [:render_method, :intern_method], :intern_method => :from_data_hash) do
   def intern(klass, text)
     data_to_instance(klass, PSON.parse(text))
   end
@@ -168,7 +163,7 @@ Puppet::Network::FormatHandler.create_serialized_formats(:pson, :weight => 10, :
       data = d
     end
     return data if data.is_a?(klass)
-    klass.from_pson(data)
+    klass.from_data_hash(data)
   end
 end
 

data/lib/puppet/network/http.rb

@@ -1,4 +1,15 @@
 module Puppet::Network::HTTP
   HEADER_ENABLE_PROFILING = "X-Puppet-Profiling"
   HEADER_PUPPET_VERSION = "X-Puppet-Version"
+
+  require 'puppet/network/http/issues'
+  require 'puppet/network/http/error'
+  require 'puppet/network/http/route'
+  require 'puppet/network/http/api'
+  require 'puppet/network/http/api/v1'
+  require 'puppet/network/http/api/v2'
+  require 'puppet/network/http/handler'
+  require 'puppet/network/http/response'
+  require 'puppet/network/http/request'
+  require 'puppet/network/http/memory_response'
 end

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

@@ -1,4 +1,2 @@
-require 'puppet/network/http'
-
 class Puppet::Network::HTTP::API
 end

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

@@ -1,6 +1,8 @@
-require 'puppet/network/http/api'
+require 'puppet/network/authorization'
+
+class Puppet::Network::HTTP::API::V1
+  include Puppet::Network::Authorization
 
-module Puppet::Network::HTTP::API::V1
   # How we map http methods and the indirection name in the URI
   # to an indirection method.
   METHOD_MAP = {
@@ -22,15 +24,49 @@ module Puppet::Network::HTTP::API::V1
     }
   }
 
+  def self.routes
+    Puppet::Network::HTTP::Route.path(/.*/).any(new)
+  end
+
+  # handle an HTTP request
+  def call(request, response)
+    indirection_name, method, key, params = uri2indirection(request.method, request.path, request.params)
+    certificate = request.client_cert
+
+    check_authorization(method, "/#{indirection_name}/#{key}", params)
+
+    indirection = Puppet::Indirector::Indirection.instance(indirection_name.to_sym)
+    raise ArgumentError, "Could not find indirection '#{indirection_name}'" unless indirection
+
+    if !indirection.allow_remote_requests?
+      # TODO: should we tell the user we found an indirection but it doesn't
+      # allow remote requests, or just pretend there's no handler at all? what
+      # are the security implications for the former?
+      raise Puppet::Network::HTTP::Error::HTTPNotFoundError.new("No handler for #{indirection.name}", :NO_INDIRECTION_REMOTE_REQUESTS)
+    end
+
+    trusted = Puppet::Context::TrustedInformation.remote(params[:authenticated], params[:node], certificate)
+    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 Exception => e
+    return do_exception(response, e)
+  end
+
   def uri2indirection(http_method, uri, params)
     environment, indirection, key = uri.split("/", 4)[1..-1] # the first field is always nil because of the leading slash
 
-    raise ArgumentError, "The environment must be purely alphanumeric, not '#{environment}'" unless environment =~ /^\w+$/
+    raise ArgumentError, "The environment must be purely alphanumeric, not '#{environment}'" unless Puppet::Node::Environment.valid_name?(environment)
     raise ArgumentError, "The indirection name must be purely alphanumeric, not '#{indirection}'" unless indirection =~ /^\w+$/
 
     method = indirection_method(http_method, indirection)
 
-    params[:environment] = Puppet::Node::Environment.new(environment)
+    configured_environment = Puppet.lookup(:environments).get(environment)
+    configured_environment = configured_environment.override_from_commandline(Puppet.settings)
+    params[:environment] = configured_environment
+
     params.delete(:bucket_path)
 
     raise ArgumentError, "No request key specified in #{uri}" if key == "" or key.nil?
@@ -40,14 +76,103 @@ module Puppet::Network::HTTP::API::V1
     [indirection, method, key, params]
   end
 
-  def indirection2uri(request)
-    indirection = request.method == :search ? pluralize(request.indirection_name.to_s) : request.indirection_name.to_s
-    "/#{request.environment.to_s}/#{indirection}/#{request.escaped_key}#{request.query_string}"
+  private
+
+  def do_http_control_exception(response, exception)
+    msg = exception.message
+    Puppet.info(msg)
+    response.respond_with(exception.status, "text/plain", msg)
   end
 
-  def request_to_uri_and_body(request)
-    indirection = request.method == :search ? pluralize(request.indirection_name.to_s) : request.indirection_name.to_s
-    ["/#{request.environment.to_s}/#{indirection}/#{request.escaped_key}", request.query_string.sub(/^\?/,'')]
+  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)
+      raise Puppet::Network::HTTP::Error::HTTPNotFoundError.new("Could not find #{indirection.name} #{key}", Puppet::Network::HTTP::Issues::RESOURCE_NOT_FOUND)
+    end
+
+    format = accepted_response_formatter_for(indirection.model, request)
+
+    rendered_result = result
+    if result.respond_to?(:render)
+      Puppet::Util::Profiler.profile("Rendered result in #{format}") do
+        rendered_result = result.render(format)
+      end
+    end
+
+    Puppet::Util::Profiler.profile("Sent response") do
+      response.respond_with(200, format, rendered_result)
+    end
+  end
+
+  # Execute our head.
+  def do_head(indirection, key, params, request, response)
+    unless indirection.head(key, params)
+      raise Puppet::Network::HTTP::Error::HTTPNotFoundError.new("Could not find #{indirection.name} #{key}", Puppet::Network::HTTP::Issues::RESOURCE_NOT_FOUND)
+    end
+
+    # No need to set a response because no response is expected from a
+    # HEAD request.  All we need to do is not die.
+  end
+
+  # Execute our search.
+  def do_search(indirection, key, params, request, response)
+    result = indirection.search(key, params)
+
+    if result.nil?
+      raise Puppet::Network::HTTP::Error::HTTPNotFoundError.new("Could not find instances in #{indirection.name} with '#{key}'", Puppet::Network::HTTP::Issues::RESOURCE_NOT_FOUND)
+    end
+
+    format = accepted_response_formatter_for(indirection.model, request)
+
+    response.respond_with(200, format, indirection.model.render_multiple(format, result))
+  end
+
+  # Execute our destroy.
+  def do_destroy(indirection, key, params, request, response)
+    formatter = accepted_response_formatter_or_yaml_for(indirection.model, request)
+
+    result = indirection.destroy(key, params)
+
+    response.respond_with(200, formatter, formatter.render(result))
+  end
+
+  # Execute our save.
+  def do_save(indirection, key, params, request, response)
+    formatter = accepted_response_formatter_or_yaml_for(indirection.model, request)
+    sent_object = read_body_into_model(indirection.model, request)
+
+    result = indirection.save(sent_object, key)
+
+    response.respond_with(200, formatter, formatter.render(result))
+  end
+
+  def accepted_response_formatter_for(model_class, request)
+    accepted_formats = request.headers['accept'] or raise Puppet::Network::HTTP::Error::HTTPNotAcceptableError.new("Missing required Accept header", Puppet::Network::HTTP::Issues::MISSING_HEADER_FIELD)
+    request.response_formatter_for(model_class.supported_formats, accepted_formats)
+  end
+
+  def accepted_response_formatter_or_yaml_for(model_class, request)
+    accepted_formats = request.headers['accept'] || "yaml"
+    request.response_formatter_for(model_class.supported_formats, accepted_formats)
+  end
+
+  def read_body_into_model(model_class, request)
+    data = request.body.to_s
+
+    format = request.format
+    model_class.convert_from(format, data)
   end
 
   def indirection_method(http_method, indirection)
@@ -60,7 +185,17 @@ module Puppet::Network::HTTP::API::V1
     method
   end
 
-  def pluralize(indirection)
+  def self.indirection2uri(request)
+    indirection = request.method == :search ? pluralize(request.indirection_name.to_s) : request.indirection_name.to_s
+    "/#{request.environment.to_s}/#{indirection}/#{request.escaped_key}#{request.query_string}"
+  end
+
+  def self.request_to_uri_and_body(request)
+    indirection = request.method == :search ? pluralize(request.indirection_name.to_s) : request.indirection_name.to_s
+    ["/#{request.environment.to_s}/#{indirection}/#{request.escaped_key}", request.query_string.sub(/^\?/,'')]
+  end
+
+  def self.pluralize(indirection)
     return(indirection == "status" ? "statuses" : indirection + "s")
   end