Merge pull request #1795 from oracle-devrel/oheimbur-250602

OCI Security Health Check - Standard Edition - Script fix

Author: oheimburger

security/security-design/shared-assets/oci-security-health-check-standard/README.md

@@ -2,7 +2,7 @@
 
 Owner: Olaf Heimburger
 
-Version: 250530 (cis_report.py version 3.0.0.4) for CIS OCI Foundation Benchmark 3.0.0
+Version: 250602 (cis_report.py version 3.0.0.4) for CIS OCI Foundation Benchmark 3.0.0
 
 # Introduction
 ![Flyer](./files/resources/OCI_Security_Health_Check_Standard.png)
@@ -56,22 +56,22 @@ See the *OCI Security Health Check - Standard Edition* in action and watch the [
 
 Before running the *OCI Security Health Check - Standard Edition* you should download and verify it.
 
-  - Download the latest distribution [oci-security-health-check-standard-250530.zip](https://github.com/oracle-devrel/technology-engineering/raw/main/security/security-design/shared-assets/oci-security-health-check-standard/files/resources/oci-security-health-check-standard-250530.zip).
+  - Download the latest distribution [oci-security-health-check-standard-250602.zip](https://github.com/oracle-devrel/technology-engineering/raw/main/security/security-design/shared-assets/oci-security-health-check-standard/files/resources/oci-security-health-check-standard-250602.zip).
   - Download the respective checksum file:
-    - [oci-security-health-check-standard-250530.sha512](https://github.com/oracle-devrel/technology-engineering/raw/main/security/security-design/shared-assets/oci-security-health-check-standard/files/resources/oci-security-health-check-standard-250530.sha512).
-    - [oci-security-health-check-standard-250530.sha512256](https://github.com/oracle-devrel/technology-engineering/raw/main/security/security-design/shared-assets/oci-security-health-check-standard/files/resources/oci-security-health-check-standard-250530.sha512256).
+    - [oci-security-health-check-standard-250602.sha512](https://github.com/oracle-devrel/technology-engineering/raw/main/security/security-design/shared-assets/oci-security-health-check-standard/files/resources/oci-security-health-check-standard-250602.sha512).
+    - [oci-security-health-check-standard-250602.sha512256](https://github.com/oracle-devrel/technology-engineering/raw/main/security/security-design/shared-assets/oci-security-health-check-standard/files/resources/oci-security-health-check-standard-250602.sha512256).
   - Verify the integrity of the distribution. Both files must be in the same directory (for example, in your downloads directory).
 
     On MacOS:
     ```
     cd <your_downloads_directory>
-    shasum -a 512256 -c oci-security-health-check-standard-250530.sha512256
+    shasum -a 512256 -c oci-security-health-check-standard-250602.sha512256
     ```
 
     On Linux (including Cloud Shell):
     ```
     cd <your_downloads_directory>
-    sha512sum -c oci-security-health-check-standard-250530.sha512
+    sha512sum -c oci-security-health-check-standard-250602.sha512
     ```
 
 **Reject the downloaded file if the check fails!**
@@ -84,10 +84,10 @@ In OCI Cloud Shell you can do a short cut without downloading the files mentione
 2. Open Cloud Shell
 3. Run these commands in your Cloud Shell:
   ```
-  wget -q https://github.com/oracle-devrel/technology-engineering/raw/main/security/security-design/shared-assets/oci-security-health-check-standard/files/resources/oci-security-health-check-standard-250530.zip
-  wget -q https://github.com/oracle-devrel/technology-engineering/raw/main/security/security-design/shared-assets/oci-security-health-check-standard/files/resources/oci-security-health-check-standard-250530.sha512
-  sha512sum -c oci-security-health-check-standard-250530.sha512
-  unzip -q oci-security-health-check-standard-250530.zip
+  wget -q https://github.com/oracle-devrel/technology-engineering/raw/main/security/security-design/shared-assets/oci-security-health-check-standard/files/resources/oci-security-health-check-standard-250602.zip
+  wget -q https://github.com/oracle-devrel/technology-engineering/raw/main/security/security-design/shared-assets/oci-security-health-check-standard/files/resources/oci-security-health-check-standard-250602.sha512
+  sha512sum -c oci-security-health-check-standard-250602.sha512
+  unzip -q oci-security-health-check-standard-250602.zip
   ```
 
 ## Prepare the OCI Tenancy

security/security-design/shared-assets/oci-security-health-check-standard/files/oci-security-health-check-standard/README.md

@@ -2,7 +2,7 @@
 
 Owner: Olaf Heimburger
 
-Version: 250530 (cis_report.py version 3.0.0.4) for CIS OCI Foundation Benchmark 3.0.0
+Version: 250602 (cis_report.py version 3.0.0.4) for CIS OCI Foundation Benchmark 3.0.0
 
 ## When to use this asset?
 
@@ -47,22 +47,22 @@ Tested on **OCI Cloud Shell** with **Public network**, **Oracle Linux**, **MacOS
 
 Before running the *OCI Security Health Check - Standard Edition* you should download and verify it.
 
-  - Download the latest distribution [oci-security-health-check-standard-250530.zip](https://github.com/oracle-devrel/technology-engineering/raw/main/security/security-design/shared-assets/oci-security-health-check-standard/files/resources/oci-security-health-check-standard-250530.zip).
+  - Download the latest distribution [oci-security-health-check-standard-250602.zip](https://github.com/oracle-devrel/technology-engineering/raw/main/security/security-design/shared-assets/oci-security-health-check-standard/files/resources/oci-security-health-check-standard-250602.zip).
   - Download the respective checksum file:
-    - [oci-security-health-check-standard-250530.sha512](https://github.com/oracle-devrel/technology-engineering/raw/main/security/security-design/shared-assets/oci-security-health-check-standard/files/resources/oci-security-health-check-standard-250530.sha512).
-    - [oci-security-health-check-standard-250530.sha512256](https://github.com/oracle-devrel/technology-engineering/raw/main/security/security-design/shared-assets/oci-security-health-check-standard/files/resources/oci-security-health-check-standard-250530.sha512256).
+    - [oci-security-health-check-standard-250602.sha512](https://github.com/oracle-devrel/technology-engineering/raw/main/security/security-design/shared-assets/oci-security-health-check-standard/files/resources/oci-security-health-check-standard-250602.sha512).
+    - [oci-security-health-check-standard-250602.sha512256](https://github.com/oracle-devrel/technology-engineering/raw/main/security/security-design/shared-assets/oci-security-health-check-standard/files/resources/oci-security-health-check-standard-250602.sha512256).
   - Verify the integrity of the distribution. Both files must be in the same directory (for example, in your downloads directory).
 
     On MacOS:
     ```
     cd <your_downloads_directory>
-    shasum -a 512256 -c oci-security-health-check-standard-250530.sha512256
+    shasum -a 512256 -c oci-security-health-check-standard-250602.sha512256
     ```
 
     On Linux (including Cloud Shell):
     ```
     cd <your_downloads_directory>
-    sha512sum -c oci-security-health-check-standard-250530.sha512
+    sha512sum -c oci-security-health-check-standard-250602.sha512
     ```
 
 **Reject the downloaded file when the check fails!**
@@ -207,7 +207,7 @@ allow group 'Default'/'grp-auditors' to inspect vcns in compartment <compartment
   - Upload the distribution file.
   - Extract it
     ```
-    unzip -q oci-security-health-check-standard-250530.zip
+    unzip -q oci-security-health-check-standard-250602.zip
     ```
 
 #### Run the script
@@ -281,11 +281,11 @@ allow group 'Default'/'grp-auditors' to inspect vcns in compartment <compartment
       Follow the instructions to select /usr/bin/python3.9
     - Log out
 
-  - From your desktop, upload the `oci-security-health-check-standard-250530.zip` file to the Compute VM using any SFTP client.
+  - From your desktop, upload the `oci-security-health-check-standard-250602.zip` file to the Compute VM using any SFTP client.
   - Log into the Compute VM
     - Extract the distribution
       ```
-      unzip -q oci-security-health-check-standard-250530.zip
+      unzip -q oci-security-health-check-standard-250602.zip
       ```
     - Change directory into `oci-security-health-check-standard`:
       ```

security/security-design/shared-assets/oci-security-health-check-standard/files/oci-security-health-check-standard/README.txt

@@ -2,7 +2,7 @@
 OCI Security Health Check - Standard Edition
 ============================================
 Owner: Olaf Heimburger
-Version: 250530 (cis_report.py version 3.0.0.4)  for CIS OCI Foundation Benchmark 3.0.0
+Version: 250602 (cis_report.py version 3.0.0.4)  for CIS OCI Foundation Benchmark 3.0.0
 
 When to use this asset?
 
@@ -112,7 +112,7 @@ Usage
   - From the menu select the Cloud Shell item.
   - When running it the first time:
     - Upload the provided ZIP file.
-    - Extract it with unzip -q oci-security-health-check-standard-250530.zip
+    - Extract it with unzip -q oci-security-health-check-standard-250602.zip
   - Change directory into oci-security-health-check-standard
     $ cd oci-security-health-check-standard
     $ screen
@@ -169,11 +169,11 @@ Usage
     - Log out
 
   - From your desktop, upload the
-    "oci-security-health-check-standard-250530.zip" file to the Compute VM
+    "oci-security-health-check-standard-250602.zip" file to the Compute VM
     using any SFTP client.
   - Log into the Compute VM
     - Extract the distribution
-      unzip -q oci-security-health-check-standard-250530.zip
+      unzip -q oci-security-health-check-standard-250602.zip
 
     - Change directory into "oci-security-health-check-standard":
       cd oci-security-health-check-standard

security/security-design/shared-assets/oci-security-health-check-standard/files/oci-security-health-check-standard/standard.sh

@@ -7,7 +7,7 @@
 #
 # Author: Olaf Heimburger
 #
-VERSION=250430
+VERSION=250602
 
 graal_version=24.2.1
 OS_TYPE=$(uname)
@@ -166,6 +166,7 @@ make_env() {
         printf "ERROR: Permissions to install the required libraries are missing.\n"
         printf "ERROR: Please check with your OCI administrator.\n"
         exit 1
+    fi
 }
 
 check_shasum() {

security/security-design/shared-assets/oci-security-health-check-standard/files/resources/oci-security-health-check-standard-250530.sha512

@@ -0,0 +1 @@
+106f98ec280fa3392dd4ad3697ea7f61f515b5192574014cc0083221d930a08922bb8707909d74dbcbcd2f1aa830282431d3156880d9afc92c9d23b9ec484523  oci-security-health-check-standard-250602.zip

security/security-design/shared-assets/oci-security-health-check-standard/files/resources/oci-security-health-check-standard-250530.sha512256

@@ -0,0 +1 @@
+867810ce9b4c38e9f5eb5644881fccdaec53f83be0f129a5dc6564d5ba6d8e6f  oci-security-health-check-standard-250602.zip