Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 07:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 支持通过密码短语派生数据仓库密钥 https://github.com/siyuan-note/siyuan/issues/5478

Browse source
This commit is contained in:
Liang Ding 2022-07-21 21:43:46 +08:00
parent bd30383be5
commit 25d3985ed0
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
3 changed files with 58 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

22
kernel/api/repo.go
View file

@ -252,6 +252,28 @@ func importRepoKey(c *gin.Context) {
}
}
func initRepoKeyFromPassphrase(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)
arg, ok := util.JsonArg(c, ret)
if !ok {
return
}
pass := arg["pass"].(string)
if err := model.InitRepoKeyFromPassphrase(pass); nil != err {
ret.Code = -1
ret.Msg = fmt.Sprintf(model.Conf.Language(137), err)
ret.Data = map[string]interface{}{"closeTimeout": 5000}
return
}
ret.Data = map[string]interface{}{
"key": model.Conf.Repo.Key,
}
}
func initRepoKey(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)

1
kernel/api/router.go
View file

@ -244,6 +244,7 @@ func ServeAPI(ginServer *gin.Engine) {
ginServer.Handle("POST", "/api/bazaar/getBazaarPackageREAME", model.CheckAuth, getBazaarPackageREAME)
ginServer.Handle("POST", "/api/repo/initRepoKey", model.CheckAuth, initRepoKey)
ginServer.Handle("POST", "/api/repo/InitRepoKeyFromPassphrase", model.CheckAuth, initRepoKeyFromPassphrase)
ginServer.Handle("POST", "/api/repo/resetRepo", model.CheckAuth, resetRepo)
ginServer.Handle("POST", "/api/repo/importRepoKey", model.CheckAuth, importRepoKey)
ginServer.Handle("POST", "/api/repo/createSnapshot", model.CheckAuth, createSnapshot)

35
kernel/model/repository.go
View file

@ -18,6 +18,7 @@ package model
import (
"crypto/rand"
"crypto/sha256"
"encoding/base64"
"errors"
"fmt"
@ -125,6 +126,40 @@ func ResetRepo() (err error) {
return
}
func InitRepoKeyFromPassphrase(passphrase string) (err error) {
util.PushMsg(Conf.Language(136), 3000)
if err = os.RemoveAll(Conf.Repo.GetSaveDir()); nil != err {
return
}
if err = os.MkdirAll(Conf.Repo.GetSaveDir(), 0755); nil != err {
return
}
passphrase = gulu.Str.RemoveInvisible(passphrase)
passphrase = strings.TrimSpace(passphrase)
if "" == passphrase {
return errors.New(Conf.Language(142))
}
salt := fmt.Sprintf("%x", sha256.Sum256([]byte(passphrase)))[:16]
key, err := encryption.KDF(passphrase, salt)
if nil != err {
logging.LogErrorf("init data repo key failed: %s", err)
return
}
Conf.Repo.Key = key
Conf.Save()
time.Sleep(1 * time.Second)
util.PushMsg(Conf.Language(138), 3000)
time.Sleep(1 * time.Second)
if initErr := IndexRepo("[Init] Init data repo"); nil != initErr {
util.PushErrMsg(fmt.Sprintf(Conf.Language(140), initErr), 0)
}
return
}
func InitRepoKey() (err error) {
util.PushMsg(Conf.Language(136), 3000)