Remove hardcoded refs from ociartifact code

Fixes: https://issues.redhat.com/browse/RUN-3578

Signed-off-by: Nicola Sella <[email protected]>

Author: inknos

pkg/machine/ocipull/ociartifact.go

@@ -10,12 +10,14 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/containers/podman/v5/pkg/api/handlers/utils"
 	"github.com/containers/podman/v5/pkg/machine/compression"
 	"github.com/containers/podman/v5/pkg/machine/define"
-	"github.com/containers/podman/v5/utils"
+	podmanutils "github.com/containers/podman/v5/utils"
 	"github.com/opencontainers/go-digest"
 	specV1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/sirupsen/logrus"
+	"go.podman.io/common/pkg/config"
 	"go.podman.io/image/v5/docker"
 	"go.podman.io/image/v5/docker/reference"
 	"go.podman.io/image/v5/image"
@@ -24,9 +26,6 @@ import (
 )
 
 const (
-	artifactRegistry     = "quay.io"
-	artifactRepo         = "podman"
-	artifactImageName    = "machine-os"
 	artifactOriginalName = specV1.AnnotationTitle
 	machineOS            = "linux"
 )
@@ -52,6 +51,24 @@ type DiskArtifactOpts struct {
 	os       string
 }
 
+// getMachineImageConfig retrieves the machine image configuration from c/common
+func getMachineImageConfig() (string, error) {
+	cfg, err := config.Default()
+	if err != nil {
+		return "", fmt.Errorf("failed to load configuration: %w", err)
+	}
+
+	return cfg.Machine.Image, nil
+}
+
+func validateMachineImageConfig(imageRef string) (string, error) {
+	if err := utils.IsRegistryReference(imageRef); err != nil {
+		return "", fmt.Errorf("invalid machine image reference: %w", err)
+	}
+
+	return imageRef, nil
+}
+
 /*
 
 	This interface is for automatically pulling a disk artifact(qcow2, raw, vhdx file) from a pre-determined
@@ -92,8 +109,17 @@ func NewOCIArtifactPull(ctx context.Context, dirs *define.MachineDirs, endpoint
 
 	cache := false
 	if endpoint == "" {
-		imageName := artifactImageName
-		endpoint = fmt.Sprintf("docker://%s/%s/%s:%s", artifactRegistry, artifactRepo, imageName, artifactVersion.majorMinor())
+		// Get machine image from configuration
+		machineImage, err := getMachineImageConfig()
+		if err != nil {
+			return nil, fmt.Errorf("failed to get machine image configuration: %w", err)
+		}
+
+		if _, err := validateMachineImageConfig(machineImage); err != nil {
+			return nil, fmt.Errorf("machine image ref could be misconfigured in containers.conf: %w", err)
+		}
+
+		endpoint = fmt.Sprintf("docker://%s:%s", machineImage, artifactVersion.majorMinor())
 		cache = true
 	}
 
@@ -191,7 +217,7 @@ func (o *OCIArtifactDisk) cleanCache(cachedImagePath string) func() {
 			for _, file := range files {
 				path := filepath.Join(o.dirs.ImageCacheDir.GetPath(), file.Name())
 				logrus.Debugf("cleaning cached file: %s", path)
-				err := utils.GuardedRemoveAll(path)
+				err := podmanutils.GuardedRemoveAll(path)
 				if err != nil && !errors.Is(err, os.ErrNotExist) {
 					logrus.Warn("failed to clean machine image cache: ", err)
 				}
@@ -290,7 +316,7 @@ func (o *OCIArtifactDisk) unpack(diskArtifactHash digest.Digest) error {
 	}
 
 	// Clean up the oci dir which is no longer needed
-	return utils.GuardedRemoveAll(blobDir.GetPath())
+	return podmanutils.GuardedRemoveAll(blobDir.GetPath())
 }
 
 func (o *OCIArtifactDisk) decompress() error {