puppet 3.4.3 → 3.5.0.rc1

data/lib/puppet/indirector/exec.rb

@@ -18,7 +18,7 @@ class Puppet::Indirector::Exec < Puppet::Indirector::Terminus
     begin
       output = execute(external_command, :failonfail => true, :combine => false)
     rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error, "Failed to find #{name} via exec: #{detail}"
+      raise Puppet::Error, "Failed to find #{name} via exec: #{detail}", detail.backtrace
     end
 
     if output =~ /\A\s*\Z/ # all whitespace

data/lib/puppet/indirector/face.rb

@@ -43,7 +43,7 @@ class Puppet::Indirector::Face < Puppet::Face
     rescue => detail
       message = "Could not call '#{method}' on '#{indirection_name}': #{detail}"
       Puppet.log_exception(detail, message)
-      raise message
+      raise RuntimeError, message, detail.backtrace
     end
 
     return result
@@ -132,7 +132,8 @@ class Puppet::Indirector::Face < Puppet::Face
     begin
       indirection.terminus_class = from
     rescue => detail
-      raise "Could not set '#{indirection.name}' terminus to '#{from}' (#{detail}); valid terminus types are #{self.class.terminus_classes(indirection.name).join(", ") }"
+      msg = "Could not set '#{indirection.name}' terminus to '#{from}' (#{detail}); valid terminus types are #{self.class.terminus_classes(indirection.name).join(", ") }"
+      raise detail, msg, detail.backtrace
     end
   end
 end

data/lib/puppet/indirector/facts/facter.rb

@@ -42,7 +42,7 @@ class Puppet::Node::Facts::Facter < Puppet::Indirector::Code
     end
 
     # Add to facter config
-    Facter::Util::Config.external_facts_dirs += external_facts_dirs
+    Facter.search_external external_facts_dirs
 
   end
 

data/lib/puppet/indirector/file_bucket_file/file.rb

@@ -14,14 +14,14 @@ module Puppet::FileBucketFile
       contents_file = path_for(request.options[:bucket_path], checksum, 'contents')
       paths_file = path_for(request.options[:bucket_path], checksum, 'paths')
 
-      if contents_file.exist? && matches(paths_file, files_original_path)
+      if Puppet::FileSystem.exist?(contents_file) && matches(paths_file, files_original_path)
         if request.options[:diff_with]
           other_contents_file = path_for(request.options[:bucket_path], request.options[:diff_with], 'contents')
-          raise "could not find diff_with #{request.options[:diff_with]}" unless other_contents_file.exist?
-          return `diff #{contents_file.path.to_s.inspect} #{other_contents_file.path.to_s.inspect}`
+          raise "could not find diff_with #{request.options[:diff_with]}" unless Puppet::FileSystem.exist?(other_contents_file)
+          return `diff #{Puppet::FileSystem.path_string(contents_file).inspect} #{Puppet::FileSystem.path_string(other_contents_file).inspect}`
         else
           Puppet.info "FileBucket read #{checksum}"
-          model.new(contents_file.binread)
+          model.new(Puppet::FileSystem.binread(contents_file))
         end
       else
         nil
@@ -33,7 +33,7 @@ module Puppet::FileBucketFile
       contents_file = path_for(request.options[:bucket_path], checksum, 'contents')
       paths_file = path_for(request.options[:bucket_path], checksum, 'paths')
 
-      contents_file.exist? && matches(paths_file, files_original_path)
+      Puppet::FileSystem.exist?(contents_file) && matches(paths_file, files_original_path)
     end
 
     def save(request)
@@ -54,8 +54,11 @@ module Puppet::FileBucketFile
 
     private
 
+    # @param paths_file [Object] Opaque file path
+    # @param files_original_path [String]
+    #
     def matches(paths_file, files_original_path)
-      paths_file.open(0640, 'a+') do |f|
+      Puppet::FileSystem.open(paths_file, 0640, 'a+') do |f|
         path_match(f, files_original_path)
       end
     end
@@ -69,18 +72,21 @@ module Puppet::FileBucketFile
       return false
     end
 
+    # @param contents_file [Object] Opaque file path
+    # @param paths_file [Object] Opaque file path
+    #
     def save_to_disk(bucket_file, files_original_path, contents_file, paths_file)
       Puppet::Util.withumask(0007) do
