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

🎨 初始化数据仓库密钥时自动创建第一个数据快照

Browse source
This commit is contained in:
Liang Ding 2022-06-16 21:59:41 +08:00
parent a9651ad07e
commit 719aa13838
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
kernel/api/repo.go
View file

@ -20,7 +20,6 @@ import (
"encoding/hex" "encoding/hex"
"fmt" "fmt"
"net/http" "net/http"
"time"
"github.com/88250/gulu" "github.com/88250/gulu"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
@ -95,31 +94,24 @@ func importRepoKey(c *gin.Context) {
return return
} }
msgId := util.PushMsg(model.Conf.Language(136), 1000*7)
hexKey := arg["key"].(string) hexKey := arg["key"].(string)
if err := model.ImportRepoKey(hexKey); nil != err { if err := model.ImportRepoKey(hexKey); nil != err {
ret.Code = -1 ret.Code = -1
ret.Msg = model.Conf.Language(137) ret.Msg = model.Conf.Language(137)
return return
} }
time.Sleep(1 * time.Second)
util.PushUpdateMsg(msgId, model.Conf.Language(138), 3000)
} }
func initRepoKey(c *gin.Context) { func initRepoKey(c *gin.Context) {
ret := gulu.Ret.NewResult() ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret) defer c.JSON(http.StatusOK, ret)
msgId := util.PushMsg(model.Conf.Language(136), 1000*7)
if err := model.InitRepoKey(); nil != err { if err := model.InitRepoKey(); nil != err {
ret.Code = -1 ret.Code = -1
ret.Msg = model.Conf.Language(137) ret.Msg = model.Conf.Language(137)
return return
} }
time.Sleep(1 * time.Second)
util.PushUpdateMsg(msgId, model.Conf.Language(138), 3000)
ret.Data = map[string]interface{}{ ret.Data = map[string]interface{}{
"key": hex.EncodeToString(model.Conf.Repo.Key), "key": hex.EncodeToString(model.Conf.Repo.Key),
} }

20
kernel/model/repository.go
View file

@ -60,6 +60,8 @@ func GetRepoIndexLogs(page int) (logs []*dejavu.Log, pageCount, totalCount int,
} }
func ImportRepoKey(hexKey string) (err error) { func ImportRepoKey(hexKey string) (err error) {
msgId := util.PushMsg(Conf.Language(136), 1000*7)
key, err := hex.DecodeString(hexKey) key, err := hex.DecodeString(hexKey)
if nil != err { if nil != err {
return return
@ -73,10 +75,19 @@ func ImportRepoKey(hexKey string) (err error) {
if err = os.MkdirAll(Conf.Repo.GetSaveDir(), 0755); nil != err { if err = os.MkdirAll(Conf.Repo.GetSaveDir(), 0755); nil != err {
return return
} }
time.Sleep(1 * time.Second)
util.PushUpdateMsg(msgId, Conf.Language(138), 3000)
time.Sleep(1 * time.Second)
if initErr := IndexRepo("Init data repo"); nil != initErr {
util.PushUpdateMsg(msgId, fmt.Sprintf(Conf.Language(140), initErr), 7000)
}
return return
} }
func InitRepoKey() (err error) { func InitRepoKey() (err error) {
msgId := util.PushMsg(Conf.Language(136), 1000*7)
if err = os.RemoveAll(Conf.Repo.GetSaveDir()); nil != err { if err = os.RemoveAll(Conf.Repo.GetSaveDir()); nil != err {
return return
} }
@ -94,6 +105,7 @@ func InitRepoKey() (err error) {
_, err = rand.Read(randomBytes) _, err = rand.Read(randomBytes)
if nil != err { if nil != err {
util.LogErrorf("init repo key failed: %s", err) util.LogErrorf("init repo key failed: %s", err)
util.PushUpdateMsg(msgId, Conf.Language(137), 5000)
return return
} }
salt := string(randomBytes) salt := string(randomBytes)
@ -101,10 +113,18 @@ func InitRepoKey() (err error) {
key, err := encryption.KDF(password, salt) key, err := encryption.KDF(password, salt)
if nil != err { if nil != err {
util.LogErrorf("init repo key failed: %s", err) util.LogErrorf("init repo key failed: %s", err)
util.PushUpdateMsg(msgId, Conf.Language(137), 5000)
return return
} }
Conf.Repo.Key = key Conf.Repo.Key = key
Conf.Save() Conf.Save()
time.Sleep(1 * time.Second)
util.PushUpdateMsg(msgId, Conf.Language(138), 3000)
time.Sleep(1 * time.Second)
if initErr := IndexRepo("Init data repo"); nil != initErr {
util.PushUpdateMsg(msgId, fmt.Sprintf(Conf.Language(140), initErr), 7000)
}
return return
} }