Browse Source

initialize argon params before creating the data provider

Fixes #349
Nicola Murino 4 years ago
parent
commit
f7c7e2951d
1 changed files with 7 additions and 7 deletions
  1. 7 7
      dataprovider/dataprovider.go

+ 7 - 7
dataprovider/dataprovider.go

@@ -427,6 +427,13 @@ func Initialize(cnf Config, basePath string, checkAdmins bool) error {
 		credentialsDirPath = filepath.Join(basePath, config.CredentialsPath)
 	}
 	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 {
 		return err
@@ -435,13 +442,6 @@ func Initialize(cnf Config, basePath string, checkAdmins bool) error {
 	if err != nil {
 		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 {
 		err = provider.initializeDatabase()
 		if err != nil && err != ErrNoInitRequired {