win32-certstore 0.1.11 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da6e8ade18f40b72dc3716b9e89767f346aaca6741ac57c9ac815e6e10955298
-  data.tar.gz: ebb4b370fcdc8a679135a688d9ecc19bfc0dc71bd094114996e7d3ae810a14c5
+  metadata.gz: '0806f9e6b2fd19bdcbe22360d33ee9c192e603662564ec5007332b03b498d9ce'
+  data.tar.gz: 5cc20bb3a2767b6ea0a9495bb0e7c27892bf9189f662db233d1901c31006b6a9
 SHA512:
-  metadata.gz: df778b28e7d2e9d730babee977e23aec1627702d2f199a85d9f5b8b1d014a02e96a5a0c27507e872adc8bb7f11a3810f61dce5e3c999a3e16045813bc4c25435
-  data.tar.gz: 507f27ee6151029a3a52135de9f462a36d7b664ab3004b5829cb725909e81bba0da127ca26b2d55d0d20dd68f885bebccc8c210f41bf386365a15317d7637f56
+  metadata.gz: 9882eb9c3f237dc8564c36cde26fd437ed5fd54f786f2fa9289793e5cab193acd845e425ba240f9eab320c57f693f33a08416f89bb6c0c8ff6db7dcd6363e41b
+  data.tar.gz: d86c06df2d6be60b044a7474bcb72851245b2b28c2bd81dbb9b9e5e43185cc344a48302c53f6fcd03ebd4ce2416e384b77d0768015cd01a024786c9aab8c892e

data/lib/win32/certstore.rb

@@ -29,9 +29,10 @@ module Win32
     include Win32::Certstore::Mixin::String
     include Win32::Certstore::StoreBase
 
-    attr_reader :store_name
+    attr_accessor :store_name
 
     def initialize(store_name)
+      @store_name = store_name
       @certstore_handler = open(store_name)
     end
 

data/lib/win32/certstore/mixin/crypto.rb

@@ -55,6 +55,7 @@ module Win32
         PKCS_7_ASN_ENCODING                                 = 0x00010000
         PKCS_7_NDR_ENCODING                                 = 0x00020000
         PKCS_7_OR_X509_ASN_ENCODING                         = (PKCS_7_ASN_ENCODING | X509_ASN_ENCODING)
+        ENCODING_TYPE                                       = X509_ASN_ENCODING | PKCS_7_ASN_ENCODING
 
         # Certificate Display Format
         CERT_NAME_EMAIL_TYPE                                = 1
@@ -67,8 +68,12 @@ module Win32
         CERT_NAME_UPN_TYPE                                  = 8
 
         # Retrieve Certificates flag
-        CERT_FIND_SUBJECT_STR                               = 0x00080007
-        CERT_FIND_ISSUER_STR                                = 0x00080004
+        CERT_COMPARE_SHA1_HASH                              = 1
+        CERT_INFO_SUBJECT_FLAG                              = 7
+        CERT_COMPARE_NAME_STR_W                             = 8
+        CERT_COMPARE_SHIFT                                  = 16
+        CERT_FIND_SHA1_HASH                                 = CERT_COMPARE_SHA1_HASH << CERT_COMPARE_SHIFT
+        CERT_FIND_SUBJECT_STR                               = CERT_COMPARE_NAME_STR_W << CERT_COMPARE_SHIFT | CERT_INFO_SUBJECT_FLAG
 
         # List Certificates Flag
         CERT_NAME_ISSUER_FLAG                               = 0x1
@@ -122,6 +127,23 @@ module Win32
           end
         end
 
+        class CRYPT_HASH_BLOB < FFI::Struct
+          layout :cbData, DWORD, # Count, in bytes, of data
+                 :pbData, :pointer # Pointer to data buffer
+
+          def initialize(str = nil)
+            super(nil)
+            if str
+              byte_arr = [str].pack("H*").unpack("C*") # Converting string to its byte array
+
+              buffer = FFI::MemoryPointer.new(:char, byte_arr.size) # Create the pointer to the array
+              buffer.put_array_of_char 0, byte_arr                  # Fill the memory location with data
+              self[:pbData] = buffer
+              self[:cbData] = byte_arr.size
+            end
+          end
+        end
+
         class CERT_EXTENSION < FFI::Struct
           layout :pszObjId, LPTSTR,
                  :fCritical, BOOL,

