win32-certstore 0.6.11 → 0.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 809701f00c09da8b2bbcf78e30eb51d03e939d33ea7a19b17d45ce51c078fdd4
-  data.tar.gz: dbb26074a01b06639bbc1bae73b45f1937c54035ad57d56bbecc64a3fb377bb6
+  metadata.gz: b4a48182fe9aada5c09a9e0205bc5a3a53fd1b50da8fa3a5abfd649adce8fac0
+  data.tar.gz: 2803b6ddc28e7575f2c9f3709c42e8509c42cef7c5b6ca9e85884dd51be14dd9
 SHA512:
-  metadata.gz: 9ba534e93f989c33a735ea57f525b5357f25cbd0f7c9d2ad0bfe770a0d59f49973dde9669cfb878de35853a81d4af7257d39348d3406879273cdf338b108acd7
-  data.tar.gz: c16cd054c55671396b73d0d41450d89e54dd7157a7b21ea7df0dedadea67c5f376ef45b9e6a70bfaf4eb9ceadfaa520399caa0ee49fb722afec3fcef6e39d405
+  metadata.gz: b4569f5dcf1f73d12dd9d82515b2ee0f2d270488118c0c0f0b7f4f079ba7c65cc8dcf7e1321221c68f4465c4858195c752a78c19de3345e795b618ecab616e4f
+  data.tar.gz: c0d0e669883c027786d41eea3eea9b85c66bc7391675f63a60c8f5229115b73a2e617268a415d741d164a3621688c98902871d1eb764e4c07c2b5ef88a4f3aa8

data/lib/win32/certstore/store_base.rb

@@ -146,10 +146,11 @@ module Win32
       def cert_validate(certificate_thumbprint)
         validate_thumbprint(certificate_thumbprint)
         thumbprint = update_thumbprint(certificate_thumbprint)
-
         cert_pem = get_cert_pem(thumbprint)
+        return cert_pem  if cert_pem == "Certificate Not Found"
         cert_pem = format_pem(cert_pem)
-        verify_certificate(cert_pem)
+        result = verify_certificate(cert_pem)
+        result == false ? "Certificate Has Expired" : result
       end
 
       # Search certificate from open certificate store and return list
@@ -184,13 +185,16 @@ module Win32
                           end
         powershell_cmd = <<~EOH
             $result = Get-ChildItem -Path Cert:\\#{converted_store}\\#{store_name} | Where-Object { $_.Subject -match "#{search_token.strip}" } | Select-Object Thumbprint
+            if ([string]::IsNullOrEmpty($result)){
+              return "Certificate Not Found"
+            }
             return $result[0].Thumbprint
         EOH
 
         powershell_exec!(powershell_cmd, :powershell, timeout: timeout).result
 
       rescue ChefPowerShell::PowerShellExceptions::PowerShellCommandFailed
-        return "Certificate not found"
+        raise ArgumentError, "PowerShell threw an error retreiving the certificate. You asked for a cert with this Search Token : #{search_token}, located in this store : #{store_name}, at this location : #{store_location}"
       end
 
       # To close and destroy pointer of open certificate store handler

data/lib/win32/certstore/version.rb

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

data/lib/win32/certstore.rb

@@ -84,7 +84,7 @@ module Win32
     def get!(certificate_thumbprint)
       cert_pem = cert_get(certificate_thumbprint)
 
-      raise ArgumentError, "Unable to retrieve the certificate" if cert_pem.empty?
+      raise ArgumentError, "Unable to retrieve the certificate" if cert_pem.empty? || cert_pem == "Certificate Not Found"
 
       cert_pem
     end
@@ -118,13 +118,7 @@ module Win32
     # @param request[thumbprint<string>] of certificate
     # @return [true, false] only true or false
     def valid?(certificate_thumbprint)
-      cert_validate(certificate_thumbprint).yield_self do |x|
-        if x.is_a?(TrueClass) || x.is_a?(FalseClass)
-          x
-        else
-          false
-        end
-      end
+      cert_validate(certificate_thumbprint)
     end
 
     # To close and destroy pointer of open certificate store handler

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: win32-certstore
 version: !ruby/object:Gem::Version
-  version: 0.6.11
+  version: 0.6.12
 platform: ruby
 authors:
 - Chef Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-09 00:00:00.000000000 Z
+date: 2022-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler