comments resolved

Author: mahmishr

composer.json

@@ -21,7 +21,7 @@
         "firebase/php-jwt": "^6.0.0",
         "monolog/monolog": ">=1.25.0",
         "web-token/jwt-framework": "^2.2.11|^3.3.5",
-        "singpolyma/openpgp-php": "0.6.0"
+        "singpolyma/openpgp-php": "0.5.0"
     },
     "require-dev": {
         "phpunit/phpunit": "9.6.15"

lib/Api/BatchUploadApi.php

@@ -49,7 +49,7 @@ public function __construct($logConfig = null)
     /**
      * Uploads a batch file using mutual TLS authentication with a PKCS#12 (.p12/.pfx) client certificate file.
      *
-     * @param string $inputFile Path to the file to be uploaded.
+     * @param string $inputFilePath Path to the file to be uploaded.
      * @param string $environmentHostname The environment hostname.
      * @param string $pgpEncryptionCertPath Path to the PGP encryption certificate.
      * @param string $clientCertP12FilePath Path to the PKCS#12 client certificate file (.p12 or .pfx).
@@ -60,7 +60,7 @@ public function __construct($logConfig = null)
      * @throws ApiException
      */
     public function uploadBatchWithP12(
-        $inputFile,
+        $inputFilePath,
         $environmentHostname,
         $pgpEncryptionCertPath,
         $clientCertP12FilePath,
@@ -69,20 +69,20 @@ public function uploadBatchWithP12(
         $verify_ssl = true
     ) {
         if (self::$logger) {
-            self::$logger->info("Starting batch upload with P12/PFX for file: $inputFile");
+            self::$logger->info("Starting batch upload with P12/PFX for file: $inputFilePath");
             if ($verify_ssl === false) {
                 self::$logger->warning("SSL verification is DISABLED for this batch upload. This is insecure and should not be used in production.");
             }
         }
         BatchuploadUtility::validateBatchApiP12Inputs(
-            $inputFile, $environmentHostname, $pgpEncryptionCertPath, $clientCertP12FilePath, $serverTrustCertPath
+            $inputFilePath, $environmentHostname, $pgpEncryptionCertPath, $clientCertP12FilePath, $serverTrustCertPath
         );
 
         $endpointUrl = $this->getEndpointUrl($environmentHostname, "/pts/v1/transaction-batch-upload");
 
-        $encryptedPgpBytes = PgpEncryptionUtility::encryptFileToBytes($inputFile, $pgpEncryptionCertPath);
+        $encryptedPgpBytes = PgpEncryptionUtility::encryptFileToBytes($inputFilePath, $pgpEncryptionCertPath);
 
-        $pgpFileName = basename($inputFile);
+        $pgpFileName = basename($inputFilePath);
         if (empty($pgpFileName) || $pgpFileName === '.' || $pgpFileName === '..') {
             $pgpFileName = 'file.pgp';
         } else {
@@ -104,7 +104,7 @@ public function uploadBatchWithP12(
     /**
      * Uploads a batch file using mutual TLS authentication with client private key and certificate.
      *
-     * @param string $inputFile Path to the file to be uploaded.
+     * @param string $inputFilePath Path to the file to be uploaded.
      * @param string $environmentHostname The environment hostname (e.g., api.cybersource.com).
      * @param string $pgpEncryptionCertPath Path to the PGP encryption certificate.
      * @param string $clientCertPath Path to the client certificate (PEM).
@@ -116,7 +116,7 @@ public function uploadBatchWithP12(
      * @throws ApiException
      */
     public function uploadBatchWithKeyAndCert(
-        $inputFile,
+        $inputFilePath,
         $environmentHostname,
         $pgpEncryptionCertPath,
         $clientCertPath,
@@ -126,19 +126,19 @@ public function uploadBatchWithKeyAndCert(
         $verify_ssl = true
     ) {
         if (self::$logger) {
-            self::$logger->info("Starting batch upload with client key/cert for file: $inputFile");
+            self::$logger->info("Starting batch upload with client key/cert for file: $inputFilePath");
             if ($verify_ssl === false) {
                 self::$logger->warning("SSL verification is DISABLED for this batch upload. This is insecure and should not be used in production.");
             }
         }
 
-        BatchuploadUtility::validateBatchApiKeysInputs($inputFile, $environmentHostname, $pgpEncryptionCertPath, $clientKeyPath, $clientCertPath, $serverTrustCertPath);
+        BatchuploadUtility::validateBatchApiKeysInputs($inputFilePath, $environmentHostname, $pgpEncryptionCertPath, $clientKeyPath, $clientCertPath, $serverTrustCertPath);
 
         $endpointUrl = $this->getEndpointUrl($environmentHostname, "/pts/v1/transaction-batch-upload");
 
-        $encryptedPgpBytes = PgpEncryptionUtility::encryptFileToBytes($inputFile, $pgpEncryptionCertPath);
+        $encryptedPgpBytes = PgpEncryptionUtility::encryptFileToBytes($inputFilePath, $pgpEncryptionCertPath);
 
-        $pgpFileName = basename($inputFile);
+        $pgpFileName = basename($inputFilePath);
         if (empty($pgpFileName) || $pgpFileName === '.' || $pgpFileName === '..') {
             $pgpFileName = 'file.pgp';
         } else {

lib/Utilities/PGP/BatchUpload/BatchuploadUtility.php

@@ -103,4 +103,4 @@ public static function validatePathAndFile($filePath, $pathType)
         }
     }
 
-}
+}

lib/Utilities/PGP/BatchUpload/MutualAuthUploadUtility.php

@@ -127,17 +127,17 @@ private static function doMultipartUpload(
         }
 
         // CA cert for server validation
+        $defaultCaCertPath = __DIR__ . '/../../../ssl/cacert.pem';
+        $useBlob = defined('CURLOPT_CAINFO_BLOB');
         if ($caCertPath) {
-            print_r("Using custom CA cert path: $caCertPath\n");
-            $defaultCaCertPath = __DIR__ . '/../../../ssl/cacert.pem';
-            $defaultCa = file_exists($defaultCaCertPath) ? file_get_contents($defaultCaCertPath) : '';
-            $userCa = file_get_contents($caCertPath);
-            $combinedCa = rtrim($defaultCa, "\r\n") . "\n" . ltrim($userCa, "\r\n");
-            curl_setopt($ch, CURLOPT_CAINFO_BLOB, $combinedCa);
-        }else{
-            $defaultCaCertPath = __DIR__ . '/../../../ssl/cacert.pem';
-            $defaultCa = file_exists($defaultCaCertPath) ? file_get_contents($defaultCaCertPath) : '';
-            curl_setopt($ch, CURLOPT_CAINFO_BLOB, $defaultCa);
+            if ($useBlob) {
+                $defaultCa = file_exists($defaultCaCertPath) ? file_get_contents($defaultCaCertPath) : '';
+                $userCa = file_get_contents($caCertPath);
+                $combinedCa = rtrim($defaultCa, "\r\n") . "\n" . ltrim($userCa, "\r\n");
+                curl_setopt($ch, CURLOPT_CAINFO_BLOB, $combinedCa);
+            } else {
+                curl_setopt($ch, CURLOPT_CAINFO, $caCertPath);
+            }
         }
 
         // SSL verification

lib/Utilities/PGP/BatchUpload/PgpEncryptionUtility.php

@@ -44,4 +44,4 @@ public static function encryptFileToBytes($inputFile, $publicKeyFile)
     //also works without converting to string
         return (string)$encrypted->to_bytes();
     }
-}
+}