Add /hardening/kickstart tests for oscap-generated kickstarts
#239
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
comps
force-pushed
the
hardening_kickstart
branch
3 times, most recently
from
78fd9b0 to
cd27bd1
Compare
comps
force-pushed
the
hardening_kickstart
branch
2 times, most recently
from
e44646e to
19e7181
Compare
|
Added a condition to exclude RHEL-8 after a brief message with Evgeny - we probably want to support/test RHEL-9 in addition to RHEL-10. One last step is to add waivers. |
comps
force-pushed
the
hardening_kickstart
branch
from
19e7181 to
a568e2a
Compare
|
I didn't join the
|
comps
force-pushed
the
hardening_kickstart
branch
from
72a4f7a to
3525b81
Compare
These specify the defaults and are no longer needed post-RHEL-7. Signed-off-by: Jiri Jaburek <comps@nomail.dom>
This is to avoid confusion with oscap-generated kickstarts. Signed-off-by: Jiri Jaburek <comps@nomail.dom>
Signed-off-by: Jiri Jaburek <comps@nomail.dom>
This makes it a bit more explicit as to where the kickstart comes from, making the test algorithm more obvious, without copying large chunks of code. Signed-off-by: Jiri Jaburek <comps@nomail.dom>
This adds translate_oscap_blueprint() and calls 'oscap' similarly to /hardening/kickstart, showing the base test algorithm directly in the test. Coincidentally, this also cleans up the lib.osbuild logic a lot, as we no longer have to pass 'profile' around and account for special oscap cases and blueprint paths. All oscap-specific stuff is now either in the translate function, or directly in the test. The TEMPLATE and other pieces of code were inspired by lib.virt. translate_oscap_blueprint() weirdly takes lines instead of a full block of text (the first thing it does is 'join()'), but that's intentional, to keep the API similar to lib.virt translate functions. Signed-off-by: Jiri Jaburek <comps@nomail.dom>
Signed-off-by: Jiri Jaburek <comps@nomail.dom>
Also re-organize a bit /hardening/anaconda waivers in a similar way. Signed-off-by: Jiri Jaburek <comps@nomail.dom>
comps
force-pushed
the
hardening_kickstart
branch
from
3525b81 to
ec0afee
Compare
mildas
reviewed
Aug 9, 2024
There was a problem hiding this comment.
kickstart part is fine.
For image-builder move, why not to move also rule unselect to test code? Unselect rules in contest-ds.xml and add that modified datastream to rpmpack. No need for oscap tailoring blueprint section. That will unify unselect part with OAA/kickstart where unselect is done directly in datastream without providing tailoring file.
This makes it more consistent with /hardening/kickstart and others. Signed-off-by: Jiri Jaburek <comps@nomail.dom>
|
Changed --- hardening/kickstart/test.py 2024-08-08 21:21:32.803772075 +0200
+++ hardening/image-builder/test.py 2024-08-15 13:38:57.474565165 +0200
@@ -3,3 +3 @@
-import os
-
-from lib import util, results, virt, oscap
+from lib import results, oscap, osbuild, util
@@ -9 +7 @@
-virt.Host.setup()
+osbuild.Host.setup()
@@ -11 +9 @@
-g = virt.Guest()
+g = osbuild.Guest()
@@ -18 +16 @@
-# tell the 'oscap xccdf eval --remediate' in %post to use it
+# tell the 'oscap xccdf eval --remediate' called by osbuild-composer to use it
@@ -24 +22 @@
- 'fix', '--fix-type', 'kickstart',
+ 'fix', '--fix-type', 'blueprint',
@@ -28,4 +26 @@
-ks = virt.translate_oscap_kickstart(lines, '/root/remediation-ds.xml')
-
-if os.environ.get('USE_SERVER_WITH_GUI'):
- ks.packages.append('@Server with GUI')
+blueprint = osbuild.translate_oscap_blueprint(lines, '/root/remediation-ds.xml')
@@ -33 +28 @@
-g.install(kickstart=ks, rpmpack=rpmpack)
+g.create(blueprint=blueprint, rpmpack=rpmpack)
@@ -52 +47 @@
-results.report_and_exit(logs=['report.html', 'results-arf.xml.gz'])
+results.report_and_exit(logs=['report.html', 'results-arf.xml.gz', g.osbuild_log]) |
mildas
approved these changes
Aug 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
(Probably best to go commit-by-commit - the early ones are about cleanup.)
The image-builder (osbuild) rework is mainly to unify the API with
/hardening/kickstart. I would have done the same for/hardening/anaconda, but (IIRC) openscap%addoncannot readfile://URLs or point to local files on the installed OS, it can only reliably use remote HTTP URLs.