From efd6cdc6afa1d13dec3ad733b5dcb9e9a3bfe080 Mon Sep 17 00:00:00 2001
From: Saurabh Misra <saurabh.misra.iitkgp@gmail.com>
Date: Tue, 5 Nov 2024 09:29:23 +0530
Subject: [PATCH] FIX| RKE-CIS-1.24- CHECK 1.1.19 We have added the missing
 script required for check 1.1.19 in rke-cis-1.24 and made it available to the
 kube-bench file
 system(https://github.com/rancher/security-scan/blob/master/package/helper_scripts/check_files_owner_in_dir.sh).

---
 Dockerfile                                 |  4 ++
 cfg/rke-cis-1.24/master.yaml               |  2 +-
 helper_scripts/check_files_owner_in_dir.sh | 44 ++++++++++++++++++++++
 3 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 helper_scripts/check_files_owner_in_dir.sh

diff --git a/Dockerfile b/Dockerfile
index 30e33e572..a36e1c922 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,8 +13,10 @@ RUN make build && cp kube-bench /go/bin/kube-bench
 ARG KUBECTL_VERSION TARGETARCH
 RUN wget -O /usr/local/bin/kubectl "https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl"
 RUN wget -O kubectl.sha256 "https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/${TARGETARCH}/kubectl.sha256"
+
 # Verify kubectl sha256sum
 RUN /bin/bash -c 'echo "$(<kubectl.sha256)  /usr/local/bin/kubectl" | sha256sum -c -'
+
 RUN chmod +x /usr/local/bin/kubectl
 
 FROM alpine:3.20.3 AS run
@@ -57,3 +59,5 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
     org.label-schema.vcs-ref=$VCS_REF \
     org.label-schema.vcs-url="https://github.com/aquasecurity/kube-bench" \
     org.label-schema.schema-version="1.0"
+
+COPY helper_scripts/check_files_owner_in_dir.sh /go/bin
\ No newline at end of file
diff --git a/cfg/rke-cis-1.24/master.yaml b/cfg/rke-cis-1.24/master.yaml
index c08d6e57b..b1d3e8619 100644
--- a/cfg/rke-cis-1.24/master.yaml
+++ b/cfg/rke-cis-1.24/master.yaml
@@ -272,7 +272,7 @@ groups:
 
       - id: 1.1.19
         text: "Ensure that the Kubernetes PKI directory and file ownership is set to root:root (Automated)"
-        audit: "check_files_owner_in_dir.sh /node/etc/kubernetes/ssl"
+        audit: "check_files_owner_in_dir.sh /node/etc/kubernetes/ssl"qqqq
         tests:
           test_items:
             - flag: "true"
diff --git a/helper_scripts/check_files_owner_in_dir.sh b/helper_scripts/check_files_owner_in_dir.sh
new file mode 100644
index 000000000..58b87b2f8
--- /dev/null
+++ b/helper_scripts/check_files_owner_in_dir.sh
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+# This script is used to ensure the owner is set to root:root for
+# the given directory and all the files in it
+#
+# inputs:
+#   $1 = /full/path/to/directory
+#
+# outputs:
+#   true/false
+
+INPUT_DIR=$1
+
+if [[ "${INPUT_DIR}" == "" ]]; then
+    echo "false"
+    exit
+fi
+
+if [[ $(stat -c %U:%G ${INPUT_DIR}) != "root:root" ]]; then
+    echo "false"
+    exit
+fi
+
+statInfoLines=$(stat -c "%n %U:%G" ${INPUT_DIR}/*)
+while read -r statInfoLine; do
+  f=$(echo ${statInfoLine} | cut -d' ' -f1)
+  p=$(echo ${statInfoLine} | cut -d' ' -f2)
+
+  if [[ $(basename "$f" .pem) == "kube-etcd-"* ]]; then
+    if [[ "$p" != "root:root" && "$p" != "etcd:etcd" ]]; then
+      echo "false"
+      exit
+    fi
+  else
+    if [[ "$p" != "root:root" ]]; then
+      echo "false"
+      exit
+    fi
+  fi
+done <<< "${statInfoLines}"
+
+
+echo "true"
+exit