Skip to content

Commit 995e94a

Browse files
oheimburgeroheimburger
committed
Updated OCI Security Health Check - Standard Edition for CIS OCI Foundation Benchmark 3.0.0
1 parent 2664ded commit 995e94a

File tree

9 files changed

+131
-90
lines changed

9 files changed

+131
-90
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Owner: Olaf Heimburger
44

5-
Version: 250530 (cis_report.py version 3.0.0) for CIS OCI Foundation Benchmark 3.0.0
5+
Version: 250530 (cis_report.py version 3.0.0.4) for CIS OCI Foundation Benchmark 3.0.0
66

77
# Introduction
88
![Flyer](./files/resources/OCI_Security_Health_Check_Standard.png)

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Owner: Olaf Heimburger
44

5-
Version: 250530 (cis_report.py version 3.0.0) for CIS OCI Foundation Benchmark 3.0.0
5+
Version: 250530 (cis_report.py version 3.0.0.4) for CIS OCI Foundation Benchmark 3.0.0
66

77
## When to use this asset?
88

@@ -343,7 +343,11 @@ The report results are summarized in two files:
343343
344344
## Known Issues
345345
346-
No known issues.
346+
1. Python 3.8 is not supported anymore.
347+
OCI Cloud Shell is the minimal required environment. The Python version used in OCI Cloud Shell is 3.9.
348+
2. Diagrams are not part of the HTML page.
349+
This may be because of broken `numpy installation`. The following command should resolve this:
350+
`pip3 install --upgrade --force-reinstall --user numpy`
347351
348352
## Credits
349353

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
OCI Security Health Check - Standard Edition
33
============================================
44
Owner: Olaf Heimburger
5-
Version: 250530 (cis_report.py version 3.0.0) for CIS OCI Foundation Benchmark 3.0.0
5+
Version: 250530 (cis_report.py version 3.0.0.4) for CIS OCI Foundation Benchmark 3.0.0
66

77
When to use this asset?
88

@@ -221,7 +221,11 @@ Usage
221221

222222
5 Known Issues
223223

224-
No known issues.
224+
1. Python 3.8 is not supported anymore.
225+
OCI Cloud Shell is the minimal required environment. The Python version used in OCI Cloud Shell is 3.9.
226+
2. Diagrams are not part of the HTML page.
227+
This may be because of broken `numpy installation`. The following command should resolve this:
228+
`pip3 install --upgrade --force-reinstall --user numpy`
225229

226230
6 Credits
227231

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pytz
33
pandas
44
openpyxl>=3.1.5
55
pyyaml>=6.0
6-
oci>=2.147.0
6+
oci>=2.152.1
77
requests
88
matplotlib
99
numpy

‎security/security-design/shared-assets/oci-security-health-check-standard/files/oci-security-health-check-standard/scripts/cis_reports/cis_reports.py

Lines changed: 84 additions & 62 deletions
Large diffs are not rendered by default.

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

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -134,27 +134,38 @@ make_env() {
134134
if [ ! -d ${PYTHON_ENV} ]; then
135135
${PYTHON_CMD} -m venv ${PYTHON_ENV}
136136
fi
137-
ENV_STAMP="${PYTHON_ENV}/.ready${VERSION}"
138-
if [ ! -e ${ENV_STAMP} ]; then
139-
PIP_OPTS="-q --no-warn-script-location"
140-
if [ -d ${PYTHON_ENV} ]; then
141-
source ${PYTHON_ENV}/bin/activate
142-
PYTHON_CMD=$(which python3)
143-
${PYTHON_CMD} -m pip install pip --upgrade ${PIP_OPTS}
144-
fi
145-
146-
printf "INFO: Checking for required libraries...\n"
147-
${PYTHON_CMD} -m pip install ${PIP_OPTS} -r ${ASSESS_DIR}/requirements.txt
148-
if [ $? -gt 0 ]; then
149-
printf "ERROR: Permissions to install the required libraries are missing.\n"
150-
printf "ERROR: Please check with your OCI administrator.\n"
151-
exit 1
152-
else
153-
touch ${ENV_STAMP}
154-
fi
155-
else
156-
printf "INFO: Using installed libraries...\n"
137+
# ENV_STAMP="${PYTHON_ENV}/.ready${VERSION}"
138+
# if [ ! -e ${ENV_STAMP} ]; then
139+
# PIP_OPTS="-q --no-warn-script-location"
140+
# if [ -d ${PYTHON_ENV} ]; then
141+
# source ${PYTHON_ENV}/bin/activate
142+
# PYTHON_CMD=$(which python3)
143+
# ${PYTHON_CMD} -m pip install pip --upgrade ${PIP_OPTS}
144+
# fi
145+
# printf "INFO: Checking for required libraries...\n"
146+
# ${PYTHON_CMD} -m pip install ${PIP_OPTS} -r ${ASSESS_DIR}/requirements.txt
147+
# if [ $? -gt 0 ]; then
148+
# printf "ERROR: Permissions to install the required libraries are missing.\n"
149+
# printf "ERROR: Please check with your OCI administrator.\n"
150+
# exit 1
151+
# else
152+
# touch ${ENV_STAMP}
153+
# fi
154+
# else
155+
# printf "INFO: Using installed libraries...\n"
156+
# fi
157+
PIP_OPTS="-q --no-warn-script-location"
158+
if [ -d ${PYTHON_ENV} ]; then
159+
source ${PYTHON_ENV}/bin/activate
160+
PYTHON_CMD=$(which python3)
161+
${PYTHON_CMD} -m pip install pip --upgrade ${PIP_OPTS}
157162
fi
163+
printf "INFO: Checking for required libraries...\n"
164+
${PYTHON_CMD} -m pip install ${PIP_OPTS} -r ${ASSESS_DIR}/requirements.txt
165+
if [ $? -gt 0 ]; then
166+
printf "ERROR: Permissions to install the required libraries are missing.\n"
167+
printf "ERROR: Please check with your OCI administrator.\n"
168+
exit 1
158169
}
159170

160171
check_shasum() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
09b6436a44408b1a777bfc967455634a1cbeeda3d9335be89a49cf6fabf7c601379f8187f33c928bd4b885347f1feabd106c1b2dcb3763012b1a38e593aa3dba oci-security-health-check-standard-250530.zip
1+
9ac43507f5108f957fcbcdced5a2130e53e6205234867336e33ffe47852f4af18720a23a2d774bbe6abe5a0ca917d911626d8e4e7688959ab6a0f5eb59960abc oci-security-health-check-standard-250530.zip

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4bdc391730d3e5e06bd863998c534579ee98ff3325f16ae0a1a7b2b269cec6ba oci-security-health-check-standard-250530.zip
1+
8ce90a4fea78cec2656a51806e8b80601429f15409b3ead9f47128aabaf25e2f oci-security-health-check-standard-250530.zip

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

4.01 KB
Binary file not shown.

0 commit comments

Comments
 (0)