win32-certstore 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63c8c4f2aaa89a78a8123d98079710df407a3930b0f4b5a6ef3ff2232c11ba05
-  data.tar.gz: 8641dfff337fe7b702783becfcfbfbba6b2a66af189eeb511897c2f0cb5e7d6c
+  metadata.gz: e832ae077e8be7cd039393f84b74062e58dd331b1317cdcc2a1bb1f13109f176
+  data.tar.gz: 453bd4ad7e2d6a92d3935b0a4df4f241636b657256a39f1ac35bc81d2d34030b
 SHA512:
-  metadata.gz: 4f255e439feee57642565bd9fca87f19140b5f95c38eed0a1e8621326749dd5274c0b72c8211bddfbec265820bff4b8d2ad9460ebbf5c30fa1d6607a7e81f204
-  data.tar.gz: 4efd363fb264fc8501f0f9e105e79f7537319838aafc0cb751387a73360386186d326dedd51522907aa131fe74c1b3ba07bd7b3f6f16a1283f5f59203d96a6a7
+  metadata.gz: a3254affc58f8eb862a585b78cc5c5451c61db3398ef1de59ffcb6580755f5e24338c2a1caf16e89e46db4e8ee7c9f431a1c4372768cb7ff08bd76265d1b53da
+  data.tar.gz: bab7b27e4c0c6d780556a6410836283f6de31c64d559fb1b331b679c3d671b68673b6313f53560916e0a5c89f83fff658fd3335f965cfa3024b5066860393b3b

data/lib/win32/certstore.rb

@@ -74,20 +74,8 @@ module Win32
     # Return `OpenSSL::X509` certificate object
     # @param request [thumbprint<string>] of certificate
     # @return [Object] of certificates in OpenSSL::X509 format
-    def get(certificate_thumbprint)
-      cert_get(certificate_thumbprint)
-    end
-
-    # Returns a filepath to a PKCS12 container. The filepath is in a temporary folder so normal housekeeping by the OS should clear it.
-    # However, you should delete it yourself anyway.
-    # @param certificate_thumbprint [String] Is the thumbprint of the pfx blob you want to capture
-    # @param store_location: [String] A location in the Cert store where the pfx is located, typically 'LocalMachine'
-    # @param export_password: [String] The password to export with. P12 objects are an encrypted container that have a private key in \
-    # them and a password is required to export them.
-    # @param output_path: [String] The path where the you want P12 exported to.
-    # @return [Object] of certificate set in PKSC12 format at the path specified above
-    def get_pfx(certificate_thumbprint, store_location: @store_location, export_password:, output_path: "")
-      get_cert_pfx(certificate_thumbprint, store_location: store_location, export_password: export_password, output_path: output_path)
+    def get(certificate_thumbprint, store_name: @store_name, store_location: @store_location)
+      cert_get(certificate_thumbprint, store_name: store_name, store_location: store_location)
     end
 
     # Returns all the certificates in a store
@@ -114,8 +102,8 @@ module Win32
     # Validates a certificate in a certificate store on the basis of time validity
     # @param request[thumbprint<string>] of certificate
     # @return [true, false] only true or false
-    def valid?(certificate_thumbprint)
-      cert_validate(certificate_thumbprint)
+    def valid?(certificate_thumbprint, store_location: "", store_name: "")
+      cert_validate(certificate_thumbprint, store_location: store_location, store_name: store_name)
     end
 
     # To close and destroy pointer of open certificate store handler

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

@@ -21,52 +21,20 @@ module Win32
   class Certstore
     module Mixin
       module Helper
-        # PSCommand to search certificate from thumbprint and either turn it into a pem or return a path to a pfx object
-        def cert_ps_cmd(thumbprint, store_location: "LocalMachine", export_password: "1234", output_path: "")
+        def cert_ps_cmd(thumbprint, store_location: "LocalMachine", store_name: "My")
           <<-EOH
-            $cert = Get-ChildItem Cert:\'#{store_location}' -Recurse | Where { $_.Thumbprint -eq '#{thumbprint}' }
+            $cert = Get-ChildItem Cert:\\#{store_location}\\#{store_name} -Recurse | Where { $_.Thumbprint -eq "#{thumbprint}" }
 
