"error handling refactored"

Author: mahmishr

lib/Authentication/Jwt/JsonWebTokenHeader.php

@@ -48,17 +48,19 @@ public function getJsonWebToken($jwtBody, $merchantConfig)
             self::$logger->warning($warning_msg);
         }
 
-        $cacheData = self::$cache->grabFileFromP12($merchantConfig);
+        try {
+            $cacheData = self::$cache->grabFileFromP12($merchantConfig);
+        } catch (AuthException $e) {
+            self::$logger->error("Failed to grab file from P12: " . $e->getMessage());
+            throw $e;
+        }
 
         if (!empty($cacheData['private_key']) && !empty($cacheData['publicKey'])) {
             $privateKey = $cacheData['private_key'];
             $publicKey = $cacheData['publicKey'];
         } else {
-            //which exception would be best to be thrown here?
-            $exception = new AuthException(GlobalParameter::INCORRECT_KEY_PASSWORD, 0);
-            self::$logger->error("AuthException : " . GlobalParameter::INCORRECT_KEY_PASSWORD);
-            self::$logger->close();
-            throw $exception;
+            self::$logger->error("AuthException: " . GlobalParameter::EMPTY_PRIVATE_OR_PUBLIC_KEY_ERROR);
+            throw new AuthException("AuthException: " . GlobalParameter::EMPTY_PRIVATE_OR_PUBLIC_KEY_ERROR);
         }
 
         $x5cArray = array($publicKey);

lib/Authentication/Util/Cache.php

@@ -4,14 +4,19 @@
 use Jose\Component\KeyManagement\JWKFactory;
 use CyberSource\Authentication\Util\GlobalParameter as GlobalParameter;
 use CyberSource\Authentication\Core\AuthException as AuthException;
+use CyberSource\Logging\LogFactory as LogFactory;
 
 class Cache
 {
     private static $file_cache = array();
+    private static $logger = null;
+
 
     public function __construct()
     {
-
+        if (self::$logger === null) {
+            self::$logger = (new LogFactory())->getLogger(\CyberSource\Utilities\Helpers\ClassHelper::getClassName(get_class($this)), new \CyberSource\Logging\LogConfiguration());
+        }
     }
 
     public function updateCache($filePath, $merchantConfig)
@@ -20,8 +25,15 @@ public function updateCache($filePath, $merchantConfig)
         $fileModTime = filemtime($filePath);
         $keyPass = $merchantConfig->getKeyPassword();
         $cacheKey = $fileName . '_' . "jwt";
+        $certStore = null;
+        if (file_exists($filePath)) {
+            $certStore = file_get_contents($filePath);
+        } else {
+            $exception = new AuthException(GlobalParameter::KEY_FILE_INCORRECT, 0);
+            self::$logger->error("AuthException : " . GlobalParameter::KEY_FILE_INCORRECT);
+            throw $exception;
+        }
 
-        $certStore = file_get_contents($filePath);
         $privateKey = null;
         $publicKey = null;
         $mleCert = null;
@@ -34,6 +46,10 @@ public function updateCache($filePath, $merchantConfig)
             }
             $publicKey = Utility::findCertByAlias($certs, $keyAlias);
             $publicKey = $this->PemToDer($publicKey);
+        } else {
+            $exception = new AuthException(GlobalParameter::INCORRECT_KEY_PASSWORD, 0);
+            self::$logger->error("AuthException : " . GlobalParameter::INCORRECT_KEY_PASSWORD);
+            throw $exception;
         }
 
         $mleCert = Utility::findCertByAlias($certs, $merchantConfig->getMleKeyAlias());
@@ -110,4 +126,4 @@ private function PemToDer($Pem)
         unset($lines[0]);
         return implode("\n", $lines);
     }
-}
+}

lib/Authentication/Util/GlobalParameter.php

@@ -106,5 +106,6 @@ class GlobalParameter
     const DEFAULT_MLE_ALIAS_FOR_CERT = "CyberSource_SJC_US";
     const CERTIFICATE_EXPIRY_DATE_WARNING_DAYS = 90;
     const MLE_AUTH_ERROR = "MLE is only supported in JWT auth type";
+    const EMPTY_PRIVATE_OR_PUBLIC_KEY_ERROR = "Private key or public key is empty";
 }
 ?>