From ffd22a8e6ed38da7d38e0e3cf1726f2ac5155021 Mon Sep 17 00:00:00 2001 From: Josue David Hernandez Gutierrez Date: Wed, 19 Feb 2025 22:32:46 +0000 Subject: [PATCH] Oscap customization for Oracle Linux Signed-off-by: Josue David Hernandez Gutierrez --- .../images/pkg/customizations/oscap/oscap.go | 21 +++++++++++++------ .../images/pkg/distro/rhel/rhel10/distro.go | 2 +- .../images/pkg/distro/rhel/rhel8/distro.go | 2 +- .../images/pkg/distro/rhel/rhel9/distro.go | 2 +- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/vendor/github.com/osbuild/images/pkg/customizations/oscap/oscap.go b/vendor/github.com/osbuild/images/pkg/customizations/oscap/oscap.go index 5e1d8a3..9ab64fe 100644 --- a/vendor/github.com/osbuild/images/pkg/customizations/oscap/oscap.go +++ b/vendor/github.com/osbuild/images/pkg/customizations/oscap/oscap.go @@ -41,6 +41,9 @@ const ( defaultCentos8Datastream string = "/usr/share/xml/scap/ssg/content/ssg-centos8-ds.xml" defaultCentos9Datastream string = "/usr/share/xml/scap/ssg/content/ssg-cs9-ds.xml" defaultCentos10Datastream string = "/usr/share/xml/scap/ssg/content/ssg-cs10-ds.xml" + defaultOL8Datastream string = "/usr/share/xml/scap/ssg/content/ssg-ol8-ds.xml" + defaultOL9Datastream string = "/usr/share/xml/scap/ssg/content/ssg-ol9-ds.xml" + defaultOL10Datastream string = "/usr/share/xml/scap/ssg/content/ssg-ol10-ds.xml" defaultRHEL8Datastream string = "/usr/share/xml/scap/ssg/content/ssg-rhel8-ds.xml" defaultRHEL9Datastream string = "/usr/share/xml/scap/ssg/content/ssg-rhel9-ds.xml" defaultRHEL10Datastream string = "/usr/share/xml/scap/ssg/content/ssg-rhel10-ds.xml" @@ -127,23 +130,29 @@ func DefaultFedoraDatastream() string { return defaultFedoraDatastream } -func DefaultRHEL8Datastream(isRHEL bool) string { - if isRHEL { +func DefaultRHEL8Datastream(name string) string { + if strings.HasPrefix(name, "rhel") { return defaultRHEL8Datastream + } else if strings.HasPrefix(name, "ol") { + return defaultOL8Datastream } return defaultCentos8Datastream } -func DefaultRHEL9Datastream(isRHEL bool) string { - if isRHEL { +func DefaultRHEL9Datastream(name string) string { + if strings.HasPrefix(name, "rhel") { return defaultRHEL9Datastream + } else if strings.HasPrefix(name, "ol") { + return defaultOL9Datastream } return defaultCentos9Datastream } -func DefaultRHEL10Datastream(isRHEL bool) string { - if isRHEL { +func DefaultRHEL10Datastream(name string) string { + if strings.HasPrefix(name, "rhel") { return defaultRHEL10Datastream + } else if strings.HasPrefix(name, "ol") { + return defaultOL10Datastream } return defaultCentos10Datastream } diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/distro.go index b7d4ead..cefda05 100644 --- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/distro.go +++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/distro.go @@ -69,7 +69,7 @@ func defaultDistroImageConfig(d *rhel.Distribution) *distro.ImageConfig { }, }, }, - DefaultOSCAPDatastream: common.ToPtr(oscap.DefaultRHEL10Datastream(d.IsRHEL())), + DefaultOSCAPDatastream: common.ToPtr(oscap.DefaultRHEL10Datastream(d.Name())), } } diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go index 07b138b..5183903 100644 --- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go +++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel8/distro.go @@ -53,7 +53,7 @@ func defaultDistroImageConfig(d *rhel.Distribution) *distro.ImageConfig { }, }, KernelOptionsBootloader: common.ToPtr(true), - DefaultOSCAPDatastream: common.ToPtr(oscap.DefaultRHEL8Datastream(d.IsRHEL())), + DefaultOSCAPDatastream: common.ToPtr(oscap.DefaultRHEL8Datastream(d.Name())), } } diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go index 3d8423e..e636d56 100644 --- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go +++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel9/distro.go @@ -72,7 +72,7 @@ func defaultDistroImageConfig(d *rhel.Distribution) *distro.ImageConfig { }, }, }, - DefaultOSCAPDatastream: common.ToPtr(oscap.DefaultRHEL9Datastream(d.IsRHEL())), + DefaultOSCAPDatastream: common.ToPtr(oscap.DefaultRHEL9Datastream(d.Name())), } } -- 2.47.1