Skip to content

fs: Fix #141 comparing symlink permissions #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 15, 2022
Merged

fs: Fix #141 comparing symlink permissions #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aca5a3c
Fix #141 comparing symlink permissions
DominicLavery Jan 7, 2022
7501e42
switch darwin defaults using runtime.GOOS
dnephin Jan 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions fs/manifest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,17 @@ func TestManifestFromDir(t *testing.T) {
actual.root.items["s"].(*directory).items["k"].(*file).content.Close()
}

func TestSymlinks(t *testing.T) {
rootDirectory := NewDir(t, "root",
WithFile("foo.txt", "foo"),
WithSymlink("foo.link", "foo.txt"))
defer rootDirectory.Remove()
expected := Expected(t,
WithFile("foo.txt", "foo"),
WithSymlink("foo.link", rootDirectory.Join("foo.txt")))
assert.Assert(t, Equal(rootDirectory.Path(), expected))
}

var cmpManifest = cmp.Options{
cmp.AllowUnexported(Manifest{}, resource{}, file{}, symlink{}, directory{}),
cmp.Comparer(func(x, y io.ReadCloser) bool {
Expand Down
16 changes: 12 additions & 4 deletions fs/manifest_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
//go:build !windows
// +build !windows

package fs

import (
"os"
"runtime"
"syscall"
)

const (
defaultRootDirMode = os.ModeDir | 0700
defaultSymlinkMode = os.ModeSymlink | 0777
)
const defaultRootDirMode = os.ModeDir | 0700

var defaultSymlinkMode = os.ModeSymlink | 0777

func init() {
switch runtime.GOOS {
case "darwin":
defaultSymlinkMode = os.ModeSymlink | 0755
}
}

func newResourceFromInfo(info os.FileInfo) resource {
statT := info.Sys().(*syscall.Stat_t)
Expand Down