win32-security 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b99c41fd2bd78061d9b7b6fcb39816de3384c561
-  data.tar.gz: d11ca28544ad66864128d6000d3edde7f529fa74
+  metadata.gz: 17acf08fb33a5a5e6f014622ae6425fa14773c3d
+  data.tar.gz: b866473ff81aaa20bbf5ffb6ba4b60726ccdd6a0
 SHA512:
-  metadata.gz: 8fe3a69f36067b039c6bd86b0fd2dd0d018dd6afa57c0aa2c6beb30ebae232ed30fffdce8c0e4581c390718fce52e4aea18eb8fb8086f303e236783a27c242b6
-  data.tar.gz: e0b2987762703a34b80a32bfb7057c7f47f65328f7da9ed9dfea2c4607bb4320827583723065b4d17b1f3462f1e42ef641c8d4c9f1763ac71d1a1171be83e5bc
+  metadata.gz: 35d37cbe3d106ba3ff620b7302273f3ec7184cbb25fbf20a540be2cd356a619232906cb62b8977114c7ffc1724caedd652c0c1d100a4544b92ba3c3f7cf0e872
+  data.tar.gz: a5219e4dd547d6db64dc7042d214ab5c37d913014c21c1ce92af6c7c10289f8d02671b6681890f6a03d8db772380534763fbee6049c0f1b66408c9f8b87e16f9

data/CHANGES

@@ -1,3 +1,14 @@
+== 0.4.1 - 9-May-2016
+* Added the ffi-win32-extensions dependency, and removed the helper file.
+* The SID.new method is now a bit more flexible with regards to failures of
+  the OpenThreadToken function. It now just defaults to OpenProcessToken no
+  matter what, if it can.
+* The Security.elevated_security? method is now more robust, using a double
+  pass approach.
+* The above fixes were mainly to resolve issues on cygwin64. Thanks go to
+  Tobias Hochg�rtel and Wouter Scheele for raising the issues and providing
+  providing patches (for both this library and cygwin64 + ffi).
+
 == 0.4.0 - 7-Mar-2016
 * Added wide character support. Thanks go to Ethan J. Brown for finally forcing
   me to get around to this.

data/MANIFEST

@@ -7,5 +7,8 @@
 * lib/win32-security.rb
 * lib/win32/security.rb
 * lib/win32/security/sid.rb
+* lib/win32/security/windows/constants.rb
+* lib/win32/security/windows/functions.rb
+* lib/win32/security/windows/structs.rb
 * test/test_security.rb
 * test/test_sid.rb

data/lib/win32/security.rb

@@ -1,10 +1,10 @@
 # This file allows users to require all security related classes from
 # a single file, instead of having to require individual files.
 
+require 'ffi/win32/extensions'
 require_relative 'security/windows/constants'
 require_relative 'security/windows/structs'
 require_relative 'security/windows/functions'
-require_relative 'security/windows/helper'
 
 # The Win32 module serves as a namespace only.
 module Win32
@@ -21,7 +21,7 @@ module Win32
     extend Windows::Security::Functions
 
     # The version of the win32-security library
-    VERSION = '0.4.0'
+    VERSION = '0.4.1'
 
     # Used by OpenProcessToken
     TOKEN_QUERY = 8
@@ -41,14 +41,14 @@ module Win32
 
       FFI::MemoryPointer.new(ptr_type) do |token|
         unless OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, token)
-          raise SystemCallError.new("OpenProcessToken", FFI.errno)
+          FFI.raise_windows_error('OpenProcessToken')
         end
 
         begin
           token = token.read_pointer.to_i
 
           # Since the TokenElevation struct only has 1 member, we use a pointer.
-          te = FFI::MemoryPointer.new(:ulong)
+          te = FFI::MemoryPointer.new(:pointer)
           rl = FFI::MemoryPointer.new(:ulong)
 
           bool = GetTokenInformation(
@@ -59,9 +59,22 @@ module Win32
             rl
           )
 