-            # The function and the code below test to see if a) the cert has a private key and b) it has a
-            # Enhanced Usage of Client Auth. Those 2 attributes would mean this is a pfx-able object
-            function test_cert_values{
-              $usagelist = ($cert).EnhancedKeyUsageList
-              foreach($use in $usagelist){
-                if($use.FriendlyName -like "Client Authentication" ){
-                    return $true
-                }
-              }
-              return $false
-            }
-
-            $result = test_cert_values
-
-            $output_path = "#{output_path}"
-            if([string]::IsNullOrEmpty($output_path)){
-              $temproot = [System.IO.Path]::GetTempPath()
-            }
-            else{
-              $temproot = $output_path
-            }
-
-            if((($cert).HasPrivateKey) -and ($result -eq $true)){
-              $file_name = '#{thumbprint}'
-              $file_path = $(Join-Path -Path $temproot -ChildPath "$file_name.pfx")
-              $mypwd = ConvertTo-SecureString -String '#{export_password}' -Force -AsPlainText
-              $cert | Export-PfxCertificate -FilePath $file_path -Password $mypwd | Out-Null
-              $file_path
-            }
-            else {
-              $content = $null
-              if($cert -ne $null)
-              {
+            $content = $null
+            if($null -ne $cert)
+            {
               $content = @(
                 '-----BEGIN CERTIFICATE-----'
                 [System.Convert]::ToBase64String($cert.RawData, 'InsertLineBreaks')
                 '-----END CERTIFICATE-----'
               )
-              }
-              $content
             }
+            $content
           EOH
         end
 

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

@@ -36,14 +36,12 @@ module Win32
           ustring += "\000\000" if ustring.length == 0 || ustring[-1].chr != "\000"
 
           # encode it all as UTF-16LE AKA Windows Wide Character AKA Windows Unicode
-          ustring = begin
-            if ustring.respond_to?(:encode)
-              ustring.encode("UTF-16LE")
-            else
-              require "iconv"
-              Iconv.conv("UTF-16LE", "UTF-8", ustring)
-            end
-          end
+          ustring = if ustring.respond_to?(:encode)
+                      ustring.encode("UTF-16LE")
+                    else
+                      require "iconv"
+                      Iconv.conv("UTF-16LE", "UTF-8", ustring)
+                    end
           ustring
         end
 
@@ -53,14 +51,12 @@ module Win32
           wstring = wstring.force_encoding("UTF-16LE") if wstring.respond_to?(:force_encoding)
 
           # encode it all as UTF-8
-          wstring = begin
-            if wstring.respond_to?(:encode)
-              wstring.encode("UTF-8")
-            else
-              require "iconv"
-              Iconv.conv("UTF-8", "UTF-16LE", wstring)
-            end
-          end
+          wstring = if wstring.respond_to?(:encode)
+                      wstring.encode("UTF-8")
+                    else
+                      require "iconv"
+                      Iconv.conv("UTF-8", "UTF-16LE", wstring)
+                    end
           # remove trailing CRLF and NULL characters
           wstring.strip!
           wstring

data/lib/win32/certstore/store_base.rb

@@ -87,11 +87,15 @@ module Win32
 
       # Get certificate from open certificate store and return certificate object
       # certificate_thumbprint => thumbprint is a hash. which could be sha1 or md5.
-      def cert_get(certificate_thumbprint)
+      def cert_get(certificate_thumbprint, store_name:, store_location:)
         validate_thumbprint(certificate_thumbprint)
         thumbprint = update_thumbprint(certificate_thumbprint)
-        cert_pem = get_cert_pem(thumbprint)
+        cert_pem = get_cert_pem(thumbprint, store_name: store_name, store_location: store_location)
         cert_pem = format_pem(cert_pem)
+        if cert_pem.empty?
+          raise ArgumentError, "Unable to retrieve the certificate"
+        end
+
         unless cert_pem.empty?
           build_openssl_obj(cert_pem)
         end
@@ -138,10 +142,10 @@ module Win32
       # Verify certificate from open certificate store and return boolean or exceptions
       # store_handler => Open certificate store handler
       # certificate_thumbprint => thumbprint is a hash. which could be sha1 or md5.
-      def cert_validate(certificate_thumbprint)
+      def cert_validate(certificate_thumbprint, store_location:, store_name:)
         validate_thumbprint(certificate_thumbprint)
         thumbprint = update_thumbprint(certificate_thumbprint)
-        cert_pem = get_cert_pem(thumbprint)
+        cert_pem = get_cert_pem(thumbprint, store_name: store_name, store_location: store_location)
         cert_pem = format_pem(cert_pem)
         verify_certificate(cert_pem)
       end
@@ -230,24 +234,13 @@ module Win32
       end
 
       # Get certificate pem
-      def get_cert_pem(thumbprint)
-        converted_store = if @store_location == CERT_SYSTEM_STORE_LOCAL_MACHINE
-                            "LocalMachine"
-                          else
-                            "CurrentUser"
-                          end
-        get_data = powershell_exec!(cert_ps_cmd(thumbprint, store_location: converted_store))
-        get_data.stdout
-      end
-
-      # Get PFX object
-      def get_cert_pfx(thumbprint, store_location: CERT_SYSTEM_STORE_LOCAL_MACHINE, export_password:, output_path: )
+      def get_cert_pem(thumbprint, store_name:, store_location:)
         converted_store = if store_location == CERT_SYSTEM_STORE_LOCAL_MACHINE
                             "LocalMachine"
                           else
                             "CurrentUser"
                           end
-        get_data = powershell_exec!(cert_ps_cmd(thumbprint, export_password: export_password, store_location: converted_store, output_path: output_path))
+        get_data = powershell_exec!(cert_ps_cmd(thumbprint, store_location: converted_store, store_name: store_name))
         get_data.stdout
       end
 

data/lib/win32/certstore/version.rb

@@ -1,6 +1,6 @@
 module Win32
   class Certstore
-    VERSION = "0.6.1".freeze
+    VERSION = "0.6.2".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.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Chef Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-04 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler