cybersource_rest_client 0.0.85 → 0.0.87

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34454664d9ec155d9dd0094a993b16a4fa5fa3d15348271dad33d48ec0ca8dea
-  data.tar.gz: '09efd41467183272900951d0182defdb85e63ff12d0328ca340ceb94fd5b5752'
+  metadata.gz: 731beb93fa86e56af43050a567a8512e712695b8bb9006a5593c7c3841de6b32
+  data.tar.gz: a2697272183c38f8d180d17b294f98412c8c729785e81521bc11140496a54651
 SHA512:
-  metadata.gz: 3eb75e9385dd046a83fd2fd9539e18f6e8e3510d544759608058efa5d36ac61d71ade3c8123ceef8ddee1e690dacd84d604135ede80a639c61f276827b6e76de
-  data.tar.gz: 770a3cf7980a42709df7fa1122fe22d8576ccd25363b25d48b10fc4046baef465608e726c27ae00be313c36113edb6f0de05a04754eb01194952dbc9ba996afb
+  metadata.gz: 271897597451a5b631c1be2f341c7965b2dbfa07a9b7bf18371265481f7e924e6d8dd6cfa39fcc390a96f23efce0d5260bcf92eab66b4f7033c499a4e818dcb3
+  data.tar.gz: dece6dfe825872d035cfab32b63b3439dcb81a834a61b775a8b0b5cf9df11fad58cec8dfc484da5b29a8c7a1219dfd1622f8990cb6dad19c601d017283119afe

data/lib/AuthenticationSDK/util/Cache.rb

@@ -1,6 +1,5 @@
 require 'openssl'
 require 'base64'
-require 'active_support'
 require 'thread'
 require_relative 'CacheValue'
 require_relative 'CachedMLEKId'
@@ -9,6 +8,7 @@ require_relative 'Utility'
 require_relative '../util/Constants.rb'
 require_relative '../logging/log_factory.rb'
 require_relative '../logging/log_configuration.rb'
+require 'active_support'
 
 public
 # P12 file certificate Cache
@@ -32,6 +32,9 @@ public
           cachedCertificateInfo = @@cache_obj.read(cacheKey)
         end
 
+        cachedCertificateInfo.private_key = OpenSSL::PKey::RSA.new(Base64.strict_decode64(cachedCertificateInfo.private_key))
+        cachedCertificateInfo.cert = OpenSSL::X509::Certificate.new(Base64.strict_decode64(cachedCertificateInfo.cert))
+
         return cachedCertificateInfo
       end
     end
@@ -60,7 +63,7 @@ public
             raise err
           end
 
-          cacheValue = CacheValue.new(mlePrivateKey, nil, fileModifiedTime)
+          cacheValue = CacheValue.new(Base64.strict_encode64(mlePrivateKey.to_pem), nil, fileModifiedTime)
 
           @@cache_obj.write(cacheKey, cacheValue)
         rescue StandardError => e
@@ -75,7 +78,7 @@ public
         privateKey, certificateList = Utility.getCertificateCollectionAndPrivateKeyFromP12(certificateFilePath, merchantConfig.keyPass)
         jwtCertificate = Utility.getCertificateBasedOnKeyAlias(certificateList, merchantConfig.keyAlias)
 
-        cacheValue = CacheValue.new(privateKey, jwtCertificate, fileModifiedTime)
+        cacheValue = CacheValue.new(Base64.strict_encode64(privateKey), Base64.strict_encode64(jwtCertificate), fileModifiedTime)
 
         @@cache_obj.write(cacheKey, cacheValue)
         return
@@ -105,7 +108,7 @@ public
           raise ArgumentError, "No certificate found for the specified mle_key_alias '#{merchantConfig.requestMleKeyAlias}' in file #{fileName}."
         end
 
