puppet 0.24.8 → 0.24.9

data/lib/puppet/type/augeas.rb

@@ -58,7 +58,9 @@ Puppet::Type.newtype(:augeas) do
     end
 
     newparam (:context) do
-        desc "Optional context path. This value is pre-pended to the paths of all changes"
+        desc "Optional context path. This value is pre-pended to the paths of all changes if the
+              path is relative. So a path specified as /files/foo will not be prepended with the
+              context whild files/foo will be prepended"
         defaultto ""
     end
 
@@ -69,7 +71,8 @@ Puppet::Type.newtype(:augeas) do
                get [AUGEAS_PATH] [COMPARATOR] [STRING]
                match [MATCH_PATH] size [COMPARATOR] [INT]
                match [MATCH_PATH] include [STRING]
-               match [MATCH_PATH] == [AN_ARRAY]
+               match [MATCH_PATH] eq [AN_ARRAY]
+               match [MATCH_PATH] noteq [AN_ARRAY]               
 
              where::
 
@@ -97,10 +100,6 @@ Puppet::Type.newtype(:augeas) do
           insert [LABEL] [WHERE] [PATH]
                                  Synonym for ins
         If the parameter 'context' is set that value is prepended to PATH"
-
-        munge do |value|
-            provider.parse_commands(value)
-        end
     end
 
 

data/lib/puppet/util.rb

@@ -429,6 +429,28 @@ module Util
     end
 
     module_function :memory, :thinmark
+
+    def secure_open(file,must_be_w,&block)
+        raise Puppet::DevError,"secure_open only works with mode 'w'" unless must_be_w == 'w'
+        raise Puppet::DevError,"secure_open only requires a block"    unless block_given?
+        Puppet.warning "#{file} was a symlink to #{File.readlink(file)}" if File.symlink?(file)
+        if File.exists?(file) or File.symlink?(file)
+            wait = File.symlink?(file) ? 5.0 : 0.1
+            File.delete(file)
+            sleep wait # give it a chance to reappear, just in case someone is actively trying something.
+        end
+        begin
+            File.open(file,File::CREAT|File::EXCL|File::TRUNC|File::WRONLY,&block)
+        rescue Errno::EEXIST
+            desc = File.symlink?(file) ? "symlink to #{File.readlink(file)}" : File.stat(file).ftype
+            puts "Warning: #{file} was apparently created by another process (as"
+            puts "a #{desc}) as soon as it was deleted by this process.  Someone may be trying"
+            puts "to do something objectionable (such as tricking you into overwriting system"
+            puts "files if you are running as root)."
+            raise
+        end
+    end
+    module_function :secure_open
 end
 end
 

data/lib/puppet/util/reference.rb

@@ -36,7 +36,7 @@ class Puppet::Util::Reference
 
     def self.pdf(text)
         puts "creating pdf"
-        File.open("/tmp/puppetdoc.txt", "w") do |f|
+        Puppet::Util.secure_open("/tmp/puppetdoc.txt", "w") do |f|
             f.puts text
         end
         rst2latex = %x{which rst2latex}
@@ -48,6 +48,7 @@ class Puppet::Util::Reference
         end
         rst2latex.chomp!
         cmd = %{#{rst2latex} /tmp/puppetdoc.txt > /tmp/puppetdoc.tex}
+        Puppet::Util.secure_open('/tmp/puppetdoc.tex','w') {}
         output = %x{#{cmd}}
         unless $? == 0
             $stderr.puts "rst2latex failed"
@@ -168,7 +169,7 @@ class Puppet::Util::Reference
     end
 
     def trac
-        File.open("/tmp/puppetdoc.txt", "w") do |f|
+        Puppet::Util.secure_open("/tmp/puppetdoc.txt", "w") do |f|
             f.puts self.to_trac
         end
 

data/spec/monkey_patches/add_confine_and_runnable_to_rspec_dsl.rb

@@ -19,7 +19,7 @@ module Spec
                         warn "Skipping unsuitable example group %s: %s" % [example_group.description, example_group.messages.join(", ")]
                         next
                     end
-                    success = success & example_group.run
+                    success = success & example_group.run(@options)
                 end
                 return success
             ensure

data/spec/spec_helper.rb

@@ -17,6 +17,7 @@ end
 require 'puppettest'
 require 'puppettest/runnable_test'
 require 'mocha'
+gem 'rspec', '=1.2.2'
 require 'spec'
 
 # load any monkey-patches