kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add uid, gid, and permissions to OverlayFile struct

Browse Source 
There is an existing test for this. uid, gid, and permissions seem
consistent across test boxes.
This commit is contained in:
MatthewHink
2025-06-12 10:50:15 -07:00
committed by Jonathon Anderson
parent a99b4eead2
commit b6c33d9567
3 changed files with 42 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
internal/pkg/warewulfd/api/overlay.go
View File

@@ -6,6 +6,7 @@ import (
"net/url"
"os"
"path"
"syscall"
"github.com/swaggest/usecase"
"github.com/swaggest/usecase/status"
@@ -68,9 +69,12 @@ func getOverlayByName() usecase.Interactor {
}
type OverlayFile struct {
Overlay string `json:"overlay"`
Path string `json:"path"`
Contents string `json:"contents"`
Overlay string `json:"overlay"`
Path string `json:"path"`
Contents string `json:"contents"`
Perms os.FileMode `json:"perms"`
Uid uint32 `json:"uid"`
Gid uint32 `json:"gid"`
rendered bool
}
@@ -83,7 +87,23 @@ func (of *OverlayFile) Exists() bool {
}
func (of *OverlayFile) readContents() (string, error) {
f, err := os.ReadFile(of.FullPath())
fullPath := of.FullPath()
f, err := os.ReadFile(fullPath)
if err != nil {
wwlog.Warn("os.ReadFile err %w", err)
return "", err
}
// Populate the permissions, uid, and gid.
s, err := os.Stat(fullPath)
if err != nil {
wwlog.Warn("os.Stat err %w", err)
return "", err
}
fileMode := s.Mode()
of.Perms = fileMode & os.ModePerm
sys := s.Sys()
of.Uid = sys.(*syscall.Stat_t).Uid
of.Gid = sys.(*syscall.Stat_t).Gid
return string(f), err
}