gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-02-08 01:20:07 +08:00
Code

fix: 解决文件上传权限错误的问题 (#4563)

Browse Source
This commit is contained in:
zhengkunwang 2024-04-18 11:18:07 +08:00 committed by GitHub
parent ef5a13f87f
commit 4832081b82
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/app/api/v1/file.go
View File

@ -596,7 +596,7 @@ func mergeChunks(fileName string, fileDir string, dstDir string, chunkCount int)
dstDir = strings.TrimSpace(dstDir) dstDir = strings.TrimSpace(dstDir)
mode, _ := files.GetParentMode(dstDir) mode, _ := files.GetParentMode(dstDir)
if mode == 0 { if mode == 0 {
mode = os.ModePerm mode = 0755
} }
if _, err := os.Stat(dstDir); err != nil && os.IsNotExist(err) { if _, err := os.Stat(dstDir); err != nil && os.IsNotExist(err) {
if err = op.CreateDir(dstDir, mode); err != nil { if err = op.CreateDir(dstDir, mode); err != nil {

9
backend/utils/files/file_op.go
View File

@ -57,7 +57,14 @@ func (f FileOp) CreateDir(dst string, mode fs.FileMode) error {
if err := f.Fs.MkdirAll(dst, mode); err != nil { if err := f.Fs.MkdirAll(dst, mode); err != nil {
return err return err
} }
return f.ChmodR(dst, int64(mode), true) modStr := fmt.Sprintf("%o", mode)
modeInt, err := strconv.ParseInt(modStr, 10, 64)
if err != nil {
modeInt = 0755
}
return f.ChmodR(dst, modeInt, true)
} }
func (f FileOp) CreateFile(dst string) error { func (f FileOp) CreateFile(dst string) error {

2
backend/utils/files/utils.go
View File

@ -129,7 +129,7 @@ func GetParentMode(path string) (os.FileMode, error) {
for { for {
fileInfo, err := os.Stat(absPath) fileInfo, err := os.Stat(absPath)
if err == nil { if err == nil {
return fileInfo.Mode(), nil return fileInfo.Mode() & os.ModePerm, nil
} }
if !os.IsNotExist(err) { if !os.IsNotExist(err) {
return 0, err return 0, err