puppet 3.4.3 → 3.5.0.rc1

data/lib/puppet/face/module/list.rb

@@ -58,17 +58,12 @@ Puppet::Face.define(:module, '1.0.0') do
     EOT
 
     when_invoked do |options|
-      Puppet[:modulepath] = options[:modulepath] if options[:modulepath]
-      environment = Puppet::Node::Environment.new(options[:environment])
-
-      environment.modules_by_path
+      environment_from_options(options).modules_by_path
     end
 
     when_rendering :console do |modules_by_path, options|
       output = ''
-
-      Puppet[:modulepath] = options[:modulepath] if options[:modulepath]
-      environment = Puppet::Node::Environment.new(options[:environment])
+      environment = environment_from_options(options)
 
       error_types = {
         :non_semantic_version => {
@@ -171,6 +166,17 @@ Puppet::Face.define(:module, '1.0.0') do
     end
   end
 
+  def environment_from_options(options)
+    environments = Puppet.lookup(:environments)
+    if options[:modulepath]
+      environments.for(options[:modulepath], '')
+    elsif options[:environment]
+      environments.get(options[:environment])
+    else
+      environments.get(Puppet[:environment])
+    end
+  end
+
   # Prepare a list of module objects and their dependencies for print in a
   # tree view.
   #

data/lib/puppet/face/node/clean.rb

@@ -37,7 +37,7 @@ Puppet::Face.define(:node, '0.0.1') do
       # This seems really bad; run_mode should be set as part of a class
       # definition, and should not be modifiable beyond that.  This is one of
       # the only places left in the code that tries to manipulate it. Other
-      # parts of code that handle certificates behave differently if the the
+      # parts of code that handle certificates behave differently if the
       # run_mode is master. Those other behaviors are needed for cleaning the
       # certificates correctly.
       Puppet.settings.preferred_run_mode = "master"
@@ -144,7 +144,7 @@ Puppet::Face.define(:node, '0.0.1') do
   end
 
   def environment
-    @environment ||= Puppet::Node::Environment.new
+    @environment ||= Puppet.lookup(:environments).get(Puppet[:environment])
   end
 
   def type_is_ensurable(resource)

data/lib/puppet/face/parser.rb

@@ -43,17 +43,23 @@ Puppet::Face.define(:parser, '0.0.1') do
       end
       missing_files = []
       files.each do |file|
-        missing_files << file if ! Puppet::FileSystem::File.exist?(file)
-        Puppet[:manifest] = file
-        validate_manifest
+        missing_files << file if ! Puppet::FileSystem.exist?(file)
+        validate_manifest(file)
       end
       raise Puppet::Error, "One or more file(s) specified did not exist:\n#{missing_files.collect {|f| " " * 3 + f + "\n"}}" if ! missing_files.empty?
       nil
     end
   end
 
-  def validate_manifest
-    Puppet::Node::Environment.new(Puppet[:environment]).known_resource_types.clear
+  # @api private
+  def validate_manifest(manifest = nil)
+    configured_environment = Puppet.lookup(:environments).get(Puppet[:environment])
+    validation_environment = manifest ?
+      configured_environment.override_with(:manifest => manifest) :
+      configured_environment
+
+    validation_environment.known_resource_types.clear
+
   rescue => detail
     Puppet.log_exception(detail)
     exit(1)

data/lib/puppet/face/status.rb

@@ -27,7 +27,7 @@ Puppet::Indirector::Face.define(:status, '0.0.1') do
 
     Over REST, this action will query the configured puppet master by default.
     To query other servers, including puppet agent nodes started with the
-    <--listen> option, you can set set the global <--server> and <--masterport>
+    <--listen> option, you can set the global <--server> and <--masterport>
     options on the command line; note that agent nodes listen on port 8139.
   EOT
   find.short_description <<-EOT

data/lib/puppet/feature/external_facts.rb

@@ -1,5 +1,5 @@
-require 'facter/util/config'
+require 'facter'
 
 Puppet.features.add(:external_facts) {
-   Facter::Util::Config.respond_to?(:external_facts_dirs=)
+  Facter.respond_to?(:search_external)
 }

data/lib/puppet/feature/libuser.rb

@@ -4,5 +4,5 @@ require 'puppet/util/libuser'
 Puppet.features.add(:libuser) {
    File.executable?("/usr/sbin/lgroupadd") and
    File.executable?("/usr/sbin/luseradd")  and
-   Puppet::FileSystem::File.exist?(Puppet::Util::Libuser.getconf)
+   Puppet::FileSystem.exist?(Puppet::Util::Libuser.getconf)
 }

data/lib/puppet/feature/msgpack.rb

@@ -1 +1,3 @@
+require 'puppet/util/feature'
+
 Puppet.features.add(:msgpack, :libs => ["msgpack"])

data/lib/puppet/feature/rails.rb

@@ -24,11 +24,11 @@ Puppet.features.add(:rails) do
     require 'active_record'
     require 'active_record/version'
   rescue LoadError
-    if Puppet::FileSystem::File.exist?("/usr/share/rails")
+    if Puppet::FileSystem.exist?("/usr/share/rails")
       count = 0
       Dir.entries("/usr/share/rails").each do |dir|
         libdir = File.join("/usr/share/rails", dir, "lib")
-        if Puppet::FileSystem::File.exist?(libdir) and ! $LOAD_PATH.include?(libdir)
+        if Puppet::FileSystem.exist?(libdir) and ! $LOAD_PATH.include?(libdir)
           count += 1
           $LOAD_PATH << libdir
         end

data/lib/puppet/file_bucket/dipper.rb

@@ -31,9 +31,9 @@ class Puppet::FileBucket::Dipper
 
   # Back up a file to our bucket
   def backup(file)
-    file_handle = Puppet::FileSystem::File.new(file)
-    raise(ArgumentError, "File #{file} does not exist") unless file_handle.exist?
-    contents = file_handle.binread
+    file_handle = Puppet::FileSystem.pathname(file)
+    raise(ArgumentError, "File #{file} does not exist") unless Puppet::FileSystem.exist?(file_handle)
+    contents = Puppet::FileSystem.binread(file_handle)
     begin
       file_bucket_file = Puppet::FileBucket::File.new(contents, :bucket_path => @local_path)
       files_original_path = absolutize_path(file)
@@ -50,7 +50,7 @@ class Puppet::FileBucket::Dipper
     rescue => detail
       message = "Could not back up #{file}: #{detail}"
       Puppet.log_exception(detail, message)
-      raise Puppet::Error, message
+      raise Puppet::Error, message, detail.backtrace
     end
   end
 
@@ -66,9 +66,9 @@ class Puppet::FileBucket::Dipper
   # Restore the file
   def restore(file,sum)
     restore = true
-    file_handle = Puppet::FileSystem::File.new(file)
-    if file_handle.exist?
-      cursum = Digest::MD5.hexdigest(file_handle.binread)
+    file_handle = Puppet::FileSystem.pathname(file)
+    if Puppet::FileSystem.exist?(file_handle)
+      cursum = Digest::MD5.hexdigest(Puppet::FileSystem.binread(file_handle))
 
       # if the checksum has changed...
       # this might be extra effort
@@ -81,8 +81,8 @@ class Puppet::FileBucket::Dipper
       if newcontents = getfile(sum)
         newsum = Digest::MD5.hexdigest(newcontents)
         changed = nil
-        if file_handle.exist? and ! file_handle.writable?
-          changed = Puppet::FileSystem::File.new(file).stat.mode
+        if Puppet::FileSystem.exist?(file_handle) and ! Puppet::FileSystem.writable?(file_handle)
+          changed = Puppet::FileSystem.stat(file_handle).mode
           ::File.chmod(changed | 0200, file)
         end
         ::File.open(file, ::File::WRONLY|::File::TRUNC|::File::CREAT) { |of|

data/lib/puppet/file_bucket/file.rb

@@ -69,20 +69,24 @@ class Puppet::FileBucket::File
     self.new(contents)
   end
 
+  def to_data_hash
+    { "contents" => contents }
+  end
+
+  def self.from_data_hash(data)
+    self.new(data["contents"])
+  end
+
   def to_pson
     Puppet.deprecation_warning("Serializing Puppet::FileBucket::File objects to pson is deprecated.")
     to_data_hash.to_pson
   end
 
-  def to_data_hash
-    { "contents" => contents }
-  end
-
   # This method is deprecated, but cannot be removed for awhile, otherwise
   # older agents sending pson couldn't backup to filebuckets on newer masters
   def self.from_pson(pson)
     Puppet.deprecation_warning("Deserializing Puppet::FileBucket::File objects from pson is deprecated. Upgrade to a newer version.")
-    self.new(pson["contents"])
+    self.from_data_hash(pson)
   end
 
 end

data/lib/puppet/file_serving/base.rb

@@ -68,7 +68,7 @@ class Puppet::FileServing::Base
   # Stat our file, using the appropriate link-sensitive method.
   def stat
     @stat_method ||= self.links == :manage ? :lstat : :stat
-    Puppet::FileSystem::File.new(full_path).send(@stat_method)
+    Puppet::FileSystem.send(@stat_method, full_path)
   end
 
   def to_data_hash

data/lib/puppet/file_serving/configuration.rb

@@ -88,7 +88,7 @@ class Puppet::FileServing::Configuration
   def readconfig(check = true)
     config = Puppet[:fileserverconfig]
 
-    return unless Puppet::FileSystem::File.exist?(config)
+    return unless Puppet::FileSystem.exist?(config)
 
     @parser ||= Puppet::FileServing::Configuration::Parser.new(config)
 

data/lib/puppet/file_serving/configuration/parser.rb

@@ -7,7 +7,7 @@ class Puppet::FileServing::Configuration::Parser
 
   # Parse our configuration file.
   def parse
-    raise("File server configuration #{@file} does not exist") unless Puppet::FileSystem::File.exist?(@file)
+    raise("File server configuration #{@file} does not exist") unless Puppet::FileSystem.exist?(@file)
     raise("Cannot read file server configuration #{@file}") unless FileTest.readable?(@file)
 
     @mounts = {}
@@ -37,10 +37,10 @@ class Puppet::FileServing::Configuration::Parser
           when "deny"
             deny(mount, value)
           else
-            raise ArgumentError.new("Invalid argument '#{var}'", @count, @file)
+            raise ArgumentError.new("Invalid argument '#{var}' in #{@file.filename}, line #{@count}")
           end
         else
-          raise ArgumentError.new("Invalid line '#{line.chomp}'", @count, @file)
+          raise ArgumentError.new("Invalid line '#{line.chomp}' at #{@file.filename}, line #{@count}")
         end
       }
     }

data/lib/puppet/file_serving/content.rb

@@ -23,7 +23,7 @@ class Puppet::FileServing::Content < Puppet::FileServing::Base
 
   # BF: we used to fetch the file content here, but this is counter-productive
   # for puppetmaster streaming of file content. So collect just returns itself
-  def collect
+  def collect(source_permissions = nil)
     return if stat.ftype == "directory"
     self
   end
@@ -34,7 +34,7 @@ class Puppet::FileServing::Content < Puppet::FileServing::Base
       # This stat can raise an exception, too.
       raise(ArgumentError, "Cannot read the contents of links unless following links") if stat.ftype == "symlink"
 
-      @content = Puppet::FileSystem::File.new(full_path).binread
+      @content = Puppet::FileSystem.binread(full_path)
     end
     @content
   end

data/lib/puppet/file_serving/fileset.rb

@@ -70,7 +70,7 @@ class Puppet::FileServing::Fileset
 
   def ignore=(values)
     values = [values] unless values.is_a?(Array)
-    @ignore = values
+    @ignore = values.collect(&:to_s)
   end
 
   def links=(links)
@@ -88,7 +88,7 @@ class Puppet::FileServing::Fileset
       begin
         send(method, value)
       rescue NoMethodError
-        raise ArgumentError, "Invalid option '#{option}'"
+        raise ArgumentError, "Invalid option '#{option}'", $!.backtrace
       end
     end
   end
@@ -133,7 +133,7 @@ class Puppet::FileServing::Fileset
     end
 
     def directory?
-      Puppet::FileSystem::File.new(path).send(stat_method).directory?
+      Puppet::FileSystem.send(stat_method, path).directory?
     rescue Errno::ENOENT, Errno::EACCES
       false
     end
@@ -159,7 +159,7 @@ class Puppet::FileServing::Fileset
   end
 
   def valid?(path)
-    Puppet::FileSystem::File.new(path).send(@stat_method)
+    Puppet::FileSystem.send(@stat_method, path)
     true
   rescue Errno::ENOENT, Errno::EACCES
     false

data/lib/puppet/file_serving/metadata.rb

@@ -25,13 +25,24 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
   class MetaStat
     extend Forwardable
 
-    def initialize(stat)
+    def initialize(stat, source_permissions = nil)
       @stat = stat
+      @source_permissions_ignore = source_permissions == :ignore
     end
 
-    def_delegator :@stat, :uid, :owner
-    def_delegator :@stat, :gid, :group
-    def_delegators :@stat, :mode, :ftype
+    def owner
+      @source_permissions_ignore ? Process.euid : @stat.uid
+    end
+
+    def group
+      @source_permissions_ignore ? Process.egid : @stat.gid
+    end
+
+    def mode
+      @source_permissions_ignore ? 0644 : @stat.mode
+    end
+
+    def_delegators :@stat, :ftype
   end
 
   class WindowsStat < MetaStat
@@ -39,8 +50,8 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
       require 'puppet/util/windows/security'
     end
 
-    def initialize(stat, path)
-      super(stat)
+    def initialize(stat, path, source_permissions = nil)
+      super(stat, source_permissions)
       @path = path
     end
 
@@ -49,28 +60,66 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
       :mode => 0644
     }.each do |method, default_value|
       define_method method do
