PDO - support username & password specified in DSN

Author: SjonHortensius

ext/pdo_mysql/mysql_driver.c

@@ -549,9 +549,11 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options)
 	struct pdo_data_src_parser vars[] = {
 		{ "charset",  NULL,	0 },
 		{ "dbname",   "",	0 },
-		{ "host",   "localhost",	0 },
-		{ "port",   "3306",	0 },
+		{ "host",     "localhost",	0 },
+		{ "port",     "3306",	0 },
 		{ "unix_socket",  PDO_DEFAULT_MYSQL_UNIX_ADDR,	0 },
+		{ "user",     NULL,	0 },
+		{ "password", NULL,	0 },
 	};
 	int connect_opts = 0
 #ifdef CLIENT_MULTI_RESULTS
@@ -577,7 +579,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options)
 	PDO_DBG_INF("multi results");
 #endif
 
-	php_pdo_parse_data_source(dbh->data_source, dbh->data_source_len, vars, 5);
+	php_pdo_parse_data_source(dbh->data_source, dbh->data_source_len, vars, 7);
 
 	H = pecalloc(1, sizeof(pdo_mysql_db_handle), dbh->is_persistent);
 
@@ -775,6 +777,14 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options)
 		unix_socket = vars[4].optval;
 	}
 
+	if (!dbh->username && vars[5].optval) {
+		dbh->username = vars[5].optval;
+	}
+
+	if (!dbh->password && vars[6].optval) {
+		dbh->password = vars[6].optval;
+	}
+
 	/* TODO: - Check zval cache + ZTS */
 #ifdef PDO_USE_MYSQLND
 	if (dbname) {

ext/pdo_mysql/tests/pdo_mysql_dsn_containing_credentials.phpt

@@ -0,0 +1,27 @@
+--TEST--
+PDO_MYSQL: Pass credentials in dsn instead of constructor params
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
+require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+MySQLPDOTest::skip();
+?>
+--FILE--
+<?php
+	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+
+	class MySQLPDOTestDiscardCredentialParams extends MySQLPDOTest {
+		public function __construct($dsn, $user, $pass, $attr) {
+			return parent::__construct($dsn, null, null, $attr);
+		}
+	}
+
+	$link = MySQLPDOTestDiscardCredentialParams::factory('PDO', false, null, ['user' => PDO_MYSQL_TEST_USER, 'password' => PDO_MYSQL_TEST_PASS]);
+	echo "using credentials in dsn: done\n";
+
+	// test b/c - credentials in DSN are ignored when user/pass passed as separate params
+	$link = MySQLPDOTest::factory('PDO', false, null, ['user' => 'incorrect', 'password' => 'ignored']);
+	echo "ignoring credentials in dsn: done\n";
+?>
+--EXPECTF--
+done!