Enforce mode even with restrictive umask

drbrain · Aug 30, 2011 · d6aecd8 · d6aecd8
1 parent a544b50
commit d6aecd8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/lib/uuid.rb b/lib/uuid.rb
@@ -259,6 +259,9 @@ def initialize
       fail "Cannot determine MAC address from any available interface, tried with #{mac_address}" if @mac == 0
       @sequence = rand 0x10000
 
+      # Ensure the mode is respected, even with a restrictive umask
+      File.open(state_file, 'w') { |f| f.chmod(self.class.mode) } if state_file && !File.exists?(state_file)
+
       if state_file
         open_lock 'wb' do |io|
           write_state io

diff --git a/test/test-uuid.rb b/test/test-uuid.rb
@@ -17,6 +17,19 @@ def test_state_file_creation
     File.exist?(path)
   end
 
+  def test_state_file_creation_mode
+    UUID.class_eval{ @state_file = nil; @mode = nil }
+    UUID.state_file 0666
+    path = UUID.state_file
+    File.delete path if File.exist?(path)
+
+    old_umask = File.umask(0022)
+    UUID.new.generate
+    File.umask(old_umask)
+
+    assert_equal '0666', sprintf('%04o', File.stat(path).mode & 0777)
+  end
+
   def test_state_file_specify
     path = File.join("path", "to", "ruby-uuid")
     UUID.state_file = path