-          raise SystemCallError.new("GetTokenInformation", FFI.errno) unless bool
+          te.free
+          te = FFI::MemoryPointer.new(rl.read_ulong)
+          rl.clear
+
+          bool = GetTokenInformation(
+            token,
+            :TokenElevation,
+            te,
+            te.size,
+            rl
+          )
+
+          FFI.raise_windows_error('GetTokenInformation') unless bool
 
-          result = te.read_ulong != 0
+          token_info = rl.read_ulong == 4 ? te.read_uint : te.read_ulong
+          result = token_info != 0
         ensure
           CloseHandle(token)
           te.free
@@ -79,7 +92,7 @@ module Win32
       ver[:dwOSVersionInfoSize] = ver.size
 
       unless GetVersionExA(ver)
-        raise SystemCallError.new("GetVersionEx", FFI.errno)
+        FFI.raise_windows_error('GetVersionEx')
       end
 
       ver[:dwMajorVersion]

data/lib/win32/security/acl.rb

@@ -12,7 +12,7 @@ module Win32
       extend Windows::Security::Functions
 
       # The version of the Win32::Security::ACL class.
-      VERSION = '0.2.0'
+      VERSION = '0.2.1'
 
       # The underlying ACL structure.
       attr_reader :acl
@@ -28,7 +28,7 @@ module Win32
         acl = ACL_STRUCT.new
 
         unless InitializeAcl(acl, size, revision)
-          raise SystemCallError.new("InitializeAcl", FFI.errno)
+          FFI.raise_windows_error('InitializeAcl')
         end
 
         @acl = acl
@@ -41,7 +41,7 @@ module Win32
         info = ACL_SIZE_INFORMATION.new
 
         unless GetAclInformation(@acl, info, info.size, AclSizeInformation)
-          raise SystemCallError.new("GetAclInformation", FFI.errno)
+          FFI.raise_windows_error('GetAclInformation')
         end
 
         info[:AceCount]
@@ -54,7 +54,7 @@ module Win32
         info = ACL_SIZE_INFORMATION.new
 
         unless GetAclInformation(@acl, info, info.size, AclSizeInformation)
-          raise SystemCallError.new("GetAclInformation", FFI.errno)
+          FFI.raise_windows_error('GetAclInformation')
         end
 
         [info[:AclBytesInUse], info[:AclBytesFree]]
@@ -88,11 +88,11 @@ module Win32
 
         if flags
           unless AddAccessAllowedAceEx(@acl, @revision, flags, mask, sid)
-            raise SystemCallError.new("AddAccessAllowedAceEx", FFI.errno)
+            FFI.raise_windows_error('AddAccessAllowedAceEx')
           end
         else
           unless AddAccessAllowedAce(@acl, @revision, mask, sid)
-            raise SystemCallError.new("AddAccessAllowedAce", FFI.errno)
+            FFI.raise_windows_error('AddAccessAllowedAce')
           end
         end
 
@@ -122,11 +122,11 @@ module Win32
 
         if flags
           unless AddAccessDeniedAceEx(@acl, @revision, flags, mask, sid)
-            raise SystemCallError.new("AddAccessDeniedAceEx", FFI.errno)
+            FFI.raise_windows_error('AddAccessDeniedAceEx')
           end
         else
           unless AddAccessDeniedAce(@acl, @revision, mask, sid)
-            raise SystemCallError.new("AddAccessDeniedAce", FFI.errno)
+            FFI.raise_windows_error('AddAccessDeniedAce')
           end
         end
       end
@@ -140,7 +140,7 @@ module Win32
       #
       def add_ace(ace, index=MAXDWORD)
         unless AddAce(@acl, @revision, index, ace, ace.length)
-          raise SystemCallError.new("AddAce", FFI.errno)
+          FFI.raise_windows_error('AddAce')
         end
 
         index
@@ -153,7 +153,7 @@ module Win32
       #
       def delete_ace(index=MAXDWORD)
         unless DeleteAce(@acl, index)
