Merge pull request #2256 from wazuh/2197-fix-sca-wildcard

Support empty ruleset/sca directories
wazuh · Jul 7, 2023 · 87f4e7f · 87f4e7f
2 parents bbbc2f3 + 5e69a36
commit 87f4e7f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/debs/SPECS/wazuh-agent/debian/postinst b/debs/SPECS/wazuh-agent/debian/postinst
@@ -94,9 +94,11 @@ case "$1" in
             done
         fi
 
-        # Set correct permissions, owner and group
-        chmod 640 ${DIR}/ruleset/sca/*
-        chown root:${GROUP} ${DIR}/ruleset/sca/*
+        # Set correct permissions, owner and group. ruleset directory may be empty.
+        if [ -z "$(ls -A ${DIR}/ruleset/sca/)" ]; then
+            chmod --recursive u=rwX,g=rX,o= ${DIR}/ruleset/sca/
+            chown --recursive root:${GROUP} ${DIR}/ruleset/sca/
+        fi
         # Delete the temporary directory
         rm -rf ${SCA_BASE_DIR}
 
@@ -205,4 +207,4 @@ case "$1" in
 
 esac
 
-exit 0
+exit 0
diff --git a/debs/SPECS/wazuh-manager/debian/postinst b/debs/SPECS/wazuh-manager/debian/postinst
@@ -218,9 +218,11 @@ case "$1" in
             done
         fi
 
-        # Set correct permissions, owner and group
-        chmod 640 ${DIR}/ruleset/sca/*
-        chown root:${GROUP} ${DIR}/ruleset/sca/*
+        # Set correct permissions, owner and group. ruleset directory may be empty.
+        if [ -z "$(ls -A ${DIR}/ruleset/sca/)" ]; then
+            chmod --recursive u=rwX,g=rX,o= ${DIR}/ruleset/sca/
+            chown --recursive root:${GROUP} ${DIR}/ruleset/sca/
+        fi
         # Delete the temporary directory
         rm -rf ${SCA_BASE_DIR}