gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12631 from devenbansod/fix_12472

Browse Source 
Fix order of testing DBConnection with different parameters in Config method
This commit is contained in:
Michal Čihař 2016-10-17 17:12:40 +02:00 committed by GitHub
commit 6a4cf7b1ec
3 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/config/ConfigFile.php
View File

@ -416,7 +416,9 @@ class ConfigFile
$dsn = 'mysqli://';
if ($this->getValue("$path/auth_type") == 'config') {
$dsn .= $this->getValue("$path/user");
if (! $this->getValue("$path/nopassword")) {
if (! $this->getValue("$path/nopassword")
|| ! empty($this->getValue("$path/password"))
) {
$dsn .= ':***';
}
$dsn .= '@';

24
libraries/config/Validator.php
View File

@ -271,8 +271,10 @@ class Validator
}
if (! $error && $values['Servers/1/auth_type'] == 'config') {
$password = !empty($values['Servers/1/nopassword']) && $values['Servers/1/nopassword'] ? null
: (empty($values['Servers/1/password']) ? '' : $values['Servers/1/password']);
$password = '';
if (! empty($values['Servers/1/password'])) {
$password = $values['Servers/1/password'];
}
$test = static::testDBConnection(
empty($values['Servers/1/connect_type']) ? '' : $values['Servers/1/connect_type'],
empty($values['Servers/1/host']) ? '' : $values['Servers/1/host'],
@ -282,6 +284,24 @@ class Validator
$password,
'Server'
);
// If failed 'with' password, try 'without' password
if ($test !== true
&& !empty($values['Servers/1/nopassword'])
&& $values['Servers/1/nopassword']
) {
$password = '';
$test = static::testDBConnection(
empty($values['Servers/1/connect_type']) ? '' : $values['Servers/1/connect_type'],
empty($values['Servers/1/host']) ? '' : $values['Servers/1/host'],
empty($values['Servers/1/port']) ? '' : $values['Servers/1/port'],
empty($values['Servers/1/socket']) ? '' : $values['Servers/1/socket'],
empty($values['Servers/1/user']) ? '' : $values['Servers/1/user'],
$password,
'Server'
);
}
if ($test !== true) {
$result = array_merge($result, $test);
}

20
test/classes/config/ConfigFileTest.php
View File

@ -529,6 +529,26 @@ class ConfigFileTest extends PMATestCase
"mysqli://testUser@123",
$this->object->getServerDSN(1)
);
$this->object->updateWithGlobalConfig(
array(
'Servers' => array(
1 => array(
"auth_type" => "config",
"user" => "testUser",
"connect_type" => "tcp",
"host" => "example.com",
"port" => "21",
"nopassword" => "yes",
"password" => "testPass"
)
)
)
);
$this->assertEquals(
"mysqli://testUser:***@example.com:21",
$this->object->getServerDSN(1)
);
}
/**