-          raise SystemCallError.new("DeleteAce", FFI.errno)
+          FFI.raise_windows_error('DeleteAce')
         end
 
         index
@@ -172,11 +172,11 @@ module Win32
         FFI::MemoryPointer.new(:pointer) do |pptr|
           if index.nil?
             unless FindFirstFreeAce(@acl, pptr)
-              raise SystemCallError.new("FindFirstFreeAce", FFI.errno)
+              FFI.raise_windows_error('FindFirstFreeAce')
             end
           else
             unless GetAce(@acl, index, pptr)
-              raise SystemCallError.new("GetAce", FFI.errno)
+              FFI.raise_windows_error('GetAce')
             end
           end
 
@@ -205,7 +205,7 @@ module Win32
           buf.write_ulong(revision_level)
 
           unless SetAclInformation(@acl, buf, buf.size, AclRevisionInformation)
-            raise SystemCallError.new("SetAclInformation", FFI.errno)
+            FFI.raise_windows_error('SetAclInformation')
           end
         end
 

data/lib/win32/security/sid.rb

@@ -14,7 +14,7 @@ module Win32
       extend Windows::Security::Functions
 
       # The version of the Win32::Security::SID class.
-      VERSION = '0.2.3'
+      VERSION = '0.2.4'
 
       # Some constant SID's for your convenience, in string format.
       # See http://support.microsoft.com/kb/243330 for details.
@@ -79,7 +79,7 @@ module Win32
 
         FFI::MemoryPointer.new(:pointer) do |string_sid|
           unless ConvertSidToStringSid(sid, string_sid)
-            raise SystemCallError.new("ConvertSidToStringSid", FFI.errno)
+            FFI.raise_windows_error('ConvertSidToStringSid')
           end
 
           result = string_sid.read_pointer.read_string
@@ -95,7 +95,7 @@ module Win32
 
         FFI::MemoryPointer.new(:pointer) do |sid|
           unless ConvertStringSidToSid(string, sid)
-            raise SystemCallError.new("ConvertStringSidToSid", FFI.errno)
+            FFI.raise_windows_error('ConvertStringSidToSid')
           end
 
           ptr = sid.read_pointer
@@ -139,7 +139,7 @@ module Win32
           auth[:Value][5] = authority
 
           unless InitializeSid(sid, auth, sub_authorities.length)
-            raise SystemCallError.new("InitializeSid", FFI.errno)
+            FFI.raise_windows_error('InitializeSid')
           end
 
           sub_authorities.each_index do |i|
@@ -194,12 +194,10 @@ module Win32
             # Try the thread token first, default to the process token.
             bool = OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, 1, ptoken)
 
-            if !bool && FFI.errno != ERROR_NO_TOKEN
-              raise SystemCallError.new("OpenThreadToken", FFI.errno)
-            else
+            unless bool
               ptoken.clear
               unless OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, ptoken)
-                raise SystemCallError.new("OpenProcessToken", FFI.errno)
+                FFI.raise_windows_error('OpenProcessToken')
               end
             end
 
@@ -216,7 +214,7 @@ module Win32
 
             # Second pass, actual call (1 is TokenOwner)
             unless GetTokenInformation(token, 1, pinfo, pinfo.size, plength)
-              raise SystemCallError.new("GetTokenInformation", FFI.errno)
+              FFI.raise_windows_error('GetTokenInformation')
             end
 
             token_info = pinfo.read_pointer
@@ -248,7 +246,7 @@ module Win32
             use_ptr
           )
           unless bool
-            raise SystemCallError.new("LookupAccountSid", FFI.errno)
+            FFI.raise_windows_error('LookupAccountSid')
           end
         elsif ordinal_val < 10 # Assume it's a binary SID.
           account_ptr = FFI::MemoryPointer.from_string(account)
@@ -264,7 +262,7 @@ module Win32
           )
 
           unless bool
-            raise SystemCallError.new("LookupAccountSid", FFI.errno)
+            FFI.raise_windows_error('LookupAccountSid')
           end
 
           account_ptr.free
@@ -279,7 +277,7 @@ module Win32
             use_ptr
           )
           unless bool
-            raise SystemCallError.new("LookupAccountName", FFI.errno)
+            FFI.raise_windows_error('LookupAccountName')
           end
         end
 
@@ -318,7 +316,7 @@ module Win32
 
         FFI::MemoryPointer.new(:pointer) do |ptr|
           unless ConvertSidToStringSid(@sid, ptr)
-            raise SystemCallError.new("ConvertSidToStringSid", FFI.errno)
+            FFI.raise_windows_error('ConvertSidToStringSid')
           end
 
           string = ptr.read_pointer.read_string

data/lib/win32/security/windows/functions.rb

@@ -23,7 +23,7 @@ module Windows
         typedef :uintptr_t, :handle
       end
 
-      ffi_lib :kernel32
+      ffi_lib 'kernel32'
       ffi_convention :stdcall
 
       enum :token_info_class, [
@@ -76,7 +76,7 @@ module Windows
       attach_pfunc :GetLastError, [], :dword
       attach_pfunc :CloseHandle, [:dword], :bool
 
-      ffi_lib :advapi32
+      ffi_lib 'advapi32'
 
       attach_pfunc :AddAce, [:ptr, :dword, :dword, :ptr, :dword], :bool
       attach_pfunc :AddAccessAllowedAce, [:ptr, :dword, :dword, :ptr], :bool

data/test/test_security.rb

@@ -9,7 +9,7 @@ require 'win32/security'
 
 class TC_Win32_Security < Test::Unit::TestCase
   test "version constant is set to expected value" do
-    assert_equal('0.4.0', Win32::Security::VERSION)
+    assert_equal('0.4.1', Win32::Security::VERSION)
   end
 
   test "elevated security basic functionality" do

data/test/test_sid.rb

@@ -20,7 +20,7 @@ class TC_Win32_Security_Sid < Test::Unit::TestCase
   end
 
   test "version is set to expected value" do
-    assert_equal('0.2.3', Security::SID::VERSION)
+    assert_equal('0.2.4', Security::SID::VERSION)
   end
 
   test "sid method basic functionality" do
@@ -124,7 +124,7 @@ class TC_Win32_Security_Sid < Test::Unit::TestCase
   end
 
   test "constructor raises an error if an invalid account is passed" do
-    assert_raise(SystemCallError){ Security::SID.new('bogus') }
+    assert_raise(SystemCallError, Errno::ESRCH){ Security::SID.new('bogus') }
   end
 
   test "well known sid constants are defined" do

data/win32-security.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-security'
-  spec.version    = '0.4.0'
+  spec.version    = '0.4.1'
   spec.authors    = ['Daniel J. Berger', 'Park Heesob']
   spec.license    = 'Artistic 2.0'
   spec.email      = 'djberg96@gmail.com'
@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 1.9.3'
    
   spec.add_dependency('ffi')
+  spec.add_dependency('ffi-win32-extensions')
 
   spec.add_development_dependency('rake')
   spec.add_development_dependency('test-unit', '>= 2.5.0')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-security
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -31,7 +31,7 @@ cert_chain:
   EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
   tGSHgAmcLlkdGgan182qsE/4kKM=
   -----END CERTIFICATE-----
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -47,6 +47,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ffi-win32-extensions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +128,6 @@ files:
 - lib/win32/security/windows
 - lib/win32/security/windows/constants.rb
 - lib/win32/security/windows/functions.rb
-- lib/win32/security/windows/helper.rb
 - lib/win32/security/windows/structs.rb
 - lib/win32/security.rb
 - lib/win32-security.rb

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

@@ -1,10 +0,0 @@
-unless String.instance_methods.include?(:wstrip)
-  class String
-    def wstrip
-      self.force_encoding('UTF-16LE').encode('UTF-8',:invalid => :replace, :undef => :replace).
-      split("\x00")[0].encode(Encoding.default_external)
-    rescue
-      nil
-    end
-  end
-end