Skip to content

fix: skip chmod for existing SaveUploadedFile destination directories #4647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mike-lmctl wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: skip chmod for existing SaveUploadedFile destination directories #4647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,11 +728,18 @@ func (c *Context) SaveUploadedFile(file *multipart.FileHeader, dst string, perm
mode = perm[0]
}
dir := filepath.Dir(dst)
if err = os.MkdirAll(dir, mode); err != nil {
return err
}
if err = os.Chmod(dir, mode); err != nil {
return err
if dir != "." {
if _, err = os.Stat(dir); err != nil {
if !errors.Is(err, fs.ErrNotExist) {
return err
}
if err = os.MkdirAll(dir, mode); err != nil {
return err
}
if err = os.Chmod(dir, mode); err != nil {
return err
}
}
}

out, err := os.Create(dst)
Expand Down
38 changes: 32 additions & 6 deletions context_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,16 +246,42 @@ func TestSaveUploadedFileWithPermission(t *testing.T) {
f, err := c.FormFile("file")
require.NoError(t, err)
assert.Equal(t, "permission_test", f.Filename)
dst := filepath.Join(t.TempDir(), "uploads", "permission_test")
var mode fs.FileMode = 0o755
require.NoError(t, c.SaveUploadedFile(f, "permission_test", mode))
t.Cleanup(func() {
assert.NoError(t, os.Remove("permission_test"))
})
info, err := os.Stat(filepath.Dir("permission_test"))
require.NoError(t, c.SaveUploadedFile(f, dst, mode))
info, err := os.Stat(filepath.Dir(dst))
require.NoError(t, err)
assert.Equal(t, info.Mode().Perm(), mode)
}

func TestSaveUploadedFileWithPermissionExistingDirectory(t *testing.T) {
buf := new(bytes.Buffer)
mw := multipart.NewWriter(buf)
w, err := mw.CreateFormFile("file", "permission_test")
require.NoError(t, err)
_, err = w.Write([]byte("permission_test"))
require.NoError(t, err)
mw.Close()
c, _ := CreateTestContext(httptest.NewRecorder())
c.Request, _ = http.NewRequest(http.MethodPost, "/", buf)
c.Request.Header.Set("Content-Type", mw.FormDataContentType())
f, err := c.FormFile("file")
require.NoError(t, err)
assert.Equal(t, "permission_test", f.Filename)

dstDir := filepath.Join(t.TempDir(), "uploads")
const existingMode fs.FileMode = 0o700
require.NoError(t, os.Mkdir(dstDir, existingMode))

var mode fs.FileMode = 0o755
dst := filepath.Join(dstDir, "permission_test")
require.NoError(t, c.SaveUploadedFile(f, dst, mode))

info, err := os.Stat(dstDir)
require.NoError(t, err)
assert.Equal(t, existingMode, info.Mode().Perm())
}

func TestSaveUploadedFileWithPermissionFailed(t *testing.T) {
buf := new(bytes.Buffer)
mw := multipart.NewWriter(buf)
Expand All @@ -271,7 +297,7 @@ func TestSaveUploadedFileWithPermissionFailed(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, "permission_test", f.Filename)
var mode fs.FileMode = 0o644
require.Error(t, c.SaveUploadedFile(f, "test/permission_test", mode))
require.Error(t, c.SaveUploadedFile(f, filepath.Join(t.TempDir(), "test", "permission_test"), mode))
}

func TestContextReset(t *testing.T) {
Expand Down