-        Puppet::Util::Windows::Security.send("get_#{method}", @path) || default_value
+        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
       end
     end
   end
 
-  def collect_stat(path)
+  def collect_stat(path, source_permissions)
     stat = stat()
 
     if Puppet.features.microsoft_windows?
-      WindowsStat.new(stat, path)
+      WindowsStat.new(stat, path, source_permissions)
     else
-      MetaStat.new(stat)
+      MetaStat.new(stat, source_permissions)
     end
   end
 
   # Retrieve the attributes for this file, relative to a base directory.
-  # Note that Puppet::FileSystem::File.new(path).stat raises Errno::ENOENT
+  # Note that Puppet::FileSystem.stat(path) raises Errno::ENOENT
   # if the file is absent and this method does not catch that exception.
-  def collect
+  def collect(source_permissions = nil)
     real_path = full_path
 
-    stat = collect_stat(real_path)
+    stat = collect_stat(real_path, source_permissions)
     @owner = stat.owner
     @group = stat.group
     @ftype = stat.ftype
@@ -85,7 +134,7 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
       @checksum_type = "ctime"
       @checksum = ("{#{@checksum_type}}") + send("#{@checksum_type}_file", path).to_s
     when "link"
-      @destination = Puppet::FileSystem::File.new(real_path).readlink
+      @destination = Puppet::FileSystem.readlink(real_path)
       @checksum = ("{#{@checksum_type}}") + send("#{@checksum_type}_file", real_path).to_s rescue nil
     else
       raise ArgumentError, "Cannot manage files of type #{stat.ftype}"
@@ -123,6 +172,10 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
     )
   end
 
+  def self.from_data_hash(data)
+    new(data.delete('path'), data)
+  end
+
   PSON.register_document_type('FileMetadata',self)
   def to_pson_data_hash
     {
@@ -139,7 +192,8 @@ class Puppet::FileServing::Metadata < Puppet::FileServing::Base
   end
 
   def self.from_pson(data)
-    new(data.delete('path'), 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/file.rb

@@ -22,7 +22,7 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
 
     file = ::File.join(full_path, relative_path)
 
-    if !(Puppet::FileSystem::File.exist?(file) or Puppet::FileSystem::File.new(file).symlink?)
+    if !(Puppet::FileSystem.exist?(file) or Puppet::FileSystem.symlink?(file))
       Puppet.info("File does not exist or is not accessible: #{file}")
       return nil
     end