-        unless paths_file.dir.exist?
-          paths_file.dir.mkpath
+        unless Puppet::FileSystem.dir_exist?(paths_file)
+          Puppet::FileSystem.dir_mkpath(paths_file)
         end
 
-        paths_file.exclusive_open(0640, 'a+') do |f|
-          if contents_file.exist?
+        Puppet::FileSystem.exclusive_open(paths_file, 0640, 'a+') do |f|
+          if Puppet::FileSystem.exist?(contents_file)
             verify_identical_file!(contents_file, bucket_file)
-            contents_file.touch
+            Puppet::FileSystem.touch(contents_file)
           else
-            contents_file.open(0440, 'wb') do |of|
+            Puppet::FileSystem.open(contents_file, 0440, 'wb') do |of|
               of.write(bucket_file.contents)
             end
           end
@@ -103,18 +109,22 @@ module Puppet::FileBucketFile
       [checksum, path]
     end
 
+    # @return [Object] Opaque path as constructed by the Puppet::FileSystem
+    #
     def path_for(bucket_path, digest, subfile = nil)
       bucket_path ||= Puppet[:bucketdir]
 
       dir     = ::File.join(digest[0..7].split(""))
       basedir = ::File.join(bucket_path, dir, digest)
 
-      Puppet::FileSystem::File.new(subfile ? ::File.join(basedir, subfile) : basedir)
+      Puppet::FileSystem.pathname(subfile ? ::File.join(basedir, subfile) : basedir)
     end
 
+    # @param contents_file [Object] Opaque file path
+    # @param bucket_file [IO]
     def verify_identical_file!(contents_file, bucket_file)
-      if bucket_file.contents.size == contents_file.size
-        if contents_file.compare_stream(bucket_file.stream)
+      if bucket_file.contents.size == Puppet::FileSystem.size(contents_file)
+        if Puppet::FileSystem.compare_stream(contents_file, bucket_file.stream)
           Puppet.info "FileBucket got a duplicate file #{bucket_file.checksum}"
           return
         end

data/lib/puppet/indirector/file_metadata/file.rb

@@ -7,7 +7,7 @@ class Puppet::Indirector::FileMetadata::File < Puppet::Indirector::DirectFileSer
 
   def find(request)
     return unless data = super
-    data.collect
+    data.collect(request.options[:source_permissions])
 
     data
   end

data/lib/puppet/indirector/file_server.rb

@@ -29,7 +29,7 @@ class Puppet::Indirector::FileServer < Puppet::Indirector::Terminus
     return nil unless path = mount.find(relative_path, request)
     result = model.new(path)
     result.links = request.options[:links] if request.options[:links]
-    result.collect
+    result.collect(request.options[:source_permissions])
     result
   end
 

data/lib/puppet/indirector/indirection.rb

@@ -201,7 +201,7 @@ class Puppet::Indirector::Indirection
       result = terminus.find(request)
       if not result.nil?
         result.expiration ||= self.expiration if result.respond_to?(:expiration)
-        if cache? and request.use_cache?
+        if cache?
           Puppet.info "Caching #{self.name} for #{request.key}"
           cache.save request(:save, key, result, options)
         end

data/lib/puppet/indirector/json.rb

@@ -21,10 +21,10 @@ class Puppet::Indirector::JSON < Puppet::Indirector::Terminus
   end
 
   def destroy(request)
-    Puppet::FileSystem::File.unlink(path(request.key))
+    Puppet::FileSystem.unlink(path(request.key))
   rescue => detail
     unless detail.is_a? Errno::ENOENT
-      raise Puppet::Error, "Could not destroy #{self.name} #{request.key}: #{detail}"
+      raise Puppet::Error, "Could not destroy #{self.name} #{request.key}: #{detail}", detail.backtrace
     end
     1                           # emulate success...
   end
@@ -56,13 +56,13 @@ class Puppet::Indirector::JSON < Puppet::Indirector::Terminus
     rescue Errno::ENOENT
       return nil
     rescue => detail
-      raise Puppet::Error, "Could not read JSON data for #{indirection.name} #{key}: #{detail}"
+      raise Puppet::Error, "Could not read JSON data for #{indirection.name} #{key}: #{detail}", detail.backtrace
     end
 
     begin
       return from_json(json)
     rescue => detail
-      raise Puppet::Error, "Could not parse JSON data for #{indirection.name} #{key}: #{detail}"
+      raise Puppet::Error, "Could not parse JSON data for #{indirection.name} #{key}: #{detail}", detail.backtrace
     end
   end
 

data/lib/puppet/indirector/key/file.rb

@@ -24,12 +24,13 @@ class Puppet::SSL::Key::File < Puppet::Indirector::SslFile
   def destroy(request)
     super
 
-    return unless Puppet::FileSystem::File.exist?(public_key_path(request.key))
+    key_path = Puppet::FileSystem.pathname(public_key_path(request.key))
+    return unless Puppet::FileSystem.exist?(key_path)
 
     begin
-      Puppet::FileSystem::File.unlink(public_key_path(request.key))
+      Puppet::FileSystem.unlink(key_path)
     rescue => detail
-      raise Puppet::Error, "Could not remove #{request.key} public key: #{detail}"
+      raise Puppet::Error, "Could not remove #{request.key} public key: #{detail}", detail.backtrace
     end
   end
 
@@ -38,9 +39,11 @@ class Puppet::SSL::Key::File < Puppet::Indirector::SslFile
     super
 
     begin
-      Puppet.settings.setting(:publickeydir).open_file(public_key_path(request.key), 'w') { |f| f.print request.instance.content.public_key.to_pem }
+      Puppet.settings.setting(:publickeydir).open_file(public_key_path(request.key), 'w') do |f|
+        f.print request.instance.content.public_key.to_pem
+      end
     rescue => detail
-      raise Puppet::Error, "Could not write #{request.key}: #{detail}"
+      raise Puppet::Error, "Could not write #{request.key}: #{detail}", detail.backtrace
     end
   end
 end

data/lib/puppet/indirector/ldap.rb

@@ -70,7 +70,7 @@ class Puppet::Indirector::Ldap < Puppet::Indirector::Terminus
       rescue => detail
         message = "Could not connect to LDAP: #{detail}"
         Puppet.log_exception(detail, message)
-        raise Puppet::Error, message
+        raise Puppet::Error, message, detail.backtrace
       end
     end
 

data/lib/puppet/indirector/memory.rb

@@ -3,6 +3,10 @@ require 'puppet/indirector/terminus'
 # Manage a memory-cached list of instances.
 class Puppet::Indirector::Memory < Puppet::Indirector::Terminus
   def initialize
+    clear
+  end
+
+  def clear
     @instances = {}
   end
 

data/lib/puppet/indirector/msgpack.rb

@@ -0,0 +1,82 @@
+require 'puppet/indirector/terminus'
+require 'puppet/util'
+
+# The base class for MessagePack indirection terminus implementations.
+#
+# This should generally be preferred to the PSON base for any future
+# implementations, since it is ~ 30 times faster
+class Puppet::Indirector::Msgpack < Puppet::Indirector::Terminus
+  def initialize(*args)
+    if ! Puppet.features.msgpack?
+      raise "MessagePack terminus not supported without msgpack library"
+    end
+    super
+  end
+
+  def find(request)
+    load_msgpack_from_file(path(request.key), request.key)
+  end
+
+  def save(request)
+    filename = path(request.key)
+    FileUtils.mkdir_p(File.dirname(filename))
+
+    Puppet::Util.replace_file(filename, 0660) {|f| f.print to_msgpack(request.instance) }
+  rescue TypeError => detail
+    Puppet.log_exception "Could not save #{self.name} #{request.key}: #{detail}"
+  end
+
+  def destroy(request)
+    Puppet::FileSystem.unlink(path(request.key))
+  rescue => detail
+    unless detail.is_a? Errno::ENOENT
+      raise Puppet::Error, "Could not destroy #{self.name} #{request.key}: #{detail}", detail.backtrace
+    end
+    1                           # emulate success...
+  end
+
+  def search(request)
+    Dir.glob(path(request.key)).collect do |file|
+      load_msgpack_from_file(file, request.key)
+    end
+  end
+
+  # Return the path to a given node's file.
+  def path(name, ext = '.msgpack')
+    if name =~ Puppet::Indirector::BadNameRegexp then
+      Puppet.crit("directory traversal detected in #{self.class}: #{name.inspect}")
+      raise ArgumentError, "invalid key"
+    end
+
+    base = Puppet.run_mode.master? ? Puppet[:server_datadir] : Puppet[:client_datadir]
+    File.join(base, self.class.indirection_name.to_s, name.to_s + ext)
+  end
+
+  private
+
+  def load_msgpack_from_file(file, key)
+    msgpack = nil
+
+    begin
+      msgpack = File.read(file)
+    rescue Errno::ENOENT
+      return nil
+    rescue => detail
+      raise Puppet::Error, "Could not read MessagePack data for #{indirection.name} #{key}: #{detail}", detail.backtrace
+    end
+
+    begin
+      return from_msgpack(msgpack)
+    rescue => detail
+      raise Puppet::Error, "Could not parse MessagePack data for #{indirection.name} #{key}: #{detail}", detail.backtrace
+    end
+  end
+
+  def from_msgpack(text)
+    model.convert_from('msgpack', text)
+  end
+
+  def to_msgpack(object)
+    object.render('msgpack')
+  end
+end

