Pārlūkot izejas kodu

Revert default password setting & using "HiddenString" even for empty strings

tags/2019.09
Philipp Holzer pirms 5 mēnešiem
vecāks
revīzija
e1d135238a
Revīzijas autora e-pasta adrese nav piesaistīta nevienam kontam

+ 1
- 1
config/defaults.config.php Parādīt failu

@@ -22,7 +22,7 @@ return [

// pass (String)
// Database user password. Please don't use empty passwords.
'password' => new \ParagonIE\HiddenString\HiddenString(''),
'password' => '',

// base (String)
// Database name.

+ 1
- 1
src/Core/Config/Cache/ConfigCache.php Parādīt failu

@@ -95,7 +95,7 @@ class ConfigCache implements IConfigCache, IPConfigCache

if ($this->hidePasswordOutput &&
$key == 'password' &&
!empty($value) && is_string($value)) {
is_string($value)) {
$this->config[$cat][$key] = new HiddenString((string) $value);
} else {
$this->config[$cat][$key] = $value;

+ 3
- 1
tests/src/Core/Config/Cache/ConfigCacheTest.php Parādīt failu

@@ -4,6 +4,7 @@ namespace Friendica\Test\src\Core\Config\Cache;

use Friendica\Core\Config\Cache\ConfigCache;
use Friendica\Test\MockedTest;
use ParagonIE\HiddenString\HiddenString;

class ConfigCacheTest extends MockedTest
{
@@ -322,7 +323,8 @@ class ConfigCacheTest extends MockedTest
]
]);

$this->assertEmpty($configCache->get('database', 'password'));
$this->assertNotEmpty($configCache->get('database', 'password'));
$this->assertInstanceOf(HiddenString::class, $configCache->get('database', 'password'));
$this->assertEmpty($configCache->get('database', 'username'));
}


Notiek ielāde…
Atcelt
Saglabāt