mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-28 09:58:52 +03:00
30c6676dc0
Merge in DNS/adguard-home from AG-25392-confmigrate-vol.3 to master Squashed commit of the following: commit 925b35b9fedcdcf18474785530189a1eb504e1d6 Merge: 232f18481581891af2Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Sep 6 12:48:05 2023 +0300 Merge branch 'master' into AG-25392-confmigrate-vol.3 commit 232f18481bbf3400da0b95bcec7949fb3868bf85 Merge: c0d880bed5bd452516Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Sep 5 18:54:47 2023 +0300 Merge branch 'master' into AG-25392-confmigrate-vol.3 commit c0d880bed6e3270e88f5377e66b787565e1249ce Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Sep 5 17:21:57 2023 +0300 confmigrate: fix v15 commit 8a27148b708e6d6a61f8097bf7792aefa1055772 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Sep 5 15:47:18 2023 +0300 confmigrate: imp gocognit, overall
47 lines
846 B
Go
47 lines
846 B
Go
package confmigrate
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"golang.org/x/crypto/bcrypt"
|
|
)
|
|
|
|
// migrateTo5 performs the following changes:
|
|
//
|
|
// # BEFORE:
|
|
// 'schema_version': 4
|
|
// 'auth_name': …
|
|
// 'auth_pass': …
|
|
// # …
|
|
//
|
|
// # AFTER:
|
|
// 'schema_version': 5
|
|
// 'users':
|
|
// - 'name': …
|
|
// 'password': <hashed>
|
|
// # …
|
|
func migrateTo5(diskConf yobj) (err error) {
|
|
diskConf["schema_version"] = 5
|
|
|
|
user := yobj{}
|
|
|
|
if err = moveVal[string](diskConf, user, "auth_name", "name"); err != nil {
|
|
return err
|
|
}
|
|
|
|
pass, ok, err := fieldVal[string](diskConf, "auth_pass")
|
|
if !ok {
|
|
return err
|
|
}
|
|
delete(diskConf, "auth_pass")
|
|
|
|
hash, err := bcrypt.GenerateFromPassword([]byte(pass), bcrypt.DefaultCost)
|
|
if err != nil {
|
|
return fmt.Errorf("generating password hash: %w", err)
|
|
}
|
|
|
|
user["password"] = string(hash)
|
|
diskConf["users"] = yarr{user}
|
|
|
|
return nil
|
|
}
|