8000 fix(gadget): write absolute configfs symlink targets by adeelahmad · Pull Request #30 · adeelahmad/gadgetcast · GitHub
[go: up one dir, main page]

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions internal/gadget/gadget.go
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,16 @@ func (OS) Mkdir(p string) error { return os.MkdirAll(p, 0o755) }
func (OS) WriteFile(p, data string) error {
return os.WriteFile(p, []byte(data+"\n"), 0o644)
}

// Symlink makes a relative target absolute because configfs resolves link
// targets against the working directory, not the link's own directory.
func (OS) Symlink(target, p string) error {
if err := os.MkdirAll(filepath.Dir(p), 0o755); err != nil {
return err
}
if !filepath.IsAbs(target) {
target = filepath.Join(filepath.Dir(p), target)
}
return os.Symlink(target, p)
}
func (OS) Remove(p string) error { return os.Remove(p) }
Expand Down
17 changes: 17 additions & 0 deletions internal/gadget/gadget_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,23 @@ func TestUpOnRealFilesystemResolvesLinks(t *testing.T) {
}
}

// configfs resolves a symlink target against the caller's working directory,
// not the link's directory, so OS must write relative targets as absolute.
func TestOSSymlinkWritesAbsoluteTarget(t *testing.T) {
root := t.TempDir()
if err := os.MkdirAll(filepath.Join(root, "header/h"), 0o755); err != nil {
t.Fatal(err)
}
link := filepath.Join(root, "class/fs/h")
if err := (OS{}).Symlink("../../header/h", link); err != nil {
t.Fatal(err)
}
got, err := os.Readlink(link)
if want := filepath.Join(root, "header/h"); err != nil || got != want {
t.Fatalf("link target = %q, %v; want %q", got, err, want)
}
}

func TestFindUDC(t *testing.T) {
dir := t.TempDir()
if _, err := FindUDC(dir); err == nil || !strings.Contains(err.Error(), "dr_mode=peripheral") {
Expand Down
Loading
0