data/lib/win32/certstore/mixin/helper.rb

@@ -23,10 +23,10 @@ module Win32
       module Helper
 
         # PSCommand to search certificate from thumbprint and convert in pem
-        def cert_ps_cmd(thumbprint)
+        def cert_ps_cmd(thumbprint, store_name)
           <<-EOH
             $content = $null
-            $cert = Get-ChildItem Cert:\ -Recurse | Where { $_.Thumbprint -eq '#{thumbprint}' }
+            $cert = Get-ChildItem Cert:\\LocalMachine\\'#{store_name}' -Recurse | Where { $_.Thumbprint -eq '#{thumbprint}' }
             if($cert -ne $null)
             {
             $content = @(

data/lib/win32/certstore/mixin/unicode.rb

@@ -40,11 +40,3 @@ module FFI
     end
   end
 end
-
-class String
-  include Win32::Certstore::Mixin::String
-
-  def to_wstring
-    utf8_to_wide(self)
-  end
-end

data/lib/win32/certstore/store_base.rb

@@ -50,7 +50,6 @@ module Win32
       end
 
       # Get certificate from open certificate store and return certificate object
-      # store_handler => Open certificate store handler
       # certificate_thumbprint => thumbprint is a hash. which could be sha1 or md5.
       def cert_get(certificate_thumbprint)
         validate_thumbprint(certificate_thumbprint)
@@ -86,21 +85,16 @@ module Win32
       def cert_delete(store_handler, certificate_thumbprint)
         validate_thumbprint(certificate_thumbprint)
         thumbprint = update_thumbprint(certificate_thumbprint)
-        cert_pem = format_pem(get_cert_pem(thumbprint))
-        cert_rdn = get_rdn(build_openssl_obj(cert_pem)) unless cert_pem.empty?
         cert_delete_flag = false
         begin
-          cert_args = cert_find_args(store_handler, cert_rdn)
-          if (pcert_context = CertFindCertificateInStore(*cert_args)) && !pcert_context.null?
+          cert_args = cert_find_args(store_handler, thumbprint)
+          pcert_context = CertFindCertificateInStore(*cert_args)
+          if !pcert_context.null?
             cert_delete_flag = CertDeleteCertificateFromStore(CertDuplicateCertificateContext(pcert_context)) || lookup_error
           end
           CertFreeCertificateContext(pcert_context)
         rescue
-          if cert_pem.empty?
-            raise SystemCallError.new("Invalid thumbprint #{certificate_thumbprint}.")
-          else
-            lookup_error("delete")
-          end
+          lookup_error("delete")
         end
         cert_delete_flag
       end
@@ -144,8 +138,8 @@ module Win32
       end
 
       # Build arguments for CertFindCertificateInStore
-      def cert_find_args(store_handler, cert_rdn)
-        [store_handler, X509_ASN_ENCODING, 0, CERT_FIND_ISSUER_STR, cert_rdn.to_wstring, nil]
+      def cert_find_args(store_handler, thumbprint)
+        [store_handler, ENCODING_TYPE, 0, CERT_FIND_SHA1_HASH, CRYPT_HASH_BLOB.new(thumbprint), nil]
       end
 
       # Match certificate CN exist in cert_rdn
@@ -188,15 +182,10 @@ module Win32
 
       # Get certificate pem
       def get_cert_pem(thumbprint)
-        get_data = powershell_out!(cert_ps_cmd(thumbprint))
+        get_data = powershell_out!(cert_ps_cmd(thumbprint, store_name))
         get_data.stdout
       end
 
-      # To get RDN from certificate object
-      def get_rdn(cert_obj)
-        cert_obj.issuer.to_s.concat("/").scan(/=(.*?)\//).join(", ")
-      end
-
       # Format pem
       def format_pem(cert_pem)
         cert_pem.delete("\r")

data/lib/win32/certstore/version.rb

@@ -1,6 +1,6 @@
 module Win32
   class Certstore
-    VERSION = "0.1.11".freeze
+    VERSION = "0.2.1".freeze
     MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: win32-certstore
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.2.1
 platform: ruby
 authors:
-- nimisha
+- Chef Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2019-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -68,7 +68,7 @@ dependencies:
         version: '0'
 description: 
 email:
-- nimisha.sharad@msystechnologies.com
+- oss@chef.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -97,7 +97,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="