diff options
author | blizzz <blizzz@arthur-schiwon.de> | 2020-01-23 11:47:43 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-23 11:47:43 +0100 |
commit | 2f27f122e167f27f1b09c3a4c9b70754ab953e88 (patch) | |
tree | 05f818db56426359f6d79b012aedc377a649e041 /lib | |
parent | 8eefb586462935d5143cc9b5153914977d048462 (diff) | |
parent | 51d168019f1420b0d025f825abf17f25287cf0d9 (diff) | |
download | nextcloud-server-2f27f122e167f27f1b09c3a4c9b70754ab953e88.tar.gz nextcloud-server-2f27f122e167f27f1b09c3a4c9b70754ab953e88.zip |
Merge pull request #19023 from nextcloud/enh+fix/17131/hasher-config
expose Argon2 options (as we did for bcrypt)
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/Security/Hasher.php | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/private/Security/Hasher.php b/lib/private/Security/Hasher.php index dc7704cdcb7..5f8529c7828 100644 --- a/lib/private/Security/Hasher.php +++ b/lib/private/Security/Hasher.php @@ -63,6 +63,20 @@ class Hasher implements IHasher { public function __construct(IConfig $config) { $this->config = $config; + 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)) { $this->options['cost'] = $hashingCost; |