win32-security 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1ab1418254e685f2d1fb9ab37e728f190d55084
-  data.tar.gz: c4264cb93ef3630c6234682b47f311e7853368cb
+  metadata.gz: eb48272d87182c9d2f834a8756446177ce280d24
+  data.tar.gz: 272c29b8ba86646bd85e4fd00e5300ee52dcdba2
 SHA512:
-  metadata.gz: e24cc326c44285834c0c743415e4a5b3510600a5af79a5556bdc859d88e46110e4e1cd78826883e993aa343005c86ef0c1c9ac385a82d722e9290816f0a80e70
-  data.tar.gz: a39286489abc37813946ccedb911f19d02cceb149923f938a4b522042742241b476695cf89cbdcfd020d910b14951852e4433468e487ebbe16ff19c58d3ffaf0
+  metadata.gz: 2158ce7793c2e4261c6664235451905ed0f74720588d48dbe8c34316d4c4b8dbbfc45b65648f7b38975c94faff89c59b84ecbb8cb3c47b6d30485d8d18c97dcf
+  data.tar.gz: ef88d6ee47441bced718e6c981acbeb663739d2b6427511418dcd1b0b8d359e2fa1862f5a58bb2fdabe08cc09b6d793e6efa3df3606c335a663a2ee0df093b57

data/CHANGES

@@ -1,3 +1,6 @@
+== 0.3.1 - 8-Dec-2014
+* Work around a bug in 64-bit JRuby, which doesn't handle uintptr_t properly.
+
 == 0.3.0 - 31-Oct-2014
 * Implemented an ACL class that lets you create and inspect acccess
   control lists.

data/README

@@ -1,7 +1,7 @@
 = Description
   A security library for MS Windows that allows you to open existing or
   create new security identifiers (SID's), as well as create access
-  control lists (ACL's).
+  control lists (ACL's) and access control entries (ACE's).
 
 = Synopsis
   require 'win32/security'
@@ -24,10 +24,7 @@
   acl.valid?    # => true
    
 == Future Plans
-  Create classes that encapsulate ACE's and Tokens.
-   
-  There is an unfinished versions of the ACE class in the repo if you're
-  interested in taking a look.
+  None at the moment. Suggestions welcome.
    
 == Known Issues
   There appears to be an issue with 64-bit versions of JRuby. I believe this

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.0'
+    VERSION = '0.3.1'
 
     # Used by OpenProcessToken
     TOKEN_QUERY = 8
@@ -28,14 +28,17 @@ module Win32
     # Returns whether or not the owner of the current process is running
     # with elevated security privileges.
     #
-    # On Windows XP an earlier this method is actually just checking to
-    # see if the caller's process is a member of the local Administrator's
-    # group.
-    #
     def self.elevated_security?
       result = false
 
-      FFI::MemoryPointer.new(:uintptr_t) do |token|
+      # Work around a 64-bit JRuby bug
+      if RUBY_PLATFORM == 'java' && ENV_JAVA['sun.arch.data.model'] == '64'
+        ptr_type = :ulong_long
+      else
+        ptr_type = :uintptr_t
+      end
+
+      FFI::MemoryPointer.new(ptr_type) do |token|
         unless OpenProcessToken(GetCurrentProcess(), TOKEN_QUERY, token)
           raise SystemCallError.new("OpenProcessToken", FFI.errno)
         end

data/lib/win32/security/sid.rb

@@ -183,7 +183,13 @@ module Win32
       def initialize(account=nil, host=Socket.gethostname)
         if account.nil?
           begin
-            ptoken = FFI::MemoryPointer.new(:uintptr_t)
+            if RUBY_PLATFORM == 'java' && ENV_JAVA['sun.arch.data.model'] == '64'
+              ptr_type = :ulong_long
+            else
+              ptr_type = :uintptr_t
+            end
+
+            ptoken = FFI::MemoryPointer.new(ptr_type)
 
             # Try the thread token first, default to the process token.
             bool = OpenThreadToken(GetCurrentThread(), TOKEN_QUERY, true, ptoken)

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

@@ -14,9 +14,15 @@ module Windows
       end
 
       typedef :ulong, :dword
-      typedef :uintptr_t, :handle
       typedef :pointer, :ptr
 
+      # Work around a bug in 64-bit JRuby
+      if RUBY_PLATFORM == 'java' && ENV_JAVA['sun.arch.data.model'] == '64'
+        typedef :ulong_long, :handle
+      else
+        typedef :uintptr_t, :handle
+      end
+
       ffi_lib :kernel32
       ffi_convention :stdcall
 

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.0', Win32::Security::VERSION)
+    assert_equal('0.3.1', Win32::Security::VERSION)
   end
 
   test "elevated security basic functionality" do

data/win32-security.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-security'
-  spec.version    = '0.3.0'
+  spec.version    = '0.3.1'
   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.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -9,62 +9,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   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
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: sys-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.6.0
 description: |2
@@ -105,12 +105,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []