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-07-14 11:24:33 +08:00
parent 0afaf36e81
commit 27aebe9041
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
kernel/api/repo.go
View file

@ -247,6 +247,7 @@ func importRepoKey(c *gin.Context) {
if err := model.ImportRepoKey(base64Key); nil != err {
ret.Code = -1
ret.Msg = fmt.Sprintf(model.Conf.Language(137), err)
ret.Data = map[string]interface{}{"closeTimeout": 5000}
return
}
}
@ -258,6 +259,7 @@ func initRepoKey(c *gin.Context) {
if err := model.InitRepoKey(); nil != err {
ret.Code = -1
ret.Msg = fmt.Sprintf(model.Conf.Language(137), err)
ret.Data = map[string]interface{}{"closeTimeout": 5000}
return
}
@ -273,6 +275,7 @@ func resetRepo(c *gin.Context) {
if err := model.ResetRepo(); nil != err {
ret.Code = -1
ret.Msg = fmt.Sprintf(model.Conf.Language(146), err.Error())
ret.Data = map[string]interface{}{"closeTimeout": 5000}
return
}
}

5
kernel/model/repository.go
View file

@ -83,6 +83,10 @@ func ImportRepoKey(base64Key string) (err error) {
util.LogErrorf("import data repo key failed: %s", err)
return errors.New(Conf.Language(157))
}
if 32 != len(key) {
return errors.New(Conf.Language(157))
}
Conf.Repo.Key = key
Conf.Save()
@ -429,6 +433,7 @@ func syncRepo(boot, exit, byHand bool) {
msg := Conf.Language(26)
util.PushStatusBar(msg)
util.PushErrMsg(msg, 0)
planSyncAfter(30 * time.Second)
return
}