fix insecure tempfiles

- modernizes all the tempfile code as well

1 files changed, 8 insertions, 12 deletions

diff --git a/lib/chef/knife/core/node_editor.rb b/lib/chef/knife/core/node_editor.rb
index 7707743ce5..2fe090d114 100644
--- a/lib/chef/knife/core/node_editor.rb
+++ b/lib/chef/knife/core/node_editor.rb
@@ -18,6 +18,7 @@
 
 require 'chef/json_compat'
 require 'chef/node'
+require 'tempfile'
 
 class Chef
   class Knife
@@ -109,20 +110,15 @@ class Chef
       end
 
       def tempfile_for(data)
-        # TODO: include useful info like the node name in the temp file
-        # name
-        basename = "knife-edit-" << rand(1_000_000_000_000_000).to_s.rjust(15, '0') << '.json'
-        filename = File.join(Dir.tmpdir, basename)
-        File.open(filename, "w+") do |f|
-          f.sync = true
-          f.puts data
-        end
+        Tempfile.new([ 'knife-edit-', '.json' ]) do |file|
+          file.sync = true
+          file.puts data
+          file.close
 
-        yield filename
+          yield file.path
 
-        IO.read(filename)
-      ensure
-        File.unlink(filename)
+          IO.read(file.path)
+        end
       end
     end
   end