Add option to run particular oscap binary to the oscap-podman wrapper

p0p0p0 · Aug 12, 2019 · f47770c · f47770c
1 parent f6f9767
commit f47770c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/utils/oscap-podman b/utils/oscap-podman
@@ -28,21 +28,26 @@ function usage()
     echo "oscap-podman -- Tool for SCAP evaluation of Podman images and containers."
     echo
     echo "Compliance scan of Podman image:"
-    echo "$ sudo oscap-podman IMAGE_NAME OSCAP_ARGUMENT [OSCAP_ARGUMENT...]"
+    echo "$ sudo oscap-podman [--oscap=<OSCAP_BINARY>] IMAGE_NAME OSCAP_ARGUMENT [OSCAP_ARGUMENT...]"
     echo
     echo "Compliance scan of Podman container:"
-    echo "$ sudo oscap-podman CONTAINER_NAME OSCAP_ARGUMENT [OSCAP_ARGUMENT...]"
+    echo "$ sudo oscap-podman [--oscap=<OSCAP_BINARY>] CONTAINER_NAME OSCAP_ARGUMENT [OSCAP_ARGUMENT...]"
     echo
     echo "See \`man oscap\` to learn more about semantics of OSCAP_ARGUMENT options."
 }
 
+OSCAP_BINARY=oscap
+
 if [ $# -lt 1 ]; then
     echo "No arguments provided."
     usage
     die
 elif [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
     usage
     die
+elif [[ "$1" == --oscap=* ]] && [ $# -gt 2 ]; then
+    OSCAP_BINARY=${1#"--oscap="}
+    shift
 elif [ "$#" -gt 1 ]; then
     true
 else
@@ -81,7 +86,7 @@ export OSCAP_PROBE_ARCHITECTURE="$(uname --hardware-platform)"
 export OSCAP_EVALUATION_TARGET="$TARGET"
 shift 1
 
-oscap "$@"
+$OSCAP_BINARY "$@"
 EXIT_CODE=$?
 podman umount $ID > /dev/null || die
 if [ $CLEANUP -eq 1 ]; then

diff --git a/utils/oscap-podman.8 b/utils/oscap-podman.8
@@ -12,10 +12,10 @@ This script cannot run in rootless mode.
 Usage of the tool mimics usage and options of oscap(8) tool.
 
 .SS Compliance scan of Podman container image:
-oscap-podman IMAGE_NAME OSCAP_ARGUMENT [OSCAP_ARGUMENT...]
+oscap-podman [--oscap=<OSCAP_BINARY>] IMAGE_NAME OSCAP_ARGUMENT [OSCAP_ARGUMENT...]
 
 .SS Compliance scan of Podman container:
-oscap-podman CONTAINER_NAME OSCAP_ARGUMENT [OSCAP_ARGUMENT...]
+oscap-podman [--oscap=<OSCAP_BINARY>] CONTAINER_NAME OSCAP_ARGUMENT [OSCAP_ARGUMENT...]
 
 Refer to oscap(8) to learn about OSCAP_ARGUMENT options.