aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJakob Unterwurzacher2026-11-11 21:02:25 +0100
committerJakob Unterwurzacher2026-11-11 21:02:25 +0100
commitd61448ec88f064eba898b566f68324859df5f7ac (patch)
tree63f5831e405bd9a12d16129d0b1277883361d599 /tests
parent756cd453d7afe69fd2a00a7592fd2d9869a6f756 (diff)
syscallcompat: drop Faccessat helper, use unix.Faccessat with AT_SYMLINK_NOFOLLOW
Our helper did Fstatat(AT_SYMLINK_NOFOLLOW) followed by a symlink-following unix.Faccessat(..., 0). If the file is swapped for a symlink in between, we check access on the symlink target. x/sys now handles AT_SYMLINK_NOFOLLOW on all our platforms: faccessat2 with fallback emulation on Linux, libc faccessat on Darwin, and the native syscall on FreeBSD. The Darwin breakage that caused the revert in 3d6b2685 should no longer apply. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/reverse/correctness_test.go5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/reverse/correctness_test.go b/tests/reverse/correctness_test.go
index 4028ac3..f0c6f54 100644
--- a/tests/reverse/correctness_test.go
+++ b/tests/reverse/correctness_test.go
@@ -12,7 +12,6 @@ import (
"golang.org/x/sys/unix"
"github.com/rfjakob/gocryptfs/v2/ctlsock"
- "github.com/rfjakob/gocryptfs/v2/internal/syscallcompat"
"github.com/rfjakob/gocryptfs/v2/tests/test_helpers"
)
@@ -160,12 +159,12 @@ func TestAccess(t *testing.T) {
}
for _, n := range names {
// Check if file exists - this should never fail
- err = syscallcompat.Faccessat(unix.AT_FDCWD, dirB+"/"+n, unix.F_OK)
+ err = unix.Faccessat(unix.AT_FDCWD, dirB+"/"+n, unix.F_OK, unix.AT_SYMLINK_NOFOLLOW)
if err != nil {
t.Errorf("%s: %v", n, err)
}
// Check if file is readable
- err = syscallcompat.Faccessat(unix.AT_FDCWD, dirB+"/"+n, unix.R_OK)
+ err = unix.Faccessat(unix.AT_FDCWD, dirB+"/"+n, unix.R_OK, unix.AT_SYMLINK_NOFOLLOW)
if err != nil {
t.Logf("%s: %v", n, err)
}