-        cacheValue = CacheValue.new(privateKey, mleCertificate, fileModifiedTime)
+        cacheValue = CacheValue.new(Base64.strict_encode64(privateKey), Base64.strict_encode64(mleCertificate), fileModifiedTime)
 
         @@cache_obj.write(cacheKey, cacheValue)
         return
@@ -156,7 +159,7 @@ public
         end
       end
 
-      cachedCertificateInfo ? cachedCertificateInfo.cert : nil
+      cachedCertificateInfo ? OpenSSL::X509::Certificate.new(Base64.strict_decode64(cachedCertificateInfo.cert)) : nil
     end
 
     def getMLEResponsePrivateKeyFromFilePath(merchantConfig)
@@ -175,7 +178,7 @@ public
         end
       end
 
-      cachedCertificateInfo ? cachedCertificateInfo.private_key : nil
+      cachedCertificateInfo ? JOSE::JWK.from_pem(Base64.strict_decode64(cachedCertificateInfo.private_key)) : nil
     end
 
     def get_mle_kid_data_from_cache(merchant_config)

data/lib/AuthenticationSDK/util/CertificateUtility.rb

@@ -8,14 +8,22 @@ public
     @@logger
 
     def self.getCertificatesFromPemFile(certificateFilePath)
-      pem_data = File.read(certificateFilePath)
-      certificateList = []
+      begin
+        pem_data = File.read(certificateFilePath)
+        certificateList = []
 
-      pem_data.scan(/-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----/m) do |certBlock|
-        certificateList << OpenSSL::X509::Certificate.new(certBlock)
-      end
+        pem_data.scan(/-----BEGIN CERTIFICATE-----.*?-----END CERTIFICATE-----/m) do |certBlock|
+          certificateList << OpenSSL::X509::Certificate.new(certBlock)
+        end
 
-      certificateList
+        certificateList
+      rescue Errno::ENOENT
+        raise IOError, "PEM certificate file not found: #{certificateFilePath}"
+      rescue OpenSSL::X509::CertificateError => e
+        raise ArgumentError, "Invalid certificate in PEM file #{certificateFilePath}: #{e.message}"
+      rescue StandardError => e
+        raise IOError, "Failed to read certificates from PEM file #{certificateFilePath}: #{e.message}"
+      end
     end
 
     def self.validateCertificateExpiry(certificate, keyAlias, certificateIdentifier, logConfig)

data/lib/AuthenticationSDK/util/Utility.rb

@@ -38,7 +38,19 @@ public
       return nil if certificateList.nil?
 
       certificateList.find do |cert|
-        cert.subject.to_a.any? { |_, value, _| value.include?(keyAlias) }
+        # Ensure cert is an OpenSSL::X509::Certificate, even if it's a PEM string
+        parsed = if cert.is_a?(String)
+          begin
+            OpenSSL::X509::Certificate.new(cert)
+          rescue OpenSSL::X509::CertificateError
+            next  # Skip invalid entries safely
+          end
+        else
+          cert
+        end
+
+        # Search all subject attributes for the keyAlias
+        parsed.subject.to_a.any? { |_, value, _| value.include?(keyAlias) }
       end
     end
 
@@ -46,14 +58,13 @@ public
       p12File = File.binread(certificateFilePath)
       p12Object = OpenSSL::PKCS12.new(p12File, keyPass)
 
-      privateKey = OpenSSL::PKey::RSA.new(p12Object.key)
+      privateKey = (OpenSSL::PKey::RSA.new(p12Object.key)).to_pem
 
-      primaryX5Certificate = p12Object.certificate
+      primaryX5Certificate = (p12Object.certificate).to_pem
       additionalX5Certificates = p12Object.ca_certs
 
       certificateList = [primaryX5Certificate]
-      certificateList.concat(additionalX5Certificates) if additionalX5Certificates
-
+      certificateList.concat(additionalX5Certificates.map(&:to_pem)) if additionalX5Certificates
       return [privateKey, certificateList]
     end