mleku/wazero
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Emulates AT_SYMLINK_NOFOLLOW instead of sometimes implementing it (#1588)
Some checks failed
Release CLI / Pre-release build (push) Has been cancelled
Details
Release CLI / Pre-release test (macos-12) (push) Has been cancelled
Details
Release CLI / Pre-release test (ubuntu-22.04) (push) Has been cancelled
Details
Release CLI / Pre-release test (windows-2022) (push) Has been cancelled
Details
Release CLI / Release (push) Has been cancelled
Details

Browse Source 
Signed-off-by: Adrian Cole <adrian@tetrate.io>
This commit is contained in:
Crypt Keeper
2023-07-22 08:03:47 +08:00
committed by GitHub
parent a53861846a
commit fb6147ca94
16 changed files with 52 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/fsapi/fs.go
View File

@@ -275,10 +275,8 @@ type FS interface {
// The `times` parameter includes the access and modification timestamps to
// assign. Special syscall.Timespec NSec values UTIME_NOW and UTIME_OMIT
// may be specified instead of real timestamps. A nil `times` parameter
// behaves the same as if both were set to UTIME_NOW.
//
// When the `symlinkFollow` parameter is true and the path is a symbolic link,
// the target of expanding that link is updated.
// behaves the same as if both were set to UTIME_NOW. If the path is a
// symbolic link, the target of expanding that link is updated.
//
// # Errors
//
@@ -292,7 +290,7 @@ type FS interface {
//
// - This is like syscall.UtimesNano and `utimensat` with `AT_FDCWD` in
// POSIX. See https://pubs.opengroup.org/onlinepubs/9699919799/functions/futimens.html
Utimens(path string, times *[2]syscall.Timespec, symlinkFollow bool) experimentalsys.Errno
Utimens(path string, times *[2]syscall.Timespec) experimentalsys.Errno
// TODO: change impl to not use syscall package,
// possibly by being just a pair of int64s..
}

2
internal/fsapi/unimplemented.go
View File

@@ -79,7 +79,7 @@ func (UnimplementedFS) Unlink(path string) experimentalsys.Errno {
}
// Utimens implements FS.Utimens
func (UnimplementedFS) Utimens(path string, times *[2]syscall.Timespec, symlinkFollow bool) experimentalsys.Errno {
func (UnimplementedFS) Utimens(path string, times *[2]syscall.Timespec) experimentalsys.Errno {
return experimentalsys.ENOSYS
}

2
internal/gojs/fs.go
View File

@@ -435,7 +435,7 @@ func (u *jsfsUtimes) invoke(ctx context.Context, mod api.Module, args ...interfa
times := [2]syscall.Timespec{
syscall.NsecToTimespec(atimeSec * 1e9), syscall.NsecToTimespec(mtimeSec * 1e9),
}
errno := fsc.RootFS().Utimens(path, &times, true)
errno := fsc.RootFS().Utimens(path, &times)
return jsfsInvoke(ctx, mod, callback, errno)
}

2
internal/sysfs/adapter_test.go
View File

@@ -90,7 +90,7 @@ func TestAdapt_UtimesNano(t *testing.T) {
realPath := joinPath(tmpDir, path)
require.NoError(t, os.WriteFile(realPath, []byte{}, 0o600))
err := testFS.Utimens(path, nil, true)
err := testFS.Utimens(path, nil)
require.EqualErrno(t, experimentalsys.ENOSYS, err)
}

4
internal/sysfs/dirfs.go
View File

@@ -116,8 +116,8 @@ func (d *dirFS) Symlink(oldName, link string) experimentalsys.Errno {
}
// Utimens implements the same method as documented on fsapi.FS
func (d *dirFS) Utimens(path string, times *[2]syscall.Timespec, symlinkFollow bool) experimentalsys.Errno {
return Utimens(d.join(path), times, symlinkFollow)
func (d *dirFS) Utimens(path string, times *[2]syscall.Timespec) experimentalsys.Errno {
return Utimens(d.join(path), times)
}
func (d *dirFS) join(path string) string {

20
internal/sysfs/dirfs_test.go
View File

@@ -531,14 +531,8 @@ func TestDirFS_Utimesns(t *testing.T) {
require.NoError(t, err)
t.Run("doesn't exist", func(t *testing.T) {
err := testFS.Utimens("nope", nil, true)
err := testFS.Utimens("nope", nil)
require.EqualErrno(t, sys.ENOENT, err)
err = testFS.Utimens("nope", nil, false)
if SupportsSymlinkNoFollow {
require.EqualErrno(t, sys.ENOENT, err)
} else {
require.EqualErrno(t, sys.ENOSYS, err)
}
})
// Note: This sets microsecond granularity because Windows doesn't support
@@ -603,12 +597,11 @@ func TestDirFS_Utimesns(t *testing.T) {
},
}
for _, fileType := range []string{"dir", "file", "link", "link-follow"} {
for _, fileType := range []string{"dir", "file", "link"} {
for _, tt := range tests {
tc := tt
fileType := fileType
name := fileType + " " + tc.name
symlinkNoFollow := fileType == "link"
t.Run(name, func(t *testing.T) {
tmpDir := t.TempDir()
@@ -634,9 +627,6 @@ func TestDirFS_Utimesns(t *testing.T) {
path = "file"
statPath = "file"
case "link":
path = "file-link"
statPath = "file-link"
case "link-follow":
path = "file-link"
statPath = "file"
default:
@@ -646,11 +636,7 @@ func TestDirFS_Utimesns(t *testing.T) {
oldSt, errno := testFS.Lstat(statPath)
require.EqualErrno(t, 0, errno)
errno = testFS.Utimens(path, tc.times, !symlinkNoFollow)
if symlinkNoFollow && !SupportsSymlinkNoFollow {
require.EqualErrno(t, sys.ENOSYS, errno)
return
}
errno = testFS.Utimens(path, tc.times)
require.EqualErrno(t, 0, errno)
newSt, errno := testFS.Lstat(statPath)

16
internal/sysfs/futimens.go
View File

@@ -28,10 +28,8 @@ const (
// The `times` parameter includes the access and modification timestamps to
// assign. Special syscall.Timespec NSec values UTIME_NOW and UTIME_OMIT may be
// specified instead of real timestamps. A nil `times` parameter behaves the
// same as if both were set to UTIME_NOW.
//
// When the `symlinkFollow` parameter is true and the path is a symbolic link,
// the target of expanding that link is updated.
// same as if both were set to UTIME_NOW. If the path is a symbolic link, the
// target of expanding that link is updated.
//
// # Errors
//
@@ -45,8 +43,8 @@ const (
//
// - This is like syscall.UtimesNano and `utimensat` with `AT_FDCWD` in
// POSIX. See https://pubs.opengroup.org/onlinepubs/9699919799/functions/futimens.html
func Utimens(path string, times *[2]syscall.Timespec, symlinkFollow bool) experimentalsys.Errno {
err := utimens(path, times, symlinkFollow)
func Utimens(path string, times *[2]syscall.Timespec) experimentalsys.Errno {
err := utimens(path, times)
return experimentalsys.UnwrapOSError(err)
}
@@ -57,11 +55,7 @@ func timesToPtr(times *[2]syscall.Timespec) unsafe.Pointer { //nolint:unused
return unsafe.Pointer(nil)
}
func utimensPortable(path string, times *[2]syscall.Timespec, symlinkFollow bool) error { //nolint:unused
if !symlinkFollow {
return experimentalsys.ENOSYS
}
func utimensPortable(path string, times *[2]syscall.Timespec) error { //nolint:unused
// Handle when both inputs are current system time.
if times == nil || times[0].Nsec == UTIME_NOW && times[1].Nsec == UTIME_NOW {
ts := nowTimespec()

14
internal/sysfs/futimens_darwin.go
View File

@@ -6,22 +6,18 @@ import (
)
const (
_AT_FDCWD = -0x2
_AT_SYMLINK_NOFOLLOW = 0x0020
_UTIME_NOW = -1
_UTIME_OMIT = -2
SupportsSymlinkNoFollow = true
_AT_FDCWD = -0x2
_AT_SYMLINK_NOFOLLOW = 0x0020
_UTIME_NOW = -1
_UTIME_OMIT = -2
)
//go:noescape
//go:linkname utimensat syscall.utimensat
func utimensat(dirfd int, path string, times *[2]syscall.Timespec, flags int) error
func utimens(path string, times *[2]syscall.Timespec, symlinkFollow bool) error {
func utimens(path string, times *[2]syscall.Timespec) error {
var flags int
if !symlinkFollow {
flags = _AT_SYMLINK_NOFOLLOW
}
return utimensat(_AT_FDCWD, path, times, flags)
}

14
internal/sysfs/futimens_linux.go
View File

@@ -7,19 +7,13 @@ import (
)
const (
_AT_FDCWD = -0x64
_AT_SYMLINK_NOFOLLOW = 0x100
_UTIME_NOW = (1 << 30) - 1
_UTIME_OMIT = (1 << 30) - 2
SupportsSymlinkNoFollow = true
_AT_FDCWD = -0x64
_UTIME_NOW = (1 << 30) - 1
_UTIME_OMIT = (1 << 30) - 2
)
func utimens(path string, times *[2]syscall.Timespec, symlinkFollow bool) (err error) {
func utimens(path string, times *[2]syscall.Timespec) (err error) {
var flags int
if !symlinkFollow {
flags = _AT_SYMLINK_NOFOLLOW
}
var _p0 *byte
_p0, err = syscall.BytePtrFromString(path)
if err != nil {

28
internal/sysfs/futimens_test.go
View File

@@ -16,15 +16,8 @@ import (
func TestUtimens(t *testing.T) {
t.Run("doesn't exist", func(t *testing.T) {
err := Utimens("nope", nil, true)
err := Utimens("nope", nil)
require.EqualErrno(t, sys.ENOENT, err)
err = Utimens("nope", nil, false)
if SupportsSymlinkNoFollow {
require.EqualErrno(t, sys.ENOENT, err)
} else {
require.EqualErrno(t, sys.ENOSYS, err)
}
})
testUtimens(t, false)
}
@@ -105,19 +98,11 @@ func testUtimens(t *testing.T, futimes bool) {
},
},
}
for _, fileType := range []string{"dir", "file", "link", "link-follow"} {
for _, fileType := range []string{"dir", "file", "link"} {
for _, tt := range tests {
tc := tt
fileType := fileType
name := fileType + " " + tc.name
symlinkNoFollow := fileType == "link"
// symlinkNoFollow is invalid for file descriptor based operations,
// because the default for open is to follow links. You can't avoid
// this. O_NOFOLLOW is used only to return ELOOP on a link.
if futimes && symlinkNoFollow {
continue
}
t.Run(name, func(t *testing.T) {
tmpDir := t.TempDir()
@@ -141,9 +126,6 @@ func testUtimens(t *testing.T, futimes bool) {
path = file
statPath = file
case "link":
path = link
statPath = link
case "link-follow":
path = link
statPath = file
default:
@@ -154,11 +136,7 @@ func testUtimens(t *testing.T, futimes bool) {
require.EqualErrno(t, 0, errno)
if !futimes {
err = Utimens(path, tc.times, !symlinkNoFollow)
if symlinkNoFollow && !SupportsSymlinkNoFollow {
require.EqualErrno(t, sys.ENOSYS, err)
return
}
errno = Utimens(path, tc.times)
require.EqualErrno(t, 0, errno)
} else {
flag := fsapi.O_RDWR

9
internal/sysfs/futimens_unsupported.go
View File

@@ -10,13 +10,12 @@ import (
// Define values even if not used except as sentinels.
const (
_UTIME_NOW = -1
_UTIME_OMIT = -2
SupportsSymlinkNoFollow = false
_UTIME_NOW = -1
_UTIME_OMIT = -2
)
func utimens(path string, times *[2]syscall.Timespec, symlinkFollow bool) error {
return utimensPortable(path, times, symlinkFollow)
func utimens(path string, times *[2]syscall.Timespec) error {
return utimensPortable(path, times)
}
func futimens(fd uintptr, times *[2]syscall.Timespec) error {

4
internal/sysfs/futimens_windows.go
View File

@@ -15,8 +15,8 @@ const (
SupportsSymlinkNoFollow = false
)
func utimens(path string, times *[2]syscall.Timespec, symlinkFollow bool) error {
return utimensPortable(path, times, symlinkFollow)
func utimens(path string, times *[2]syscall.Timespec) error {
return utimensPortable(path, times)
}
func futimens(fd uintptr, times *[2]syscall.Timespec) error {

2
internal/sysfs/readfs.go
View File

@@ -98,7 +98,7 @@ func (r *readFS) Unlink(path string) experimentalsys.Errno {
}
// Utimens implements the same method as documented on fsapi.FS
func (r *readFS) Utimens(path string, times *[2]syscall.Timespec, symlinkFollow bool) experimentalsys.Errno {
func (r *readFS) Utimens(path string, times *[2]syscall.Timespec) experimentalsys.Errno {
return experimentalsys.EROFS
}

2
internal/sysfs/readfs_test.go
View File

@@ -114,7 +114,7 @@ func TestReadFS_UtimesNano(t *testing.T) {
realPath := joinPath(tmpDir, path)
require.NoError(t, os.WriteFile(realPath, []byte{}, 0o600))
err := testFS.Utimens(path, nil, true)
err := testFS.Utimens(path, nil)
require.EqualErrno(t, sys.EROFS, err)
}