Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-06 14:20:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

initialize argon params before creating the data provider

Browse Source 
Fixes #349
This commit is contained in:
Nicola Murino
2021-03-21 19:58:57 +01:00
parent f249286cb1
commit f7c7e2951d
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dataprovider/dataprovider.go
View File

@@ -427,6 +427,13 @@ func Initialize(cnf Config, basePath string, checkAdmins bool) error {
credentialsDirPath = filepath.Join(basePath, config.CredentialsPath) credentialsDirPath = filepath.Join(basePath, config.CredentialsPath)
} }
vfs.SetCredentialsDirPath(credentialsDirPath) vfs.SetCredentialsDirPath(credentialsDirPath)
argon2Params = &argon2id.Params{
Memory: cnf.PasswordHashing.Argon2Options.Memory,
Iterations: cnf.PasswordHashing.Argon2Options.Iterations,
Parallelism: cnf.PasswordHashing.Argon2Options.Parallelism,
SaltLength: 16,
KeyLength: 32,
}
if err = validateHooks(); err != nil { if err = validateHooks(); err != nil {
return err return err
@@ -435,13 +442,6 @@ func Initialize(cnf Config, basePath string, checkAdmins bool) error {
if err != nil { if err != nil {
return err return err
} }
argon2Params = &argon2id.Params{
Memory: cnf.PasswordHashing.Argon2Options.Memory,
Iterations: cnf.PasswordHashing.Argon2Options.Iterations,
Parallelism: cnf.PasswordHashing.Argon2Options.Parallelism,
SaltLength: 16,
KeyLength: 32,
}
if cnf.UpdateMode == 0 { if cnf.UpdateMode == 0 {
err = provider.initializeDatabase() err = provider.initializeDatabase()
if err != nil && err != ErrNoInitRequired { if err != nil && err != ErrNoInitRequired {