Merge pull request #4632 from vanhalenar/unsafe

USHIFT-5373: Replace GenerateUniqueTempPath by Go library functions

Author: openshift-merge-bot[bot]

pkg/admin/autorecovery/state.go

@@ -32,13 +32,17 @@ func (s *state) SaveToIntermediate() error {
 	if err != nil {
 		return err
 	}
-	path, err := util.GenerateUniqueTempPath(filepath.Join(s.storagePath, stateFilename))
+	file, err := util.CreateTempFile(filepath.Join(s.storagePath, stateFilename))
 	if err != nil {
 		return err
 	}
+	defer file.Close()
+	path := file.Name()
 	s.intermediatePath = path
 	klog.InfoS("Saving intermediate state", "state", contents, "path", path)
-	return os.WriteFile(path, contents, 0600)
+	_, err = file.Write(contents)
+
+	return err
 }
 
 func (s *state) MoveToFinal() error {

pkg/admin/data/atomic_dir_copy.go

@@ -17,9 +17,10 @@ var (
 	// data dir as a backup with Copy-On-Write feature.
 	cpArgs = []string{
 		"--verbose",
-		"--recursive",    // copy directories recursively
-		"--preserve",     // preserve mode, ownership, timestamps
-		"--reflink=auto", // enable Copy-on-Write copy
+		"--recursive",           // copy directories recursively
+		"--no-target-directory", // do not create subdirectory in the target dir
+		"--preserve",            // preserve mode, ownership, timestamps
+		"--reflink=auto",        // enable Copy-on-Write copy
 	}
 )
 
@@ -41,7 +42,7 @@ func (c *AtomicDirCopy) CopyToIntermediate() error {
 		return nil
 	}
 	var err error
-	c.intermediatePath, err = util.GenerateUniqueTempPath(c.Destination)
+	c.intermediatePath, err = util.CreateTempDir(c.Destination)
 	if err != nil {
 		return err
 	}

pkg/config/node.go

@@ -61,12 +61,14 @@ func (c *Config) createNodeNameFile(nodeName, filePath, dataDir string) error {
 	if err := os.MkdirAll(dataDir, 0700); err != nil {
 		return fmt.Errorf("failed to create data dir: %w", err)
 	}
-	tmpPath, err := util.GenerateUniqueTempPath(filePath)
+	file, err := util.CreateTempFile(filePath)
 	if err != nil {
 		return fmt.Errorf("failed to generate temp path for %s: %w", filePath, err)
 	}
-	if err := os.WriteFile(tmpPath, []byte(nodeName), 0400); err != nil {
-		return fmt.Errorf("failed to write nodename file %q: %v", filePath, err)
+	defer file.Close()
+	tmpPath := file.Name()
+	if _, err := file.Write([]byte(nodeName)); err != nil {
+		return fmt.Errorf("failed to write nodename file %q: %v", tmpPath, err)
 	}
 	if err := os.Rename(tmpPath, filePath); err != nil {
 		if err := os.RemoveAll(tmpPath); err != nil {

pkg/util/util.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"io/fs"
-	"math/rand/v2"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -144,19 +143,24 @@ func (l LogFilePath) Remove() error {
 	return err
 }
 
-// GenerateUniqueTempPath returns a filepath from given path with extra suffix
-// which doesn't exist.
-func GenerateUniqueTempPath(path string) (string, error) {
-	// 1000 tries
-	for i := 0; i < 1000; i++ {
-		//nolint:gosec
-		rnd := rand.IntN(100000)
-		newPath := fmt.Sprintf("%s.tmp.%d", path, rnd)
-		if exists, err := PathExists(newPath); err != nil {
-			return "", err
-		} else if !exists {
-			return newPath, nil
-		}
-	}
-	return "", fmt.Errorf("attempted to generate unique temporary path (%q) for 1000 tries - giving up", path)
+// GetTempPathArgs returns the directory in which to create a temp file
+// along with the pattern for the temp file name.
+func getTempPathArgs(path string) (string, string) {
+	dir, file := filepath.Split(path)
+	pattern := file + ".tmp."
+	return dir, pattern
+}
+
+// CreateTempFile creates a temporary file from given path and returns
+// resulting file
+func CreateTempFile(path string) (*os.File, error) {
+	dir, pattern := getTempPathArgs(path)
+	return os.CreateTemp(dir, pattern)
+}
+
+// CreateTempDir creates a temporary directory from given path and returns
+// the pathname of the new directory.
+func CreateTempDir(path string) (string, error) {
+	dir, pattern := getTempPathArgs(path)
+	return os.MkdirTemp(dir, pattern)
 }