MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-01-11 23:13:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

use Access(F_OK) do not need to check for permissions (#18492)

Browse Source
This commit is contained in:
Harshavardhana 2023-11-21 15:08:41 -08:00 committed by GitHub
parent 58306a9d34
commit fe3e49c4eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/os_unix.go
View File

@ -33,7 +33,7 @@ import (
) )
func access(name string) error { func access(name string) error {
if err := unix.Access(name, unix.R_OK|unix.W_OK); err != nil { if err := unix.Access(name, unix.F_OK); err != nil {
return &os.PathError{Op: "lstat", Path: name, Err: err} return &os.PathError{Op: "lstat", Path: name, Err: err}
} }
return nil return nil

20
cmd/xl-storage_test.go
View File

@ -893,8 +893,8 @@ func TestXLStorageListDir(t *testing.T) {
if err = xlStorageNew.Delete(context.Background(), "mybucket", "myobject", DeleteOptions{ if err = xlStorageNew.Delete(context.Background(), "mybucket", "myobject", DeleteOptions{
Recursive: false, Recursive: false,
Force: false, Force: false,
}); err != errVolumeAccessDenied { }); err != errFileAccessDenied {
t.Errorf("expected: %s, got: %s", errVolumeAccessDenied, err) t.Errorf("expected: %s, got: %s", errFileAccessDenied, err)
} }
} }
@ -983,14 +983,6 @@ func TestXLStorageDeleteFile(t *testing.T) {
srcPath: "my-obj-del-0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001", srcPath: "my-obj-del-0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001",
expectedErr: errFileNameTooLong, expectedErr: errFileNameTooLong,
}, },
// TestXLStorage case - 6.
// TestXLStorage case with undeletable parent directory.
// File can delete, dir cannot delete because no-permissions doesn't have write perms.
{
srcVol: "no-permissions",
srcPath: "dir/file",
expectedErr: errVolumeAccessDenied,
},
} }
for i, testCase := range testCases { for i, testCase := range testCases {
@ -1024,8 +1016,8 @@ func TestXLStorageDeleteFile(t *testing.T) {
if err = xlStorageNew.Delete(context.Background(), "mybucket", "myobject", DeleteOptions{ if err = xlStorageNew.Delete(context.Background(), "mybucket", "myobject", DeleteOptions{
Recursive: false, Recursive: false,
Force: false, Force: false,
}); err != errVolumeAccessDenied { }); err != errFileAccessDenied {
t.Errorf("expected: %s, got: %s", errVolumeAccessDenied, err) t.Errorf("expected: %s, got: %s", errFileAccessDenied, err)
} }
} }
@ -1406,8 +1398,8 @@ func TestXLStorageAppendFile(t *testing.T) {
t.Fatalf("Unable to initialize xlStorage, %s", err) t.Fatalf("Unable to initialize xlStorage, %s", err)
} }
if err = xlStoragePermStorage.AppendFile(context.Background(), "mybucket", "myobject", []byte("hello, world")); err != errVolumeAccessDenied { if err = xlStoragePermStorage.AppendFile(context.Background(), "mybucket", "myobject", []byte("hello, world")); err != errFileAccessDenied {
t.Fatalf("expected: errVolumeAccessDenied error, got: %s", err) t.Fatalf("expected: errFileAccessDenied error, got: %s", err)
} }
} }