Improve Handler loadSecretHash

Move parse_ini_file to loadSecretHash to throw a more informative error.

Author: likel

src/models/DB.php

@@ -62,7 +62,6 @@ private function loadDatabase($credentials_location)
                     $this->table_prefix = $db_credentials["likel_db"]["table_prefix"];
 
                     return $pdo_object;
-
                 } catch(\PDOException $e) {
                     throw new \Exception($e->getMessage());
                 }

src/models/Session/Handler.php

@@ -47,8 +47,7 @@ function __construct($parameters = array())
         if($this->db->databaseInitialised()) {
             // Attempt to get the secret_hash from the credentials file
             try {
-                $session_credentials = parse_ini_file($parameters["credentials_location"], true);
-                $this->secret_hash = $this->loadSecretHash($session_credentials["likel_session"]);
+                $this->secret_hash = $this->loadSecretHash($parameters["credentials_location"]);
 
                 // Start session
                 $this->start_session($parameters["session_name"], $parameters["secure"]);
@@ -58,6 +57,33 @@ function __construct($parameters = array())
         }
     }
 
+    /**
+     * Attempt to retrieve the secret_hash from the credentials file
+     *
+     * @param array $credentials likel_session from the credentials.ini file
+     * @return string
+     * @throws \Exception If credentials empty or not found
+     */
+    private function loadSecretHash($credentials_location)
+    {
+        if(file_exists($credentials_location)) {
+            $session_credentials = parse_ini_file($credentials_location, true);
+            $credentials = $session_credentials["likel_session"];
+
+            if(!empty($credentials)){
+                if(!empty($credentials["secret_hash"])) {
+                    return $credentials["secret_hash"];
+                } else {
+                    throw new \Exception('The session_hash variable is empty.');
+                }
+            } else {
+                throw new \Exception('The likel_session parameter in the credentials file cannot be found.');
+            }
+        } else {
+            throw new \Exception('The credential file could not be located.');
+        }
+    }
+
     /**
      * Open the session if the db connection has been made
      *
@@ -247,27 +273,6 @@ private function getKeyAndIv($id)
         }
     }
 
-    /**
-     * Attempt to retrieve the secret_hash from the credentials file
-     *
-     * @param array $credentials likel_session from the credentials.ini file
-     * @return string
-     * @throws \Exception If credentials empty or not found
-     */
-    private function loadSecretHash($credentials)
-    {
-        if(!empty($credentials)){
-            if(!empty($credentials["secret_hash"])) {
-                return $credentials["secret_hash"];
-            } else {
-                throw new \Exception('The session_hash variable is empty.');
-            }
-
-        } else {
-            throw new \Exception('The credential file could not be located or is empty.');
-        }
-    }
-
     /**
      * Setup and start the session
      *