Story #15673: Trying to avoid "career-ender" problems.

Author: GiooDev

deployment/pki/scripts/lib/ca.sh

@@ -92,8 +92,8 @@ function generate_ca_intermediate {
 function init_config_ca {
     local CA_DIR="${1}"
 
-    # Suppression de la configuration existante.
-    rm -Rf "${CONFIG_DIR}/${CA_DIR}"
+    # Deleting existing configuration but fail if variables are undefined
+    rm -vRf "${CONFIG_DIR:?}/${CA_DIR:?}"
     mkdir -p "${CONFIG_DIR}/${CA_DIR}"
     touch "${CONFIG_DIR}/${CA_DIR}/index.txt"
     echo '01' > "${CONFIG_DIR}/${CA_DIR}/serial"
@@ -132,11 +132,11 @@ function main() {
     if [ "${ERASE}" == "true" ]; then
         if [ -d ${CA_DIR} ]; then
             # We remove all generated CA
-            find "${CA_DIR}/" -mindepth 1 -maxdepth 1 -type d -exec rm -Rf {} \;
+            find "${CA_DIR:?}/" -mindepth 1 -maxdepth 1 -type d -exec rm -vRf {} \;
         fi
         if [ -d ${CONFIG_DIR} ]; then
             # We remove all configurations linked to CA (except main config files)
-            find "${CONFIG_DIR}/" -mindepth 1 -maxdepth 1 -type d -exec rm -Rf {} \;
+            find "${CONFIG_DIR:?}/" -mindepth 1 -maxdepth 1 -type d -exec rm -vRf {} \;
         fi
     fi
 
@@ -184,7 +184,7 @@ function main() {
     if [ -d ${TEMP_CERTS} ]; then
         pki_logger "=============================================="
         pki_logger "Cleaning of temporary tempcerts directories"
-        rm -Rf ${TEMP_CERTS}
+        rm -vRf ${TEMP_CERTS:?}
     fi
     pki_logger "=============================================="
     pki_logger "End of CA creation procedure"

deployment/pki/scripts/lib/certs.sh

@@ -284,10 +284,10 @@ function main {
     if [ "${ERASE}" == "true" ]; then
         if [ -d ${CERTIFICATE_DIR} ]; then
             # We remove all generated certs
-            find ${CERTIFICATE_DIR} -type f -name *.crt -exec rm -f {} \;
-            find ${CERTIFICATE_DIR} -type f -name *.key -exec rm -f {} \;
-            find ${CERTIFICATE_DIR} -type f -name *.pem -exec rm -f {} \;
-            find ${CERTIFICATE_DIR} -type d -empty -delete
+            find ${CERTIFICATE_DIR:?} -type f -name *.crt -exec rm -vf {} \;
+            find ${CERTIFICATE_DIR:?} -type f -name *.key -exec rm -vf {} \;
+            find ${CERTIFICATE_DIR:?} -type f -name *.pem -exec rm -vf {} \;
+            find ${CERTIFICATE_DIR:?} -type d -empty -delete
         fi
     fi
     if [ ! -d ${CERTIFICATE_DIR} ]; then
@@ -304,7 +304,7 @@ function main {
     if [ -d ${TEMP_CERTS} ]; then
         pki_logger "=============================================="
         pki_logger "Cleaning of temporary tempcerts directories"
-        rm -Rf ${TEMP_CERTS}
+        rm -vRf ${TEMP_CERTS:?}
     fi
     pki_logger "=============================================="
     pki_logger "End of certificates creation procedure"

deployment/pki/scripts/lib/commons.sh

@@ -45,9 +45,9 @@ function purge_directory {
         return 1
     fi
 
-    find "${DIR_TO_PURGE}" -type f -name "*.attr" -exec rm -f {} \;
-    find "${DIR_TO_PURGE}" -type f -name "*.old"  -exec rm -f {} \;
-    find "${DIR_TO_PURGE}" -type f -name "*.req"  -exec rm -f {} \;
+    find "${DIR_TO_PURGE:?}" -type f -name "*.attr" -exec rm -vf {} \;
+    find "${DIR_TO_PURGE:?}" -type f -name "*.old"  -exec rm -vf {} \;
+    find "${DIR_TO_PURGE:?}" -type f -name "*.req"  -exec rm -vf {} \;
 }
 
 function generatePassphrase {

deployment/pki/scripts/lib/stores.sh

@@ -120,7 +120,7 @@ function generateTrustStore {
     fi
 
     if [ -f "${TRUST_STORE}" ]; then
-        rm -vf "${TRUST_STORE}"
+        rm -vf "${TRUST_STORE:?}"
     fi
 
     # Add the public client ca certificates to the truststore
@@ -201,7 +201,7 @@ function generateHostKeystore {
     local TMP_P12_PASSWORD="${6}"
 
     if [ -f ${KEYSTORE} ]; then
-        rm -f ${KEYSTORE}
+        rm -vf ${KEYSTORE:?}
     fi
 
     pki_logger "Generate p12"
@@ -220,7 +220,7 @@ function generateHostKeystore {
     if [ "${DEV_MODE}" != "true" ]; then
         if [ -f ${P12_KEYSTORE} ]; then
             pki_logger " /!\ Delete p12: ${P12_KEYSTORE}"
-            rm -vf ${P12_KEYSTORE}
+            rm -vf ${P12_KEYSTORE:?}
         fi
     fi
 }
@@ -255,7 +255,7 @@ function main() {
     initVault   keystores   ${ERASE}
 
     # Remove old keystores & servers directories
-    find ${REPERTOIRE_KEYSTORES} -mindepth 1 -maxdepth 1 -type d -exec rm -vrf {} \;
+    find ${REPERTOIRE_KEYSTORES:?} -mindepth 1 -maxdepth 1 -type d -exec rm -vrf {} \;
 
     # Generate the server keystores for vitamui-services except ui- components
     for COMPONENT in $(ls ${CERTIFICATE_DIR}/vitamui-services/server/ | grep -v -e "README" -e "^ui-" ); do
@@ -307,7 +307,7 @@ function main() {
             if [ "${DEV_MODE}" != "true" ]; then
                 if [ -f ${P12_KEYSTORE} ]; then
                     pki_logger " /!\ Delete p12: ${P12_KEYSTORE}"
-                    rm -vf ${P12_KEYSTORE}
+                    rm -vf ${P12_KEYSTORE:?}
                 fi
             fi