win32-security 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33ce1c2dc5905f666656e1e91ccccf4c68895071
-  data.tar.gz: 59d8f0ea5c8bed6db0ab4474ea6b8cf3bbdeaccf
+  metadata.gz: 4f0cdfb7c3954a89c3d2e4320f2c27fcd2311be6
+  data.tar.gz: 30b2df084b416d6822b3c975ad72d85f9e2d687a
 SHA512:
-  metadata.gz: 9f1644cbd1d6bf1072e8d9bb3844b55d200cb21a13876ffcae54ef46acdfe6046ca1e1bc19de33ef2fa12830ea6ac49ad1ca50d0cf6f8310bd84b514da01d576
-  data.tar.gz: 1e2ee6736e1f24390985c03b176f49da020128dc60846bb7f4eed91ab87f7b7e0c97ccf29f1e704f8a7714c8c72cfd00eaff4ed4cdb20108537c97c731d1f8f5
+  metadata.gz: 785d0356537d86bd64e486bf5981c1a1c22fe3abb85e0c43357bd9cdb43a642b7cdca141e6de33a6cd878d3b5349a6626523a82cc5985fdd1093f8e38b4c677f
+  data.tar.gz: bb52c0719a509d74f3372ae7f929a25e89eca96cacfa3be0f5da5c9c4b64979733b1d45685c41db6dd27fe516e3a0b560d8954a08f764b0de2e36eb76160a801

data/CHANGES

@@ -1,3 +1,9 @@
+== 0.3.3 - 1-Mar-2016
+* Fixed a potential bug in the Win32::Security::SID constructor. Thanks go
+  to nmeilick for the spot and patch.
+* This gem now requires Ruby 1.9.3 or later.
+* Added some SID tests.
+
 == 0.3.2 - 4-Dec-2015
 * This gem is now signed.
 * Added a win32-security.rb file for convenience.

data/README

@@ -37,15 +37,15 @@
 
 == Contributions
   Although this library is free, please consider having your company
-  setup a gittip if used by your company professionally.
+  setup a tip if used by your company professionally.
 
-  http://www.gittip.com/djberg96/
+  https://gratipay.com/~djberg96/
 
 == License
   Artistic 2.0
     
 == Copyright
-  (C) 2003-2015 Daniel J. Berger
+  (C) 2003-2016 Daniel J. Berger
   All Rights Reserved
     
 == Authors

data/appveyor.yml

@@ -0,0 +1,46 @@
+version: '{build}'
+branches:
+  only:
+  - ffi
+skip_tags: true
+clone_depth: 10
+environment:
+  matrix:
+  - ruby_version: 193
+    ruby_dir: 1.9.1
+  - ruby_version: 200
+    ruby_dir: 2.0.0
+  - ruby_version: 200-x64
+    ruby_dir: 2.0.0
+  - ruby_version: 21
+    ruby_dir: 2.1.0
+  - ruby_version: 21-x64
+    ruby_dir: 2.1.0
+  - ruby_version: 22
+    ruby_dir: 2.2.0
+  - ruby_version: 22-x64
+    ruby_dir: 2.2.0
+install:
+- ps: >-
+    $env:path = "C:\Ruby" + $env:ruby_version + "\bin;" + $env:path
+
+    $tpath = "C:\Ruby" + $env:ruby_version + "\lib\ruby\" + $env:ruby_dir + "\test"
+
+    if ((test-path $tpath) -eq $True){ rm -recurse -force $tpath }
+
+    gem update --system > $null
+
+    if ((gem query -i sys-admin) -eq $False){ gem install sys-admin --no-document }
+
+    if ((gem query -i test-unit -v ">= 3.0") -eq $False){ gem install test-unit --no-document }
+cache:
+- C:\Ruby193\lib\ruby\gems\1.9.1
+- C:\Ruby200\lib\ruby\gems\2.0.0
+- C:\Ruby200-x64\lib\ruby\gems\2.0.0
+- C:\Ruby21\lib\ruby\gems\2.1.0
+- C:\Ruby21-x64\lib\ruby\gems\2.1.0
+- C:\Ruby22\lib\ruby\gems\2.2.0
+- C:\Ruby22-x64\lib\ruby\gems\2.2.0
+build: off
+test_script:
+- cmd: rake

data/lib/win32/security.rb

@@ -20,7 +20,7 @@ module Win32
     extend Windows::Security::Functions
 
     # The version of the win32-security library
-    VERSION = '0.3.2'
+    VERSION = '0.3.3'
 
     # Used by OpenProcessToken
     TOKEN_QUERY = 8

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.2'
+      VERSION = '0.2.3'
 
       # Some constant SID's for your convenience, in string format.
       # See http://support.microsoft.com/kb/243330 for details.
@@ -225,12 +225,7 @@ module Win32
           end
         end
 
-        if account
-          ordinal_val = account[0]
-          ordinal_val = ordinal_val.ord if RUBY_VERSION.to_f >= 1.9
-        else
-          ordinal_val = nil
-        end
+        ordinal_val = account ? account[0].ord : nil
 
         sid = FFI::MemoryPointer.new(:uchar, 260)
         sid_size = FFI::MemoryPointer.new(:ulong)
@@ -290,7 +285,8 @@ module Win32
 
         # The arguments are flipped depending on which path we took
         if ordinal_val.nil?
-          @sid = token_info.read_string
+          length = GetLengthSid(token_info)
+          @sid = token_info.read_string(length)
           @account = sid.read_string(sid.size).strip
         elsif ordinal_val < 10
           @sid = account

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.3.2', Win32::Security::VERSION)
+    assert_equal('0.3.3', 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.2', Security::SID::VERSION)
+    assert_equal('0.2.3', Security::SID::VERSION)
   end
 
   test "sid method basic functionality" do
@@ -106,7 +106,13 @@ class TC_Win32_Security_Sid < Test::Unit::TestCase
   end
 
   test "constructor accepts an account argument" do
-    assert_nothing_raised{ Security::SID.new(@@name) }
+    assert_nothing_raised{ @sid = Security::SID.new(@@name) }
+    assert_equal(Etc.getlogin, @sid.account)
+  end
+
+  test "constructor accepts a sid argument" do
+    assert_nothing_raised{ @sid = Security::SID.new(@sid.sid) }
+    assert_equal(Etc.getlogin, @sid.account)
   end
 
   test "constructor accepts a host argument" do

data/win32-security.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-security'
-  spec.version    = '0.3.2'
+  spec.version    = '0.3.3'
   spec.authors    = ['Daniel J. Berger', 'Park Heesob']
   spec.license    = 'Artistic 2.0'
   spec.email      = 'djberg96@gmail.com'
@@ -13,6 +13,8 @@ Gem::Specification.new do |spec|
   spec.cert_chain = Dir['certs/*']
 
   spec.extra_rdoc_files  = ['README', 'CHANGES', 'MANIFEST']
+
+  spec.required_ruby_version = '>= 1.9.3'
    
   spec.add_dependency('ffi')
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-security
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -31,7 +31,7 @@ cert_chain:
   EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
   tGSHgAmcLlkdGgan182qsE/4kKM=
   -----END CERTIFICATE-----
-date: 2015-12-04 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -101,6 +101,7 @@ extra_rdoc_files:
 - CHANGES
 - MANIFEST
 files:
+- appveyor.yml
 - certs
 - certs/djberg96_pub.pem
 - CHANGES
@@ -137,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="