Merge 6cfac86ae77db5f4869baec0e0a7a7ef0852c8b6 into 5f4f9643258dc2a65e684b63f12c8d543c936c67

context.go

@@ -717,20 +717,7 @@ func (c *Context) MultipartForm() (*multipart.Form, error) {
 
 func dirExists(path string) bool {
 	info, err := os.Stat(path)
-	if err != nil {
-		return false
-	}
-	return info.IsDir()
-}
-
-func ensureDirWithMode(dir string, mode fs.FileMode) error {
-	if dirExists(dir) {
-		return nil
-	}
-	if err := os.MkdirAll(dir, mode); err != nil {
-		return err
-	}
-	return os.Chmod(dir, mode)
+	return err == nil && info.IsDir()
 }
 
 // SaveUploadedFile uploads the form file to specific dst.
@@ -746,10 +733,16 @@ func (c *Context) SaveUploadedFile(file *multipart.FileHeader, dst string, perm
 		mode = perm[0]
 	}
 	dir := filepath.Dir(dst)
+	dirExisted := dirExists(dir)
+	if err = os.MkdirAll(dir, mode); err != nil {
+		return err
+	}
 	// Only chmod newly created directories. Attempting to chmod
 	// pre-existing directories (e.g. /tmp) may fail with EPERM.
-	if err = ensureDirWithMode(dir, mode); err != nil {
-		return err
+	if !dirExisted {
+		if err = os.Chmod(dir, mode); err != nil {
+			return err
+		}
 	}
 
 	out, err := os.Create(dst)

context_test.go

@@ -259,51 +259,6 @@ func TestSaveUploadedFileWithPermission(t *testing.T) {
 	}
 }
 
-func TestDirExists(t *testing.T) {
-	tmpDir := t.TempDir()
-	assert.True(t, dirExists(tmpDir))
-	assert.False(t, dirExists(filepath.Join(tmpDir, "missing")))
-
-	filePath := filepath.Join(tmpDir, "file")
-	require.NoError(t, os.WriteFile(filePath, []byte("test"), 0o600))
-	assert.False(t, dirExists(filePath))
-}
-
-func TestSaveUploadedFileKeepsExistingDirPermission(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)
-
-	tmpDir := t.TempDir()
-	existingDir := filepath.Join(tmpDir, "existing")
-	require.NoError(t, os.Mkdir(existingDir, 0o700))
-	if runtime.GOOS != "windows" {
-		require.NoError(t, os.Chmod(existingDir, 0o700))
-	}
-
-	var mode fs.FileMode = 0o755
-	dst := filepath.Join(existingDir, "permission_test")
-	require.NoError(t, c.SaveUploadedFile(f, dst, mode))
-
-	saved, err := os.ReadFile(dst)
-	require.NoError(t, err)
-	assert.Equal(t, "permission_test", string(saved))
-	if runtime.GOOS != "windows" {
-		info, err := os.Stat(existingDir)
-		require.NoError(t, err)
-		assert.Equal(t, fs.FileMode(0o700), info.Mode().Perm())
-	}
-}
-
 func TestSaveUploadedFileWithPermissionFailed(t *testing.T) {
 	buf := new(bytes.Buffer)
 	mw := multipart.NewWriter(buf)