add get! method, remove string return from verify_certificate

Signed-off-by: rishichawda <[email protected]>
chef · Sep 7, 2021 · ed5ec4b · ed5ec4b
1 parent 7d81f70
commit ed5ec4b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/win32/certstore.rb b/lib/win32/certstore.rb
@@ -78,6 +78,17 @@ def get(certificate_thumbprint, store_name: @store_name, store_location: @store_
       cert_get(certificate_thumbprint, store_name: store_name, store_location: store_location)
     end
 
+    # Return `OpenSSL::X509` certificate object if present otherwise raise a "Certificate not found!" error
+    # @param request [thumbprint<string>] of certificate
+    # @return [Object] of certificates in OpenSSL::X509 format
+    def get!(certificate_thumbprint, store_name: @store_name, store_location: @store_location)
+      cert_pem = cert_get(certificate_thumbprint, store_name: store_name, store_location: store_location)
+
+      raise "Certificate not found!" if cert_pem.empty?
+
+      cert_pem
+    end
+
     # Returns all the certificates in a store
     # @param [nil]
     # @return [Array] array of certificates list

diff --git a/lib/win32/certstore/store_base.rb b/lib/win32/certstore/store_base.rb
@@ -220,8 +220,6 @@ def update_thumbprint(certificate_thumbprint)
 
       # Verify OpenSSL::X509::Certificate object
       def verify_certificate(cert_pem)
-        return "Certificate not found" if cert_pem.empty?
-
         valid_duration?(build_openssl_obj(cert_pem))
       end