Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2252033 by olli, dawehner: Don't serialize database connection info

8.0.x
Nathaniel Catchpole 2015-03-04 15:04:01 +00:00
parent 1ee1495c68
commit 71838159fe
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/lib/Drupal/Core/Database/Connection.php
View File

@ -1273,8 +1273,9 @@ abstract class Connection implements \Serializable {
*/
public function serialize() {
$connection = clone $this;
// Don't serialize the PDO connection and other lazy-instantiated members.
unset($connection->connection, $connection->schema, $connection->driverClasses);
// Don't serialize the PDO connection as well as everything else which
// depends on settings.php.
unset($connection->connection, $connection->connectionOptions, $connection->schema, $connection->prefixes, $connection->prefixReplace, $connection->driverClasses);
return serialize(get_object_vars($connection));
}
@ -1286,6 +1287,8 @@ abstract class Connection implements \Serializable {
foreach ($data as $key => $value) {
$this->{$key} = $value;
}
$this->connectionOptions = Database::getConnectionInfo($this->key)[$this->target];
// Re-establish the PDO connection using the original options.
$this->connection = static::open($this->connectionOptions);
@ -1293,6 +1296,8 @@ abstract class Connection implements \Serializable {
if (!empty($this->statementClass)) {
$this->connection->setAttribute(\PDO::ATTR_STATEMENT_CLASS, array($this->statementClass, array($this)));
}
$this->setPrefix(isset($this->connectionOptions['prefix']) ? $this->connectionOptions['prefix'] : '');
}
}

28
core/modules/system/src/Tests/Database/ConnectionUnitTest.php
View File

@ -7,7 +7,9 @@
namespace Drupal\system\Tests\Database;
use Doctrine\Common\Reflection\StaticReflectionProperty;
use Drupal\Core\Database\Database;
use Drupal\Core\Site\Settings;
use Drupal\simpletest\KernelTestBase;
/**
@ -268,6 +270,32 @@ class ConnectionUnitTest extends KernelTestBase {
}
}
// By using "key", we ensure that its not a key used in the serialized PHP.
$not_serialized_properties = ['"connection"', '"connectionOptions"', '"schema"', '"prefixes"', '"prefixReplace"', '"driverClasses"'];
foreach ($not_serialized_properties as $property) {
$this->assertIdentical(FALSE, strpos($serialized, $property));
}
// Serialize the DB connection again, but this time change the connection
// information under the hood.
$serialized = serialize($db);
$db_connection_info = Database::getAllConnectionInfo();
// Use reflection to empty out $databaseInfo.
$reflection_class = new \ReflectionClass('Drupal\Core\Database\Database');
$database_info_reflection = $reflection_class->getProperty('databaseInfo');
$database_info_reflection->setAccessible(TRUE);
$database_info_reflection->setValue(NULL, []);
// Setup a different DB connection which should be picked up after the
// unserialize.
$db_connection_info['default']['default']['extra'] = 'value';
Database::setMultipleConnectionInfo($db_connection_info);
/** @var \Drupal\Core\Database\Connection $db */
$db = unserialize($serialized);
$this->assertEqual($db->getConnectionOptions()['extra'], 'value');
}
/**