diff options
author | MichaIng <micha@dietpi.com> | 2020-04-28 21:04:34 +0200 |
---|---|---|
committer | Roeland Jago Douma <roeland@famdouma.nl> | 2020-04-30 10:18:46 +0200 |
commit | ad606196554dadea49e5ddfa44fb54b89ba24d3e (patch) | |
tree | 8069559c81a3d7b7236485faa512c04318d9a37e /tests | |
parent | a1c1b354fcb79153a78a658b758acd514089c9e1 (diff) | |
download | nextcloud-server-ad606196554dadea49e5ddfa44fb54b89ba24d3e.tar.gz nextcloud-server-ad606196554dadea49e5ddfa44fb54b89ba24d3e.zip |
Fix Argon2 options checks
The minimum for memory cost is 8 KiB per thread. Threads must be checked and set first to allow checking against the correct memory cost mimimum.
Options are now applied the following way:
- If config.php contains the setting with an integer higher or equal to the minimum, it is applied.
- If config.php contains the setting with an integer lower than the minimum, the minimum is applied.
- If config.php does not contain the setting or with no integer value, the PHP default is applied.
Signed-off-by: MichaIng <micha@dietpi.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/lib/Security/HasherTest.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/lib/Security/HasherTest.php b/tests/lib/Security/HasherTest.php index cc5cb786088..e1faef2f69b 100644 --- a/tests/lib/Security/HasherTest.php +++ b/tests/lib/Security/HasherTest.php @@ -113,6 +113,11 @@ class HasherTest extends \Test\TestCase { $this->config = $this->createMock(IConfig::class); + $this->config->method('getSystemValueInt') + ->willReturnCallback(function ($name, $default) { + return $default; + }); + $this->hasher = new Hasher($this->config); } |