Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

syscall,os: move flags validation from os.OpenFile to syscall.Open

Browse source 
syscall.Open is the functions that maps Unix/Go flags into Windows
concepts. Part of the flag validation logic was still implemented
in os.OpenFile, move it to syscall.Open for consistency.

A nice side effect is that we don't have to translate the file name
twice in case of an access denied error.

Change-Id: I32c647a9a2a066277c78f53bacb45fb3036f6353
Reviewed-on: https://go-review.googlesource.com/c/go/+/619275
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Damien Neil <dneil@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
This commit is contained in:
qmuntal 2024-10-10 11:01:16 +02:00 • committed by Quim Muntal
parent 0a1c6e3076
commit 39fbc4c29a
3 changed files with 31 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/os/file_windows.go
View file

@ -103,20 +103,9 @@ func openFileNolog(name string, flag int, perm FileMode) (*File, error) {
return nil, &PathError{Op: "open", Path: name, Err: syscall.ENOENT} return nil, &PathError{Op: "open", Path: name, Err: syscall.ENOENT}
} }
path := fixLongPath(name) path := fixLongPath(name)
r, e := syscall.Open(path, flag|syscall.O_CLOEXEC, syscallMode(perm)) r, err := syscall.Open(path, flag|syscall.O_CLOEXEC, syscallMode(perm))
if e != nil { if err != nil {
// We should return EISDIR when we are trying to open a directory with write access. return nil, &PathError{Op: "open", Path: name, Err: err}
if e == syscall.ERROR_ACCESS_DENIED && (flag&O_WRONLY != 0 || flag&O_RDWR != 0) {
pathp, e1 := syscall.UTF16PtrFromString(path)
if e1 == nil {
var fa syscall.Win32FileAttributeData
e1 = syscall.GetFileAttributesEx(pathp, syscall.GetFileExInfoStandard, (*byte)(unsafe.Pointer(&fa)))
if e1 == nil && fa.FileAttributes&syscall.FILE_ATTRIBUTE_DIRECTORY != 0 {
e = syscall.EISDIR
}
}
}
return nil, &PathError{Op: "open", Path: name, Err: e}
} }
return newFile(r, name, "file"), nil return newFile(r, name, "file"), nil
} }

7
src/syscall/syscall_windows.go
View file

@ -398,6 +398,13 @@ func Open(path string, mode int, perm uint32) (fd Handle, err error) {
} }
h, err := CreateFile(pathp, access, sharemode, sa, createmode, attrs, 0) h, err := CreateFile(pathp, access, sharemode, sa, createmode, attrs, 0)
if err != nil { if err != nil {
if err == ERROR_ACCESS_DENIED && (mode&O_WRONLY != 0 || mode&O_RDWR != 0) {
// We should return EISDIR when we are trying to open a directory with write access.
fa, e1 := GetFileAttributes(pathp)
if e1 == nil && fa&FILE_ATTRIBUTE_DIRECTORY != 0 {
err = EISDIR
}
}
return InvalidHandle, err return InvalidHandle, err
} }
if mode&O_TRUNC == O_TRUNC { if mode&O_TRUNC == O_TRUNC {

37
src/syscall/syscall_windows_test.go
View file

@ -16,24 +16,29 @@ import (
) )
func TestOpen_Dir(t *testing.T) { func TestOpen_Dir(t *testing.T) {
dir := t.TempDir() t.Parallel()
h, err := syscall.Open(dir, syscall.O_RDONLY, 0) dir := t.TempDir()
if err != nil { tests := []struct {
t.Fatalf("Open failed: %v", err) mode int
err error
}{
{syscall.O_RDONLY, nil},
{syscall.O_CREAT, syscall.ERROR_ACCESS_DENIED}, // TODO(qmuntal): should be allowed.
{syscall.O_RDONLY | syscall.O_CREAT, syscall.ERROR_ACCESS_DENIED}, // TODO(qmuntal): should be allowed.
{syscall.O_RDONLY | syscall.O_TRUNC, syscall.ERROR_ACCESS_DENIED},
{syscall.O_WRONLY | syscall.O_RDWR, syscall.EISDIR},
{syscall.O_WRONLY, syscall.EISDIR},
{syscall.O_RDWR, syscall.EISDIR},
} }
syscall.CloseHandle(h) for i, tt := range tests {
h, err = syscall.Open(dir, syscall.O_RDONLY|syscall.O_TRUNC, 0) h, err := syscall.Open(dir, tt.mode, 0)
if err == nil { if err == nil {
t.Error("Open should have failed") syscall.CloseHandle(h)
} else { }
syscall.CloseHandle(h) if err != tt.err {
} t.Errorf("%d: Open got %v, want %v", i, err, tt.err)
h, err = syscall.Open(dir, syscall.O_RDONLY|syscall.O_CREAT, 0) }
if err == nil {
t.Error("Open should have failed")
} else {
syscall.CloseHandle(h)
} }
} }