data/lib/puppet/indirector/node/exec.rb

@@ -64,6 +64,6 @@ class Puppet::Node::Exec < Puppet::Indirector::Exec
     end
 
   rescue => detail
-      raise Puppet::Error, "Could not load external node results for #{name}: #{detail}"
+      raise Puppet::Error, "Could not load external node results for #{name}: #{detail}", detail.backtrace
   end
 end

data/lib/puppet/indirector/node/ldap.rb

@@ -3,7 +3,7 @@ require 'puppet/indirector/ldap'
 
 class Puppet::Node::Ldap < Puppet::Indirector::Ldap
   desc "Search in LDAP for node configuration information.  See
-  the [LDAP Nodes](http://projects.puppetlabs.com/projects/puppet/wiki/Ldap_Nodes) page for more information.  This will first
+  the [LDAP Nodes](http://docs.puppetlabs.com/guides/ldap_nodes.html) page for more information.  This will first
   search for whatever the certificate name is, then (if that name
   contains a `.`) for the short name, then `default`."
 
@@ -35,7 +35,7 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
       next unless info = name2hash(name)
 
       merge_parent(info) if info[:parent]
-      info[:environment] ||= request.environment.to_s
+      info[:environment] ||= request.environment
       node = info2node(request.key, info)
       break
     end
@@ -59,7 +59,7 @@ class Puppet::Node::Ldap < Puppet::Indirector::Ldap
 
     return infos.collect do |info|
       merge_parent(info) if info[:parent]
-      info[:environment] ||= request.environment.to_s
+      info[:environment] ||= request.environment
       info2node(info[:name], info)
     end
   end

data/lib/puppet/indirector/node/msgpack.rb

@@ -0,0 +1,7 @@
+require 'puppet/node'
+require 'puppet/indirector/msgpack'
+
+class Puppet::Node::Msgpack < Puppet::Indirector::Msgpack
+  desc "Store node information as flat files, serialized using MessagePack,
+    or deserialize stored MessagePack nodes."
+end

data/lib/puppet/indirector/node/yaml.rb

@@ -4,4 +4,19 @@ require 'puppet/indirector/yaml'
 class Puppet::Node::Yaml < Puppet::Indirector::Yaml
   desc "Store node information as flat files, serialized using YAML,
     or deserialize stored YAML nodes."
+
+  protected
+
+  def fix(object)
+    # This looks very strange because when the object is read from disk the
+    # environment is a string and by assigning it back onto the object it gets
+    # converted to a Puppet::Node::Environment.
+    #
+    # The Puppet::Node class can't handle this itself because we are loading
+    # with just straight YAML, which doesn't give the object a chance to modify
+    # things as it is loaded. Instead YAML simply sets the instance variable
+    # and leaves it at that.
+    object.environment = object.environment
+    object
+  end
 end

data/lib/puppet/indirector/queue.rb

@@ -39,7 +39,8 @@ class Puppet::Indirector::Queue < Puppet::Indirector::Terminus
       end
       result
   rescue => detail
-      raise Puppet::Error, "Could not write #{request.key} to queue: #{detail}\nInstance::#{request.instance}\n client : #{client}"
+      msg = "Could not write #{request.key} to queue: #{detail}\nInstance::#{request.instance}\n client : #{client}"
+      raise Puppet::Error, msg, detail.backtrace
   end
 
   def self.queue
@@ -72,7 +73,7 @@ class Puppet::Indirector::Queue < Puppet::Indirector::Terminus
       begin
         yield(self.intern(msg))
       rescue => detail
-        Puppet.log_exception(detail, "Error occured with subscription to queue #{queue} for indirection #{indirection_name}: #{detail}")
+        Puppet.log_exception(detail, "Error occurred with subscription to queue #{queue} for indirection #{indirection_name}: #{detail}")
       end
     end
   end

data/lib/puppet/indirector/report/msgpack.rb

@@ -0,0 +1,11 @@
+require 'puppet/transaction/report'
+require 'puppet/indirector/msgpack'
+
+class Puppet::Transaction::Report::Msgpack < Puppet::Indirector::Msgpack
+  desc "Store last report as a flat file, serialized using MessagePack."
+
+  # Force report to be saved there
+  def path(name,ext='.msgpack')
+    Puppet[:lastrunreport]
+  end
+end

data/lib/puppet/indirector/request.rb

@@ -14,29 +14,36 @@ class Puppet::Indirector::Request
 
   attr_reader :indirection_name
 
+  # trusted_information is specifically left out because we can't serialize it
+  # and keep it "trusted"
   OPTION_ATTRIBUTES = [:ip, :node, :authenticated, :ignore_terminus, :ignore_cache, :instance, :environment]
 
   ::PSON.register_document_type('IndirectorRequest',self)
 
-  def self.from_pson(json)
-    raise ArgumentError, "No indirection name provided in json data" unless indirection_name = json['type']
-    raise ArgumentError, "No method name provided in json data" unless method = json['method']
-    raise ArgumentError, "No key provided in json data" unless key = json['key']
+  def self.from_data_hash(data)
+    raise ArgumentError, "No indirection name provided in data" unless indirection_name = data['type']
+    raise ArgumentError, "No method name provided in data" unless method = data['method']
+    raise ArgumentError, "No key provided in data" unless key = data['key']
 
-    request = new(indirection_name, method, key, nil, json['attributes'])
+    request = new(indirection_name, method, key, nil, data['attributes'])
 
-    if instance = json['instance']
+    if instance = data['instance']
       klass = Puppet::Indirector::Indirection.instance(request.indirection_name).model
       if instance.is_a?(klass)
         request.instance = instance
       else
-        request.instance = klass.from_pson(instance)
+        request.instance = klass.from_data_hash(instance)
       end
     end
 
     request
   end
 
+  def self.from_pson(json)
+    Puppet.deprecation_warning("from_pson is being removed in favour of from_data_hash.")
+    self.from_data_hash(json)
+  end
+
   def to_data_hash
     result = {
       'type' => indirection_name,
@@ -76,14 +83,14 @@ class Puppet::Indirector::Request
   end
 
   def environment
-    @environment ||= Puppet::Node::Environment.new
+    @environment ||= Puppet.lookup(:environments).get(Puppet[:environment])
   end
 
   def environment=(env)
     @environment = if env.is_a?(Puppet::Node::Environment)
       env
     else
-      Puppet::Node::Environment.new(env)
+      Puppet.lookup(:environments).get(env)
     end
   end
 
@@ -142,21 +149,11 @@ class Puppet::Indirector::Request
     @indirection_name = name.to_sym
   end
 
-
   def model
     raise ArgumentError, "Could not find indirection '#{indirection_name}'" unless i = indirection
     i.model
   end
 
-  # Should we allow use of the cached object?
-  def use_cache?
-    if defined?(@use_cache)
-      ! ! use_cache
-    else
-      true
-    end
-  end
-
   # Are we trying to interact with multiple resources, or just one?
   def plural?
     method == :search
@@ -282,7 +279,7 @@ class Puppet::Indirector::Request
     begin
       uri = URI.parse(URI.escape(key))
     rescue => detail
-      raise ArgumentError, "Could not understand URL #{key}: #{detail}"
+      raise ArgumentError, "Could not understand URL #{key}: #{detail}", detail.backtrace
     end
 
     # Just short-circuit these to full paths