fixes #813 by adding a few more try-catch (#814)

* fixes #813 by adding a few more try-catch
LycheeOrg · Dec 12, 2020 · 68ef354 · 68ef354
1 parent c373443
commit 68ef354
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 30 deletions.
diff --git a/app/ControllerFunctions/Install/DefaultConfig.php b/app/ControllerFunctions/Install/DefaultConfig.php
@@ -98,6 +98,29 @@ class DefaultConfig
 		//			],
 	];
 
+	/**
+	 * Set the result array permissions and errors.
+	 *
+	 * @return mixed
+	 */
+	public function __construct()
+	{
+		$db_possibilities = [
+			['mysql', 'mysqli'],
+			['mysql', 'pdo_mysql'],
+			['pgsql', 'pgsql'],
+			['pgsql', 'pdo_pgsql'],
+			['sqlite', 'sqlite3'],
+		];
+
+		// additional requirement depending of the .env/base config
+		foreach ($db_possibilities as $db_possibility) {
+			if (config('database.default') == $db_possibility[0]) {
+				$this->config['requirements']['php'][] = $db_possibility[1];
+			}
+		}
+	}
+
 	public function get_core()
 	{
 		return $this->config['core'];

diff --git a/app/ControllerFunctions/Install/RequirementsChecker.php b/app/ControllerFunctions/Install/RequirementsChecker.php
@@ -23,9 +23,9 @@ public function check(array $requirements)
 		$results = [];
 		foreach ($requirements as $type => $requirement_) {
 			switch ($type) {
-				// check php requirements
+					// check php requirements
 				case 'php':
-					foreach ($requirements[$type] as $requirement) {
+					foreach ($requirement_ as $requirement) {
 						$results['requirements'][$type][$requirement] = true;
 						if (!extension_loaded($requirement)) {
 							// @codeCoverageIgnoreStart
@@ -45,9 +45,9 @@ public function check(array $requirements)
 					}
 
 					break;
-				// check apache requirements
+					// check apache requirements
 				case 'apache':
-					foreach ($requirements[$type] as $requirement) {
+					foreach ($requirement_ as $requirement) {
 						// if function doesn't exist we can't check apache modules
 						// @codeCoverageIgnoreStart
 						if (function_exists('apache_get_modules')) {
@@ -63,10 +63,10 @@ public function check(array $requirements)
 					}
 					break;
 
-				// @codeCoverageIgnoreStart
+					// @codeCoverageIgnoreStart
 				default:
 					break;
-				// @codeCoverageIgnoreEnd
+					// @codeCoverageIgnoreEnd
 			}
 		}
 
@@ -90,7 +90,8 @@ public function checkPHPversion(string $minPhpVersion = null)
 			$minVersionPhp = $this->getMinPhpVersion();
 			// @codeCoverageIgnoreEnd
 		}
-		if (version_compare($currentPhpVersion['version'], $minVersionPhp)
+		if (
+			version_compare($currentPhpVersion['version'], $minVersionPhp)
 			>= 0
 		) {
 			$supported = true;
@@ -145,4 +146,4 @@ protected function getMinPhpVersion()
 	}
 
 	// @codeCoverageIgnoreEnd
-}
+}
diff --git a/app/Http/Middleware/AdminCheck.php b/app/Http/Middleware/AdminCheck.php
@@ -4,6 +4,7 @@
 
 namespace App\Http\Middleware;
 
+use App\MiddlewareFunctions\IsInstalled;
 use App\ModelFunctions\SessionFunctions;
 use Closure;
 use Illuminate\Http\Request;
@@ -30,6 +31,10 @@ public function __construct(SessionFunctions $sessionFunctions)
 	 */
 	public function handle($request, Closure $next)
 	{
+		if (!IsInstalled::assert()) {
+			return $next($request);
+		}
+
 		if (!$this->sessionFunctions->is_admin()) {
 			return response('false');
 		}

diff --git a/app/Http/Middleware/DBExists.php b/app/Http/Middleware/DBExists.php
@@ -6,6 +6,7 @@
 
 use App\Redirections\ToInstall;
 use Closure;
+use Illuminate\Database\QueryException;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Schema;
 
@@ -21,10 +22,14 @@ class DBExists
 	 */
 	public function handle($request, Closure $next)
 	{
-		if (!Schema::hasTable('configs')) {
+		try {
+			if (!Schema::hasTable('configs')) {
+				return ToInstall::go();
+			}
+		} catch (QueryException $e) {
 			return ToInstall::go();
 		}
 
 		return $next($request);
 	}
-}
+}
diff --git a/app/Http/Middleware/InstalledCheck.php b/app/Http/Middleware/InstalledCheck.php
@@ -4,10 +4,10 @@
 
 namespace App\Http\Middleware;
 
+use App\MiddlewareFunctions\IsInstalled;
 use App\Redirections\ToHome;
 use Closure;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Schema;
 
 class InstalledCheck
 {
@@ -21,27 +21,10 @@ class InstalledCheck
 	 */
 	public function handle($request, Closure $next)
 	{
-		// this should not happen but you never know.
-		// if the key is not provided AND
-		//	 the database (config table exists) is set
-		//   or installed.log exists
-		// this will generate an infinite loop. We do not want that.
-		if (file_exists(base_path('.NO_SECURE_KEY'))) {
-			return $next($request);
-		}
-
-		// base safety
-		if (file_exists(base_path('installed.log'))) {
-			return ToHome::go();
-		}
-
-		// This is the second safety:
-		// Assume you do a "git pull" but forget to do the migration,
-		// the installed.log will not be created!!!
-		if (Schema::hasTable('configs')) {
+		if (IsInstalled::assert()) {
 			return ToHome::go();
 		}
 
 		return $next($request);
 	}
-}
+}
diff --git a/app/MiddlewareFunctions/IsInstalled.php b/app/MiddlewareFunctions/IsInstalled.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\MiddlewareFunctions;
+
+use Illuminate\Database\QueryException;
+use Illuminate\Support\Facades\Schema;
+
+class IsInstalled
+{
+	public static function assert(): bool
+	{
+		// this should not happen but you never know.
+		// if the key is not provided AND
+		//	 the database (config table exists) is set
+		//   or installed.log exists
+		// this will generate an infinite loop. We do not want that.
+		if (file_exists(base_path('.NO_SECURE_KEY'))) {
+			return false;
+		}
+
+		// base safety
+		if (file_exists(base_path('installed.log'))) {
+			return true;
+		}
+
+		// This is the second safety:
+		// Assume you do a "git pull" but forget to do the migration,
+		// the installed.log will not be created!!!
+		try {
+			if (Schema::hasTable('configs')) {
+				return true;
+			}
+
+			return false;
+		} catch (QueryException $e) {
+			return false;
+		}
+	}
+}