File preserve-ownership-for-overlays.patch of Package warewulf4

Overview Repositories Revisions Requests Users Attributes Meta

File preserve-ownership-for-overlays.patch of Package warewulf4 (Revision 0f1ca87543a43d9e42f937106dba3e54)

Currently displaying revision 0f1ca87543a43d9e42f937106dba3e54 , Show latest

From cd4667f47c6fb5824d56d7ca9dd3da0e6b9a5b2a Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.de>
Date: Thu, 5 Aug 2021 11:54:46 +0200
Subject: [PATCH] preserve ownership for overlays added preservation of  uid
 and gid  in the overlays

---
 internal/pkg/overlay/overlay.go | 38 +++++++++++++++++++++++++++++++--
 internal/pkg/util/util.go       | 35 ++++++++++++++++++++++++++++--
 2 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/internal/pkg/overlay/overlay.go b/internal/pkg/overlay/overlay.go
index fc9c64a..19305af 100644
--- a/internal/pkg/overlay/overlay.go
+++ b/internal/pkg/overlay/overlay.go
@@ -11,6 +11,7 @@ import (
 	"regexp"
   "strconv"
 	"strings"
+  "syscall"
 	"text/template"
 
 	"github.com/hpcng/warewulf/internal/pkg/config"
@@ -215,15 +216,44 @@ func buildOverlay(nodeList []node.NodeInfo, overlayType string) error {
 
 			if info.IsDir() {
 				wwlog.Printf(wwlog.DEBUG, "Found directory: %s\n", location)
-
-				err := os.MkdirAll(path.Join(tmpDir, location), info.Mode())
+        info, err := os.Stat(location)
+        if err != nil {
+					wwlog.Printf(wwlog.ERROR, "%s\n", err)
+          return err
+        }
+        // root is always good, if we failt to get UID/GID of a file
+        var UID int = 0
+        var GID int = 0
+        if stat, ok := info.Sys().(*syscall.Stat_t); ok {
+          UID = int(stat.Uid)
+          GID = int(stat.Gid)
+        }
+
+				err = os.MkdirAll(path.Join(tmpDir, location), info.Mode())
 				if err != nil {
 					wwlog.Printf(wwlog.ERROR, "%s\n", err)
 					return err
 				}
+        err = os.Chown(path.Join(tmpDir, location),UID,GID)
+        if err != nil {
+					wwlog.Printf(wwlog.ERROR, "%s\n", err)
+          return err
+        }
 
 			} else if filepath.Ext(location) == ".ww" {
 				wwlog.Printf(wwlog.DEBUG, "Found template file: %s\n", location)
+        info, err := os.Stat(location)
+        if err != nil {
+					wwlog.Printf(wwlog.ERROR, "%s\n", err)
+          return err
+        }
+        // root is always good, if we failt to get UID/GID of a file
+        var UID int = 0
+        var GID int = 0
+        if stat, ok := info.Sys().(*syscall.Stat_t); ok {
+          UID = int(stat.Uid)
+          GID = int(stat.Gid)
+        }
 
 				destFile := strings.TrimSuffix(location, ".ww")
 
@@ -250,6 +280,10 @@ func buildOverlay(nodeList []node.NodeInfo, overlayType string) error {
 					wwlog.Printf(wwlog.ERROR, "tmpl.Execute %s\n", err)
 					return nil
 				}
+        err = os.Chown(path.Join(tmpDir, destFile),UID,GID)
+        if err != nil {
+          return err
+        }
 
 			} else if b, _ := regexp.MatchString(`\.ww[a-zA-Z0-9\-\._]*$`, location); b == true {
 				wwlog.Printf(wwlog.DEBUG, "Ignoring WW template file: %s\n", location)
diff --git a/internal/pkg/util/util.go b/internal/pkg/util/util.go
index d751ee1..4efc3a7 100644
--- a/internal/pkg/util/util.go
+++ b/internal/pkg/util/util.go
@@ -11,6 +11,7 @@ import (
 	"path"
 	"path/filepath"
 	"regexp"
+  "syscall"
 	"time"
 
 	"github.com/hpcng/warewulf/internal/pkg/wwlog"
@@ -67,6 +68,17 @@ func RandomString(n int) string {
 
 func CopyFile(source string, dest string) error {
 	wwlog.Printf(wwlog.DEBUG, "Copying '%s' to '%s'\n", source, dest)
+  info, err := os.Stat(source)
+	if err != nil {
+		return err
+	}
+  // root is always good, if we failt to get UID/GID of a file
+  var UID int = 0
+  var GID int = 0
+  if stat, ok := info.Sys().(*syscall.Stat_t); ok {
+    UID = int(stat.Uid)
+    GID = int(stat.Gid)
+  }
 	sourceFD, err := os.Open(source)
 	if err != nil {
 		return err
@@ -83,7 +95,11 @@ func CopyFile(source string, dest string) error {
 	if err != nil {
 		return err
 	}
+  err = os.Chown(dest,UID,GID)
 
+	if err != nil {
+		return err
+	}
 	sourceFD.Close()
 
 	return destFD.Close()
@@ -97,11 +113,26 @@ func CopyFiles(source string, dest string) error {
 
 		if info.IsDir() {
 			wwlog.Printf(wwlog.DEBUG, "Creating directory: %s\n", location)
-
-			err := os.MkdirAll(path.Join(dest, location), info.Mode())
+      info, err := os.Stat(source)
+      if err != nil {
+        return err
+      }
+      // root is always good, if we failt to get UID/GID of a file
+      var UID int = 0
+      var GID int = 0
+      if stat, ok := info.Sys().(*syscall.Stat_t); ok {
+        UID = int(stat.Uid)
+        GID = int(stat.Gid)
+      }
+
+			err = os.MkdirAll(path.Join(dest, location), info.Mode())
 			if err != nil {
 				return err
 			}
+      err = os.Chown(dest,UID,GID)
+      if err != nil {
+        return err
+      }
 
 		} else {
 			wwlog.Printf(wwlog.DEBUG, "Writing file: %s\n", location)
-- 
2.32.0

Places

File preserve-ownership-for-overlays.patch of Package warewulf4 (Revision 0f1ca87543a43d9e42f937106dba3e54)

Places