win32-security 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f0cdfb7c3954a89c3d2e4320f2c27fcd2311be6
-  data.tar.gz: 30b2df084b416d6822b3c975ad72d85f9e2d687a
+  metadata.gz: b99c41fd2bd78061d9b7b6fcb39816de3384c561
+  data.tar.gz: d11ca28544ad66864128d6000d3edde7f529fa74
 SHA512:
-  metadata.gz: 785d0356537d86bd64e486bf5981c1a1c22fe3abb85e0c43357bd9cdb43a642b7cdca141e6de33a6cd878d3b5349a6626523a82cc5985fdd1093f8e38b4c677f
-  data.tar.gz: bb52c0719a509d74f3372ae7f929a25e89eca96cacfa3be0f5da5c9c4b64979733b1d45685c41db6dd27fe516e3a0b560d8954a08f764b0de2e36eb76160a801
+  metadata.gz: 8fe3a69f36067b039c6bd86b0fd2dd0d018dd6afa57c0aa2c6beb30ebae232ed30fffdce8c0e4581c390718fce52e4aea18eb8fb8086f303e236783a27c242b6
+  data.tar.gz: e0b2987762703a34b80a32bfb7057c7f47f65328f7da9ed9dfea2c4607bb4320827583723065b4d17b1f3462f1e42ef641c8d4c9f1763ac71d1a1171be83e5bc

data/CHANGES

@@ -1,3 +1,9 @@
+== 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.
+* Removed some unused FFI functions.
+* Added the String#wstrip helper method if not already defined.
+
 == 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.

data/certs/djberg96_pub.pem

@@ -1,21 +1,21 @@
------BEGIN CERTIFICATE-----
-MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MREwDwYDVQQDDAhkamJl
-cmc5NjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
-MB4XDTE1MDkwMjIwNDkxOFoXDTE2MDkwMTIwNDkxOFowPzERMA8GA1UEAwwIZGpi
-ZXJnOTYxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
-bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyTkvXqRp6hLs9eoJOS
-Hmi8kRYbq9Vkf15/hMxJpotYMgJVHHWrmDcC5Dye2PbnXjTkKf266Zw0PtT9h+lI
-S3ts9HO+vaCFSMwFFZmnWJSpQ3CNw2RcHxjWkk9yF7imEM8Kz9ojhiDXzBetdV6M
-gr0lV/alUr7TNVBDngbXEfTWscyXh1qd7xZ4EcOdsDktCe5G45N/o3662tPQvJsi
-FOF0CM/KuBsa/HL1/eoEmF4B3EKIRfTHrQ3hu20Kv3RJ88QM4ec2+0dd97uX693O
-zv6981fyEg+aXLkxrkViM/tz2qR2ZE0jPhHTREPYeMEgptRkTmWSKAuLVWrJEfgl
-DtkCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFEwe
-nn6bfJADmuIDiMSOzedOrL+xMB0GA1UdEQQWMBSBEmRqYmVyZzk2QGdtYWlsLmNv
-bTAdBgNVHRIEFjAUgRJkamJlcmc5NkBnbWFpbC5jb20wDQYJKoZIhvcNAQEFBQAD
-ggEBAHmNOCWoDVD75zHFueY0viwGDVP1BNGFC+yXcb7u2GlK+nEMCORqzURbYPf7
-tL+/hzmePIRz7i30UM//64GI1NLv9jl7nIwjhPpXpf7/lu2I9hOTsvwSumb5UiKC
-/sqBxI3sfj9pr79Wpv4MuikX1XPik7Ncb7NPsJPw06Lvyc3Hkg5X2XpPtLtS+Gr2
-wKJnmzb5rIPS1cmsqv0M9LPWflzfwoZ/SpnmhagP+g05p8bRNKjZSA2iImM/GyYZ
-EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
-tGSHgAmcLlkdGgan182qsE/4kKM=
------END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MREwDwYDVQQDDAhkamJl
+cmc5NjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
+MB4XDTE1MDkwMjIwNDkxOFoXDTE2MDkwMTIwNDkxOFowPzERMA8GA1UEAwwIZGpi
+ZXJnOTYxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
+bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyTkvXqRp6hLs9eoJOS
+Hmi8kRYbq9Vkf15/hMxJpotYMgJVHHWrmDcC5Dye2PbnXjTkKf266Zw0PtT9h+lI
+S3ts9HO+vaCFSMwFFZmnWJSpQ3CNw2RcHxjWkk9yF7imEM8Kz9ojhiDXzBetdV6M
+gr0lV/alUr7TNVBDngbXEfTWscyXh1qd7xZ4EcOdsDktCe5G45N/o3662tPQvJsi
+FOF0CM/KuBsa/HL1/eoEmF4B3EKIRfTHrQ3hu20Kv3RJ88QM4ec2+0dd97uX693O
+zv6981fyEg+aXLkxrkViM/tz2qR2ZE0jPhHTREPYeMEgptRkTmWSKAuLVWrJEfgl
+DtkCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFEwe
+nn6bfJADmuIDiMSOzedOrL+xMB0GA1UdEQQWMBSBEmRqYmVyZzk2QGdtYWlsLmNv
+bTAdBgNVHRIEFjAUgRJkamJlcmc5NkBnbWFpbC5jb20wDQYJKoZIhvcNAQEFBQAD
+ggEBAHmNOCWoDVD75zHFueY0viwGDVP1BNGFC+yXcb7u2GlK+nEMCORqzURbYPf7
+tL+/hzmePIRz7i30UM//64GI1NLv9jl7nIwjhPpXpf7/lu2I9hOTsvwSumb5UiKC
+/sqBxI3sfj9pr79Wpv4MuikX1XPik7Ncb7NPsJPw06Lvyc3Hkg5X2XpPtLtS+Gr2
+wKJnmzb5rIPS1cmsqv0M9LPWflzfwoZ/SpnmhagP+g05p8bRNKjZSA2iImM/GyYZ
+EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
+tGSHgAmcLlkdGgan182qsE/4kKM=
+-----END CERTIFICATE-----

