win32-security 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24c9e39da5dad049f0d5458344d7e260d3827657
-  data.tar.gz: 58219464a85da5b713726db30ad824bd9799bfb8
+  metadata.gz: 55e26f7dee9565c7f2bbcb65430d048ee8fde06e
+  data.tar.gz: f56540e1e2536ad249d493f772b12ff132797cec
 SHA512:
-  metadata.gz: e4aa6445f22883bdf06b1538e0d08480f9cb0b36e33844c58f645816ac1d74cacff3edc81e04c4c40d6ceae9caf57a101de263837c34e3f1bfadf7bf40f00c18
-  data.tar.gz: 839ff7dcc84f298254c7813668bbcf8ed819193be4268b3608255fc21d9dd1f987abab833c8df72c1ed085b18fe8df9b927cf5c7c8de2cd9c40da21bae771562
+  metadata.gz: 7c2956d92cbcce0951f7b67150bdd324754e42c8faac2d5e2068e25d2bada7d12588c44775bb1c6d427415f0965f8792473a7c98c0ff57925b1f2861e0b2b605
+  data.tar.gz: e9676d488e07a8648b5e19227e5a396bb815b1377740044ac68e479bfc2489019a5fcf818ece2f63f70a4afd03788b820973c4d292d65975f83c8ff9a03ab193

data/CHANGES

@@ -1,3 +1,7 @@
+== 0.2.5 - 24-Feb-2014
+* Fixed a bug in the SID#string_to_sid method. Thanks go to Rob Reynolds
+  for the spot.
+
 == 0.2.4 - 8-Nov-2013
 * Added rake as a development dependency.
 * Attempted to make FFI related constants and structs more private.

data/README

@@ -20,8 +20,9 @@
   repo if you're interested in taking a look.
    
 == Known Issues
-  None that I'm aware of. Please file any bug reports on the project page
-  at http://www.rubyforge.org/projects/win32utils.
+  None that I'm aware of. Please file any bug reports on the project page at:
+
+  https://github.com/djberg96/win32-security
 
 == Contributions
   Although this library is free, please consider having your company
@@ -33,7 +34,7 @@
   Artistic 2.0
     
 == Copyright
-  (C) 2003-2013 Daniel J. Berger
+  (C) 2003-2014 Daniel J. Berger
   All Rights Reserved
     
 == Authors

data/lib/win32/security.rb

@@ -20,7 +20,7 @@ module Win32
     extend Windows::Security::Functions
 
     # The version of the win32-security library
-    VERSION = '0.2.4'
+    VERSION = '0.2.5'
 
     # Used by OpenProcessToken
     TOKEN_QUERY = 8
@@ -60,14 +60,14 @@ module Win32
 
         pbool.read_long != 0
       else
-        token = FFI::MemoryPointer.new(:ulong)
+        token = FFI::MemoryPointer.new(:uintptr_t)
 
         unless OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, token)
           raise SystemCallError.new("OpenProcessToken", FFI.errno)
         end
 
         begin
-          token = token.read_ulong
+          token = token.read_pointer.to_i
 
           # Since the TokenElevation struct only has 1 member, we use a pointer.
           te = FFI::MemoryPointer.new(:ulong)

data/lib/win32/security/sid.rb

@@ -17,7 +17,7 @@ module Win32
       extend Windows::Security::Functions
 
       # The version of the Win32::Security::SID class.
-      VERSION = '0.2.0'
+      VERSION = '0.2.1'
 
       # Some constant SID's for your convenience, in string format.
       # See http://support.microsoft.com/kb/243330 for details.
@@ -96,7 +96,9 @@ module Win32
           raise SystemCallError.new("ConvertStringSidToSid", FFI.errno)
         end
 
-        sid.read_pointer.read_string
+        ptr = sid.read_pointer
+
+        ptr.read_bytes(GetLengthSid(ptr))
       end
 
       # Creates a new SID with +authority+ and up to 8 +subauthorities+,
@@ -172,7 +174,7 @@ module Win32
       def initialize(account=nil, host=Socket.gethostname)
         if account.nil?
           begin
-            ptoken = FFI::MemoryPointer.new(:ulong)
+            ptoken = FFI::MemoryPointer.new(:uintptr_t)
 
             # Try the thread token first, default to the process token.
             bool = OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, true, ptoken)
@@ -180,13 +182,13 @@ module Win32
             if !bool && FFI.errno != ERROR_NO_TOKEN
               raise SystemCallError.new("OpenThreadToken", FFI.errno)
             else
-              ptoken = FFI::MemoryPointer.new(:ulong)
+              ptoken = FFI::MemoryPointer.new(:uintptr_t)
               unless OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, ptoken)
                 raise SystemCallError.new("OpenProcessToken", FFI.errno)
               end
             end
 
-            token = ptoken.read_ulong
+            token = ptoken.read_pointer.to_i
             pinfo = FFI::MemoryPointer.new(:pointer)
             plength = FFI::MemoryPointer.new(:ulong)
 

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

@@ -18,6 +18,7 @@ module Windows
       typedef :pointer, :ptr
 
       ffi_lib :kernel32
+      ffi_convention :stdcall
 
       enum :token_info_class, [
         :TokenUser, 1,

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.2.4', Win32::Security::VERSION)
+    assert_equal('0.2.5', 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.0', Security::SID::VERSION)
+    assert_equal('0.2.1', Security::SID::VERSION)
   end
 
   test "sid method basic functionality" do
@@ -59,6 +59,11 @@ class TC_Win32_Security_Sid < Test::Unit::TestCase
     assert_kind_of(String, Security::SID.string_to_sid(@sid.to_s))
   end
 
+  test "we can convert back and forth between a sid and a string" do
+    str = Security::SID.sid_to_string(@sid.sid)
+    assert_equal(@sid.sid, Security::SID.string_to_sid(str))
+  end
+
   test "to_s works as expected" do
     assert_respond_to(@sid, :to_s)
     assert_kind_of(String, @sid.to_s)

data/win32-security.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-security'
-  spec.version    = '0.2.4'
+  spec.version    = '0.2.5'
   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-security
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2014-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi