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

🎨 Add file access control (#9722)

Browse source
This commit is contained in:
Yingyi / 颖逸 2023-11-22 22:17:18 +08:00 • committed by GitHub
parent f5205d846c
commit 4ca62ef701
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 139 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

48
kernel/api/archive.go
View file

@ -34,20 +34,34 @@ func zip(c *gin.Context) {
return
}
path := arg["path"].(string)
zipPath := arg["zipPath"].(string)
zipFile, err := gulu.Zip.Create(zipPath)
entryPath := arg["path"].(string)
entryAbsPath, err := util.GetAbsPathInWorkspace(entryPath)
if nil != err {
ret.Code = -1
ret.Msg = err.Error()
return
}
base := filepath.Base(path)
if gulu.File.IsDir(path) {
err = zipFile.AddDirectory(base, path)
zipFilePath := arg["zipPath"].(string)
zipAbsFilePath, err := util.GetAbsPathInWorkspace(zipFilePath)
if nil != err {
ret.Code = -1
ret.Msg = err.Error()
return
}
zipFile, err := gulu.Zip.Create(zipAbsFilePath)
if nil != err {
ret.Code = -1
ret.Msg = err.Error()
return
}
base := filepath.Base(entryAbsPath)
if gulu.File.IsDir(entryAbsPath) {
err = zipFile.AddDirectory(base, entryAbsPath)
} else {
err = zipFile.AddEntry(base, path)
err = zipFile.AddEntry(base, entryAbsPath)
}
if nil != err {
ret.Code = -1
@ -71,9 +85,23 @@ func unzip(c *gin.Context) {
return
}
zipPath := arg["zipPath"].(string)
path := arg["path"].(string)
if err := gulu.Zip.Unzip(zipPath, path); nil != err {
zipFilePath := arg["zipPath"].(string)
zipAbsFilePath, err := util.GetAbsPathInWorkspace(zipFilePath)
if nil != err {
ret.Code = -1
ret.Msg = err.Error()
return
}
entryPath := arg["path"].(string)
entryAbsPath, err := util.GetAbsPathInWorkspace(entryPath)
if nil != err {
ret.Code = -1
ret.Msg = err.Error()
return
}
if err := gulu.Zip.Unzip(zipAbsFilePath, entryAbsPath); nil != err {
ret.Code = -1
ret.Msg = err.Error()
return