data/lib/win32/security.rb

@@ -4,6 +4,7 @@
 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
@@ -20,7 +21,7 @@ module Win32
     extend Windows::Security::Functions
 
     # The version of the win32-security library
-    VERSION = '0.3.3'
+    VERSION = '0.4.0'
 
     # Used by OpenProcessToken
     TOKEN_QUERY = 8

data/lib/win32/security/sid.rb

@@ -227,11 +227,11 @@ module Win32
 
         ordinal_val = account ? account[0].ord : nil
 
-        sid = FFI::MemoryPointer.new(:uchar, 260)
+        sid = FFI::MemoryPointer.new(:uchar, 1024)
         sid_size = FFI::MemoryPointer.new(:ulong)
         sid_size.write_ulong(sid.size)
 
-        domain = FFI::MemoryPointer.new(:uchar, 260)
+        domain = FFI::MemoryPointer.new(:uchar, 1024)
         domain_size = FFI::MemoryPointer.new(:ulong)
         domain_size.write_ulong(domain.size)
 
@@ -254,7 +254,7 @@ module Win32
           account_ptr = FFI::MemoryPointer.from_string(account)
 
           bool = LookupAccountSid(
-            host,
+            host.encode('UTF-16LE'),
             account_ptr,
             sid,
             sid_size,
@@ -270,8 +270,8 @@ module Win32
           account_ptr.free
         else
           bool = LookupAccountName(
-            host,
-            account,
+            host.encode('UTF-16LE'),
+            account.encode('UTF-16LE'),
             sid,
             sid_size,
             domain,
@@ -287,18 +287,19 @@ module Win32
         if ordinal_val.nil?
           length = GetLengthSid(token_info)
           @sid = token_info.read_string(length)
-          @account = sid.read_string(sid.size).strip
+          @account = sid.read_bytes(sid.size).wstrip
         elsif ordinal_val < 10
           @sid = account
-          @account = sid.read_string(sid.size).strip
+          @account = sid.read_bytes(sid.size).wstrip
         else
           length = GetLengthSid(sid)
-          @sid = sid.read_string(length)
+          @sid = sid.read_bytes(length)
           @account = account
         end
 
+
         @host   = host
-        @domain = domain.read_string
+        @domain = domain.read_bytes(domain.size).wstrip
 
         @account_type = get_account_type(use_ptr.read_ulong)
       end

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

@@ -101,16 +101,11 @@ module Windows
       attach_pfunc :IsValidAcl, [:ptr], :bool
       attach_pfunc :IsValidSid, [:ptr], :bool
       attach_pfunc :IsWellKnownSid, [:ptr, :int], :bool
-      attach_pfunc :LookupAccountName, :LookupAccountNameA, [:string, :string, :ptr, :ptr, :ptr, :ptr, :ptr], :bool
-      attach_pfunc :LookupAccountSid, :LookupAccountSidA, [:string, :ptr, :ptr, :ptr, :ptr, :ptr, :ptr], :bool
+      attach_pfunc :LookupAccountName, :LookupAccountNameW, [:buffer_in, :buffer_in, :ptr, :ptr, :ptr, :ptr, :ptr], :bool
+      attach_pfunc :LookupAccountSid, :LookupAccountSidW, [:buffer_in, :ptr, :ptr, :ptr, :ptr, :ptr, :ptr], :bool
       attach_pfunc :OpenProcessToken, [:handle, :dword, :ptr], :bool
       attach_pfunc :OpenThreadToken, [:handle, :dword, :int, :ptr], :bool
       attach_pfunc :SetAclInformation, [:ptr, :ptr, :dword, :int], :bool
-
-      attach_pfunc :ConvertSecurityDescriptorToStringSecurityDescriptor,
-        :ConvertSecurityDescriptorToStringSecurityDescriptorA, [:ptr, :dword, :dword, :ptr, :ptr], :bool
-      attach_pfunc :ConvertStringSecurityDescriptorToSecurityDescriptor,
-        :ConvertStringSecurityDescriptorToSecurityDescriptorA, [:string, :dword, :ptr, :ptr], :bool
     end
   end
 end

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

@@ -0,0 +1,10 @@
+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

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.3', Win32::Security::VERSION)
+    assert_equal('0.4.0', 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.3'
+  spec.version    = '0.4.0'
   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.3
+  version: 0.4.0
 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-01 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -114,6 +114,7 @@ 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