Extract some common checks from common.inc.php

Signed-off-by: Maurício Meneghini Fauth <[email protected]>
LordRobinCbz · Jul 6, 2021 · 17f4e09 · 17f4e09
1 parent 1a2d780
commit 17f4e09
Show file tree

Hide file tree

Showing 9 changed files with 121 additions and 63 deletions.
diff --git a/index.php b/index.php
@@ -10,6 +10,30 @@
     // phpcs:enable
 }
 
+if (PHP_VERSION_ID < 70205) {
+    die('<p>PHP 7.2.5+ is required.</p><p>Currently installed version is: ' . PHP_VERSION . '</p>');
+}
+
+// phpcs:disable PSR1.Files.SideEffects
+define('PHPMYADMIN', true);
+// phpcs:enable
+
+require_once ROOT_PATH . 'libraries/vendor_config.php';
+
+/**
+ * Activate autoloader
+ */
+if (! @is_readable(AUTOLOAD_FILE)) {
+    die(
+        '<p>File <samp>' . AUTOLOAD_FILE . '</samp> missing or not readable.</p>'
+        . '<p>Most likely you did not run Composer to '
+        . '<a href="https://docs.phpmyadmin.net/en/latest/setup.html#installing-from-git">'
+        . 'install library files</a>.</p>'
+    );
+}
+
+require AUTOLOAD_FILE;
+
 global $route, $containerBuilder, $request;
 
 require_once ROOT_PATH . 'libraries/common.inc.php';

diff --git a/js/messages.php b/js/messages.php
@@ -14,6 +14,30 @@
     // phpcs:enable
 }
 
+if (PHP_VERSION_ID < 70205) {
+    die('<p>PHP 7.2.5+ is required.</p><p>Currently installed version is: ' . PHP_VERSION . '</p>');
+}
+
+// phpcs:disable PSR1.Files.SideEffects
+define('PHPMYADMIN', true);
+// phpcs:enable
+
+require_once ROOT_PATH . 'libraries/vendor_config.php';
+
+/**
+ * Activate autoloader
+ */
+if (! @is_readable(AUTOLOAD_FILE)) {
+    die(
+        '<p>File <samp>' . AUTOLOAD_FILE . '</samp> missing or not readable.</p>'
+        . '<p>Most likely you did not run Composer to '
+        . '<a href="https://docs.phpmyadmin.net/en/latest/setup.html#installing-from-git">'
+        . 'install library files</a>.</p>'
+    );
+}
+
+require AUTOLOAD_FILE;
+
 chdir('..');
 
 // Send correct type.

diff --git a/libraries/common.inc.php b/libraries/common.inc.php
@@ -47,68 +47,15 @@
 use PhpMyAdmin\ThemeManager;
 use PhpMyAdmin\Tracker;
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /** @psalm-suppress InvalidGlobal */
 global $containerBuilder, $errorHandler, $config, $server, $dbi, $request,
        $lang, $cfg, $isConfigLoading, $auth_plugin, $route, $theme,
        $urlParams, $goto, $back, $db, $table, $sql_query, $token_mismatch;
 
-/**
- * block attempts to directly run this script
- */
-if (getcwd() == __DIR__) {
-    die('Attack stopped');
-}
-
-/**
- * Minimum PHP version; can't call Core::fatalError() which uses a
- * PHP 5 function, so cannot easily localize this message.
- */
-if (PHP_VERSION_ID < 70205) {
-    die(
-        '<p>PHP 7.2.5+ is required.</p>'
-        . '<p>Currently installed version is: ' . PHP_VERSION . '</p>'
-    );
-}
-
-// phpcs:disable PSR1.Files.SideEffects
-/**
- * for verification in all procedural scripts under libraries
- */
-define('PHPMYADMIN', true);
-// phpcs:enable
-
-/**
- * Load vendor configuration.
- */
-require_once ROOT_PATH . 'libraries/vendor_config.php';
-
-/**
- * Activate autoloader
- */
-if (! @is_readable(AUTOLOAD_FILE)) {
-    die(
-        '<p>File <samp>' . AUTOLOAD_FILE . '</samp> missing or not readable.</p>'
-        . '<p>Most likely you did not run Composer to '
-        . '<a href="https://docs.phpmyadmin.net/en/latest/setup.html#installing-from-git">'
-        . 'install library files</a>.</p>'
-    );
-}
-
-require_once AUTOLOAD_FILE;
-
-/**
- * (TCPDF workaround)
- * Avoid referring to nonexistent files (causes warnings when open_basedir is used)
- * This is defined to avoid the tcpdf code to search for a directory outside of open_basedir
- * See: https://github.com/phpmyadmin/phpmyadmin/issues/16709
- * This value if not used but is usefull, no header logic is used for PDF exports
- */
-if (! defined('K_PATH_IMAGES')) {
-    // phpcs:disable PSR1.Files.SideEffects
-    define('K_PATH_IMAGES', ROOT_PATH);
-    // phpcs:enable
-}
-
 $request = ServerRequestFactory::createFromGlobals();
 
 $route = Routing::getCurrentRoute();

diff --git a/libraries/vendor_config.php b/libraries/vendor_config.php
@@ -85,3 +85,12 @@
  * Suffix to add to the phpMyAdmin version
  */
 define('VERSION_SUFFIX', '');
+
+/**
+ * TCPDF workaround. Avoid referring to nonexistent files (causes warnings when open_basedir is used).
+ * This is defined to avoid the TCPDF code to search for a directory outside of open_basedir.
+ * This value if not used but is useful, no header logic is used for PDF exports.
+ *
+ * @see https://github.com/phpmyadmin/phpmyadmin/issues/16709
+ */
+define('K_PATH_IMAGES', ROOT_PATH);
diff --git a/setup/config.php b/setup/config.php
@@ -17,9 +17,10 @@
     // phpcs:enable
 }
 
-/**
- * Core libraries.
- */
+// phpcs:disable PSR1.Files.SideEffects
+define('PHPMYADMIN', true);
+// phpcs:enable
+
 require ROOT_PATH . 'setup/lib/common.inc.php';
 
 $form_display = new ConfigForm($GLOBALS['ConfigFile']);

diff --git a/setup/index.php b/setup/index.php
@@ -22,6 +22,10 @@
 /** @psalm-suppress InvalidGlobal */
 global $cfg;
 
+// phpcs:disable PSR1.Files.SideEffects
+define('PHPMYADMIN', true);
+// phpcs:enable
+
 require ROOT_PATH . 'setup/lib/common.inc.php';
 
 if (@file_exists(CONFIG_FILE) && ! $cfg['DBG']['demo']) {

diff --git a/setup/lib/common.inc.php b/setup/lib/common.inc.php
@@ -8,6 +8,30 @@
 use PhpMyAdmin\Config\ConfigFile;
 use PhpMyAdmin\DatabaseInterface;
 
+if (PHP_VERSION_ID < 70205) {
+    die('<p>PHP 7.2.5+ is required.</p><p>Currently installed version is: ' . PHP_VERSION . '</p>');
+}
+
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
+require_once ROOT_PATH . 'libraries/vendor_config.php';
+
+/**
+ * Activate autoloader
+ */
+if (! @is_readable(AUTOLOAD_FILE)) {
+    die(
+        '<p>File <samp>' . AUTOLOAD_FILE . '</samp> missing or not readable.</p>'
+        . '<p>Most likely you did not run Composer to '
+        . '<a href="https://docs.phpmyadmin.net/en/latest/setup.html#installing-from-git">'
+        . 'install library files</a>.</p>'
+    );
+}
+
+require AUTOLOAD_FILE;
+
 chdir('..');
 
 if (! file_exists(ROOT_PATH . 'libraries/common.inc.php')) {

diff --git a/setup/validate.php b/setup/validate.php
@@ -14,9 +14,10 @@
     // phpcs:enable
 }
 
-/**
- * Core libraries.
- */
+// phpcs:disable PSR1.Files.SideEffects
+define('PHPMYADMIN', true);
+// phpcs:enable
+
 require ROOT_PATH . 'setup/lib/common.inc.php';
 
 $validators = [];

diff --git a/url.php b/url.php
@@ -16,6 +16,30 @@
     // phpcs:enable
 }
 
+if (PHP_VERSION_ID < 70205) {
+    die('<p>PHP 7.2.5+ is required.</p><p>Currently installed version is: ' . PHP_VERSION . '</p>');
+}
+
+// phpcs:disable PSR1.Files.SideEffects
+define('PHPMYADMIN', true);
+// phpcs:enable
+
+require_once ROOT_PATH . 'libraries/vendor_config.php';
+
+/**
+ * Activate autoloader
+ */
+if (! @is_readable(AUTOLOAD_FILE)) {
+    die(
+        '<p>File <samp>' . AUTOLOAD_FILE . '</samp> missing or not readable.</p>'
+        . '<p>Most likely you did not run Composer to '
+        . '<a href="https://docs.phpmyadmin.net/en/latest/setup.html#installing-from-git">'
+        . 'install library files</a>.</p>'
+    );
+}
+
+require AUTOLOAD_FILE;
+
 global $containerBuilder, $dbi;
 
 $isMinimumCommon = true;