diff options
| author | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2020-01-21 11:58:13 +0100 |
|---|---|---|
| committer | Backportbot <backportbot-noreply@rullzer.com> | 2020-01-23 10:48:42 +0000 |
| commit | 9a7e7c3d421f1add094f36204b4d7c95684c9957 (patch) | |
| tree | 07cdfdda776831175aaf71eb2515461e370efda3 /lib/private/Security | |
| parent | e186fecd167066bc202bf5117c162ce7c36a98dc (diff) | |
| download | nextcloud-server-9a7e7c3d421f1add094f36204b4d7c95684c9957.tar.gz nextcloud-server-9a7e7c3d421f1add094f36204b4d7c95684c9957.zip | |
ignore values that undershoot the minimum, go with default
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Diffstat (limited to 'lib/private/Security')
| -rw-r--r-- | lib/private/Security/Hasher.php | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/lib/private/Security/Hasher.php b/lib/private/Security/Hasher.php index 193c2775b90..5f8529c7828 100644 --- a/lib/private/Security/Hasher.php +++ b/lib/private/Security/Hasher.php @@ -63,11 +63,19 @@ class Hasher implements IHasher { public function __construct(IConfig $config) { $this->config = $config; - $this->options = [ - 'memory_cost' => $this->config->getSystemValueInt('hashingMemoryCost', PASSWORD_ARGON2_DEFAULT_MEMORY_COST), - 'time_cost' => $this->config->getSystemValueInt('hashingTimeCost', PASSWORD_ARGON2_DEFAULT_TIME_COST), - 'threads' => $this->config->getSystemValueInt('hashingThreads', PASSWORD_ARGON2_DEFAULT_THREADS), - ]; + if (\defined('PASSWORD_ARGON2I')) { + // password_hash fails, when the minimum values are undershot. + // In this case, ignore and revert to default + if ($this->config->getSystemValueInt('hashingMemoryCost', PASSWORD_ARGON2_DEFAULT_MEMORY_COST) >= 8) { + $this->options['memory_cost'] = $this->config->getSystemValueInt('hashingMemoryCost', PASSWORD_ARGON2_DEFAULT_MEMORY_COST); + } + if ($this->config->getSystemValueInt('hashingTimeCost', PASSWORD_ARGON2_DEFAULT_MEMORY_COST) >= 1) { + $this->options['time_cost'] = $this->config->getSystemValueInt('hashingTimeCost', PASSWORD_ARGON2_DEFAULT_TIME_COST); + } + if ($this->config->getSystemValueInt('hashingThreads', PASSWORD_ARGON2_DEFAULT_MEMORY_COST) >= 1) { + $this->options['threads'] = $this->config->getSystemValueInt('hashingThreads', PASSWORD_ARGON2_DEFAULT_THREADS); + } + } $hashingCost = $this->config->getSystemValue('hashingCost', null); if(!\is_null($hashingCost)) { |