win32-file-security 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d234ea5f580422f9afe3ca568dca698212b4c31c
-  data.tar.gz: a3bee9399b1407bc23609a44315194cb361ef9c3
+  metadata.gz: 6c24eb63a2d55e6fcf4ee4b4c4769f76f48be445
+  data.tar.gz: ab52ba7a0c646b38879a515e15f2df5689f084cb
 SHA512:
-  metadata.gz: 3e119edd6768169b2b37995be0656b59d3dbf304eedc2ba7f1ddffa4d3f130d3519e6cbf1cbe6e918813a04cf0049820630c3c71c23093603f5f2be19b7308ec
-  data.tar.gz: f3e9124fdd6acaea83dfd678ad150ea057695e2e600cfa443047776efa4877ae0b59c3c40975be6404dd0e59eb72e5f96696230f99d020754a2c78ec3e8b18f7
+  metadata.gz: 7c8dc91168b6eb32ced302c3c3f4336aabdeb40819187fb233db82e64b5aeb95f769feebf6127a6a0f1c48aad32719ba8cd7026b41c6b72c3de1252aea5a682b
+  data.tar.gz: ea1905dce18c874e5dce984265c90d0ad8cf51df042af8b4af54a34811c331122f58abf0d695e999ec2d87bbb7612b26f8737a2868abd2d2bac53413861a50d2

data/CHANGES

@@ -1,3 +1,10 @@
+= 1.0.6 - 28-May-2015
+* Handle the possibility of an empty/nil domain. Thanks go to n-nishizawa
+  for the spot.
+* Helper methods are only defined if not already defined.
+* Tests that were failing when run as admins in non-domain environments have
+  been modified to check for a domain first.
+
 = 1.0.5 - 2-May-2015
 * Added the File.supports_acls? singleton method.
 * The File.get_permissions and File.set_permissions methods now explicitly

data/README

@@ -35,7 +35,7 @@
   Artistic 2.0
 
 == Copyright
-  (C) 2003-2014, Daniel J. Berger, All Rights Reserved
+  (C) 2003-2015, Daniel J. Berger, All Rights Reserved
 
 == Warranty
   This package is provided "as is" and without any express or

data/lib/win32/file/security.rb

@@ -12,7 +12,7 @@ class File
   extend Windows::File::Functions
 
   # The version of the win32-file library
-  WIN32_FILE_SECURITY_VERSION = '1.0.5'
+  WIN32_FILE_SECURITY_VERSION = '1.0.6'
 
   class << self
     remove_method(:chown)
@@ -314,10 +314,16 @@ class File
 
           # The x2 multiplier is necessary due to wide char strings.
           name = name.read_string(name_size.read_ulong * 2).wstrip
-          domain = domain.read_string(domain_size.read_ulong * 2).wstrip
 
-          unless domain.empty?
-            name = domain + '\\' + name
+          dsize = domain_size.read_ulong
+
+          # It's possible there is no domain.
+          if dsize > 0
+            domain = domain.read_string(dsize * 2).wstrip
+
+            unless domain.empty?
+              name = domain + '\\' + name
+            end
           end
 
           perms_hash[name] = access[:Mask]

data/lib/win32/file/security/helper.rb

@@ -1,13 +1,23 @@
 class String
-  # Convenience method for converting strings to UTF-16LE for wide character
-  # functions that require it.
-  def wincode
-    (self.tr(File::SEPARATOR, File::ALT_SEPARATOR) + 0.chr).encode('UTF-16LE')
+  unless instance_methods.include?(:wincode)
+    # Convenience method for converting strings to UTF-16LE for wide character
+    # functions that require it.
+    def wincode
+      unless encoding == Encoding::UTF_16LE
+        (self.tr(File::SEPARATOR, File::ALT_SEPARATOR) + 0.chr).encode('UTF-16LE')
+      end
+    end
   end
 
-  # Read a wide character string up until the first double null, and delete
-  # any remaining null characters.
-  def wstrip
-    self.force_encoding('UTF-16LE').encode('UTF-8',:invalid=>:replace,:undef=>:replace).split("\x00")[0].encode(Encoding.default_external)
+  unless instance_methods.include?(:wstrip)
+    # Read a wide character string up until the first double null, and delete
+    # any remaining null characters.
+    def wstrip
+      unless encoding == Encoding::UTF_16LE
+        self.force_encoding('UTF-16LE')
+      end
+
+      self.encode('UTF-8',:invalid=>:replace,:undef=>:replace).split("\x00")[0].encode(Encoding.default_external)
+    end
   end
 end

data/test/test_win32_file_security_ownership.rb

@@ -12,6 +12,21 @@ require 'win32/file/security'
 require 'pathname'
 
 class TC_Win32_File_Security_Ownership < Test::Unit::TestCase
+  extend FFI::Library
+  ffi_lib :netapi32
+  attach_function :NetGetDCName, [:pointer, :pointer, :buffer_out], :int
+  attach_function :NetApiBufferFree, [:pointer], :int
+
+  # Helper method to determine if we're on a domain controller
+  def self.in_domain?
+    bool = true
+    buf = (0.chr * 256).encode('UTF-16LE')
+    rv = NetGetDCName(nil, nil, buf)
+    bool = false if rv != 0
+    NetApiBufferFree(buf)
+    bool
+  end
+
   def self.startup
     Dir.chdir(File.dirname(File.expand_path(File.basename(__FILE__))))
     @@file = File.join(Dir.pwd, 'ownership_test.txt')
@@ -19,6 +34,7 @@ class TC_Win32_File_Security_Ownership < Test::Unit::TestCase
     @@host  = Socket.gethostname
     @@temp  = "Temp"
     @@login = Etc.getlogin
+    @@domain = in_domain?
 
     if Win32::Security.elevated_security?
       Sys::Admin.add_user(:name => @@temp, :description => "Delete Me")
@@ -81,7 +97,7 @@ class TC_Win32_File_Security_Ownership < Test::Unit::TestCase
   end
 
   test "grpowned? method returns expected result" do
-    if Win32::Security.elevated_security?
+    if Win32::Security.elevated_security? && @@domain
       assert_false(File.grpowned?(@@file))
     else
       assert_true(File.grpowned?(@@file))
@@ -101,7 +117,7 @@ class TC_Win32_File_Security_Ownership < Test::Unit::TestCase
   end
 
   test "group method returns the expected value" do
-    if Win32::Security.elevated_security?
+    if Win32::Security.elevated_security? && @@domain
       expected = "BUILTIN\\Administrators"
     else
       expected = @@host + "\\None"
@@ -153,5 +169,6 @@ class TC_Win32_File_Security_Ownership < Test::Unit::TestCase
     @@file = nil
     @@login = nil
     @@host = nil
+    @@domain = nil
   end
 end

data/test/test_win32_file_security_version.rb

@@ -8,6 +8,6 @@ require 'win32/file/security'
 
 class TC_Win32_File_Security_Version < Test::Unit::TestCase
   test "version is set to expected value" do
-    assert_equal('1.0.5', File::WIN32_FILE_SECURITY_VERSION)
+    assert_equal('1.0.6', File::WIN32_FILE_SECURITY_VERSION)
   end
 end

data/win32-file-security.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-file-security'
-  spec.version    = '1.0.5'
+  spec.version    = '1.0.6'
   spec.authors    = ['Daniel J. Berger', 'Park Heesob']
   spec.license    = 'Artistic 2.0'
   spec.email      = 'djberg96@gmail.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-file-security
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-25 00:00:00.000000000 Z
+date: 2015-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi