Procházet zdrojové kódy

Sanitize DB install params (#9595)

Alexandre Alapetite před 9 hodinami
rodič
revize
67cb0a2d9a
4 změnil soubory, kde provedl 47 přidání a 4 odebrání
  1. 7 2
      app/install.php
  2. 2 2
      lib/Minz/ModelPdo.php
  3. 10 0
      lib/lib_install.php
  4. 28 0
      tests/lib/InstallTest.php

+ 7 - 2
app/install.php

@@ -117,13 +117,18 @@ function saveStep2(): void {
 			) {
 				Minz_Session::_param('db_error', 'Missing parameters!');
 			} else {
-				Minz_Session::_params([
+				$dbParams = [
 					'db_base' => substr($_POST['base'], 0, 64),
 					'db_host' => $_POST['host'],
 					'db_user' => $_POST['user'],
 					'db_password' => $_POST['pass'],
 					'db_prefix' => substr($_POST['prefix'], 0, 16),
-				]);
+				];
+				if (!checkDbParameters($dbParams['db_host'], $dbParams['db_user'], $dbParams['db_base'], $dbParams['db_prefix'])) {
+					Minz_Session::_param('db_error', 'Invalid parameters!');
+					return;
+				}
+				Minz_Session::_params($dbParams);
 			}
 		}
 

+ 2 - 2
lib/Minz/ModelPdo.php

@@ -76,9 +76,9 @@ class Minz_ModelPdo {
 				$this->pdo->setPrefix('');
 				break;
 			case 'pgsql':
-				$dsn = 'pgsql:host=' . (empty($dbServer['host']) ? $db['host'] : $dbServer['host']);
+				$dsn = "pgsql:host='" . addcslashes(empty($dbServer['host']) ? $db['host'] : $dbServer['host'], "'\\") . "'";
 				if (!empty($db['base'])) {
-					$dsn .= ';dbname=' . $db['base'];
+					$dsn .= ";dbname='" . addcslashes($db['base'], "'\\") . "'";
 				}
 				if (!empty($dbServer['port'])) {
 					$dsn .= ';port=' . $dbServer['port'];

+ 10 - 0
lib/lib_install.php

@@ -17,6 +17,16 @@ function gmpRequirementStatus(int $integerSize = PHP_INT_SIZE, ?bool $gmpLoaded
 	return ($gmpLoaded ?? extension_loaded('gmp')) ? 'ok' : 'ko';
 }
 
+/**
+ * Server-side check of the database parameters received by the Web installer
+ */
+function checkDbParameters(string $host, string $user, string $base, string $prefix): bool {
+	return preg_match('/^[0-9A-Z\/a-z_.\-]{1,64}(:[0-9]{2,5})?$/D', $host) === 1 &&
+		preg_match('/^[0-9A-Za-z@_.\-]{1,64}$/D', $user) === 1 &&
+		preg_match('/^[0-9A-Za-z_\-]{1,64}$/D', $base) === 1 &&
+		preg_match('/^[0-9A-Za-z_]{0,16}$/D', $prefix) === 1;
+}
+
 /**
  * @param 'mysql'|'pgsql'|'sqlite'|'' $dbType
  * @return array<string,'ok'|'ko'|'warn'>

+ 28 - 0
tests/lib/InstallTest.php

@@ -21,4 +21,32 @@ final class InstallTest extends \PHPUnit\Framework\TestCase {
 	public function testGmpRequirementStatus(int $integerSize, bool $gmpLoaded, ?string $expected): void {
 		self::assertSame($expected, gmpRequirementStatus($integerSize, $gmpLoaded));
 	}
+
+	/**
+	 * @return list<array{string,string,string,string,bool}>
+	 */
+	public static function provideDbParameters(): array {
+		return [
+			['localhost', 'freshrss', 'freshrss', 'freshrss_', true],
+			['db.example.net:5432', 'fresh.rss@example-net', 'fresh-rss_1', '', true],
+			['/var/run/postgresql', 'freshrss', 'freshrss', 'freshrss_', true],
+			// Additional libpq connection parameters
+			['/ host=127.0.0.1 sslkey=/proc/self/fd/10:key', 'freshrss', 'freshrss', 'freshrss_', false],
+			['localhost', 'freshrss', 'x sslcert=/lib/ssl/cert.pem sslkey=/dev/fd/10:k', 'freshrss_', false],
+			// Additional PDO connection parameters
+			['localhost;unix_socket=/tmp/mysql.sock', 'freshrss', 'freshrss', 'freshrss_', false],
+			['localhost', 'freshrss', 'freshrss;charset=latin1', 'freshrss_', false],
+			["localhost\n", 'freshrss', 'freshrss', 'freshrss_', false],
+			['', 'freshrss', 'freshrss', 'freshrss_', false],
+			['localhost', "fresh'rss", 'freshrss', 'freshrss_', false],
+			['localhost', 'freshrss', 'fresh"rss', 'freshrss_', false],
+			['localhost', 'freshrss', 'freshrss', 'fresh`rss_', false],
+			['localhost', 'freshrss', 'freshrss', 'a_prefix_too_long', false],
+		];
+	}
+
+	#[DataProvider('provideDbParameters')]
+	public function testCheckDbParameters(string $host, string $user, string $base, string $prefix, bool $expected): void {
+		self::assertSame($expected, checkDbParameters($host, $user, $base, $prefix));
+	}
 }