Fix rollBack and uninstall improvement

unattended_installer/install_functions/opendistro/checks.sh

@@ -1,4 +1,4 @@
-# Wazuh installer - checks.sh functions. 
+# Wazuh installer - checks.sh functions.
 # Copyright (C) 2015, Wazuh Inc.
 #
 # This program is a free software; you can redistribute it
@@ -21,8 +21,8 @@ function checkArguments() {
     # -------------- Configurations ---------------------------------
 
     if [[ ( -n "${AIO}"  || -n "${configurations}" ) && -f "${tar_file}" ]]; then
-            logger -e "File ${tar_file} exists. Please remove it if you want to use a new configuration."
-            exit 1
+        logger -e "File ${tar_file} exists. Please remove it if you want to use a new configuration."
+        exit 1
     fi
 
     if [[ -n "${configurations}" && ( -n "${AIO}" || -n "${elasticsearch}" || -n "${kibana}" || -n "${wazuh}" || -n "${overwrite}" || -n "${start_elastic_cluster}" || -n "${tar_conf}" || -n "${uninstall}" ) ]]; then
@@ -32,35 +32,25 @@ function checkArguments() {
 
     # -------------- Overwrite --------------------------------------
 
-    if [ -n "${overwrite}" ] && [ -z "${AIO}" ] && [ -z "${elasticsearch}" ] && [ -z "${kibana}" ] && [ -z "${wazuh}" ]; then 
-        logger -e "The argument -o|--overwrite must be used with -a, -k, -e or -w. If you want to uninstall all the components use -u|--uninstall"
+    if [ -n "${overwrite}" ] && [ -z "${AIO}" ] && [ -z "${elasticsearch}" ] && [ -z "${kibana}" ] && [ -z "${wazuh}" ]; then
+        logger -e "The argument -o|--overwrite must be used with -a, -k, -e or -w. If you want to uninstall all the components use -u|--uninstall."
         exit 1
     fi
 
     # -------------- Uninstall --------------------------------------
 
     if [ -n "${uninstall}" ]; then
 
-        if [ -z "${wazuhinstalled}" ] && [ -z "${wazuh_remaining_files}" ]; then
-            logger "Wazuh manager components were not found on the system so it was not uninstalled."
-        fi
-
-        if [ -z "${filebeatinstalled}" ] && [ -z "${filebeat_remaining_files}" ]; then
-            logger "Filebeat components were not found on the system so it was not uninstalled."
-        fi
-
-        if [ -z "${elasticsearchinstalled}" ] && [ -z "${elastic_remaining_files}" ]; then
-            logger "Elasticsearch components were not found on the system so it was not uninstalled."
-        fi
-
-        if [ -z "${kibanainstalled}" ] && [ -z "${kibana_remaining_files}" ]; then
-            logger "Kibana components were found on the system so it was not uninstalled."
+        if [ -n "$AIO" ] || [ -n "$elasticsearch" ] || [ -n "$kibana" ] || [ -n "$wazuh" ]; then
+        logger -e "The argument -u|--uninstall can't be used with -a, -k, -e or -w. If you want to overwrite the components use -o|--overwrite."
+        exit 1
         fi
 
-        if [ -n "$AIO" ] || [ -n "$elasticsearch" ] || [ -n "$kibana" ] || [ -n "$wazuh" ]; then
-            logger -e "The argument -u|--uninstall can't be used with -a, -k, -e or -w. If you want to overwrite the components use -o|--overwrite"
+        if ! [ ${uninstall_component_name} == "all" -o ${uninstall_component_name} == "manager" -o ${uninstall_component_name} == "elasticsearch" -o ${uninstall_component_name} == "kibana" ]; then
+            logger -e "The argument -u|--uninstall only accepts the following parameters: all, manager, elasticsearch or kibana."
             exit 1
         fi
+
     fi
 
     # -------------- All-In-One -------------------------------------
@@ -89,7 +79,7 @@ function checkArguments() {
         if [ -n "${elasticsearchinstalled}" ] || [ -n "${elastic_remaining_files}" ]; then
             if [ -n "${overwrite}" ]; then
                 rollBack
-            else 
+            else
                 logger -e "Elasticsearch is already installed in this node or some of its files haven't been erased. Use option -o|--overwrite to overwrite all components."
                 exit 1
             fi
@@ -102,7 +92,7 @@ function checkArguments() {
         if [ -n "${kibanainstalled}" ] || [ -n "${kibana_remaining_files}" ]; then
             if [ -n "${overwrite}" ]; then
                 rollBack
-            else 
+            else
                 logger -e "Kibana is already installed in this node or some of its files haven't been erased. Use option -o|--overwrite to overwrite all components."
                 exit 1
             fi
@@ -115,7 +105,7 @@ function checkArguments() {
         if [ -n "${wazuhinstalled}" ] || [ -n "${wazuh_remaining_files}" ]; then
             if [ -n "${overwrite}" ]; then
                 rollBack
-            else 
+            else
                 logger -e "Wazuh is already installed in this node or some of its files haven't been erased. Use option -o|--overwrite to overwrite all components."
                 exit 1
             fi
@@ -140,10 +130,10 @@ function checkArguments() {
 
     # -------------- Global -----------------------------------------
 
-    if [ -z "${AIO}" ] && [ -z "${elasticsearch}" ] && [ -z "${kibana}" ] && [ -z "${wazuh}" ] && [ -z "${start_elastic_cluster}" ] && [ -z "${configurations}" ] && [ -z "${uninstall}"]; then
+    if [[ -z "${AIO}" && -z "${elasticsearch}" && -z "${kibana}" && -z "${wazuh}" && -z "${start_elastic_cluster}" && -z "${configurations}" && -z "${uninstall}" ]]; then
         logger -e "At least one of these arguments is necessary -a|--all-in-one, -c|--create-configurations, -e|--elasticsearch <elasticsearch-node-name>, -k|--kibana <kibana-node-name>, -s|--start-cluster, -w|--wazuh-server <wazuh-node-name>, -u|--uninstall"
         exit 1
-    fi 
+    fi
 
 }
 
@@ -198,10 +188,6 @@ function checkIfInstalled() {
         wazuhinstalled=$(apt list --installed  2>/dev/null | grep wazuh-manager)
     fi
 
-    if [ -d "/var/ossec" ]; then
-        wazuh_remaining_files=1
-    fi
-
     if [ "${sys_type}" == "yum" ]; then
         elasticsearchinstalled=$(yum list installed 2>/dev/null | grep opendistroforelasticsearch | grep -v kibana)
     elif [ "${sys_type}" == "zypper" ]; then
@@ -210,10 +196,6 @@ function checkIfInstalled() {
         elasticsearchinstalled=$(apt list --installed 2>/dev/null | grep opendistroforelasticsearch | grep -v kibana)
     fi
 
-    if [ -d "/var/lib/elasticsearch/" ] || [ -d "/usr/share/elasticsearch" ] || [ -d "/etc/elasticsearch" ] || [ -f "${base_path}/search-guard-tlstool*" ]; then
-        elastic_remaining_files=1
-    fi
-
     if [ "${sys_type}" == "yum" ]; then
         filebeatinstalled=$(yum list installed 2>/dev/null | grep filebeat)
     elif [ "${sys_type}" == "zypper" ]; then
@@ -222,10 +204,6 @@ function checkIfInstalled() {
         filebeatinstalled=$(apt list --installed  2>/dev/null | grep filebeat)
     fi
 
-    if [ -d "/var/lib/filebeat/" ] || [ -d "/usr/share/filebeat" ] || [ -d "/etc/filebeat" ]; then
-        filebeat_remaining_files=1
-    fi
-
     if [ "${sys_type}" == "yum" ]; then
         kibanainstalled=$(yum list installed 2>/dev/null | grep opendistroforelasticsearch-kibana)
     elif [ "${sys_type}" == "zypper" ]; then
@@ -234,13 +212,46 @@ function checkIfInstalled() {
         kibanainstalled=$(apt list --installed  2>/dev/null | grep opendistroforelasticsearch-kibana)
     fi
 
+    checkWazuhRemainingFiles
+    checkFilebeatRemainingFiles
+    checkElasticRemainingFiles
+    checkKibanaRemainingFiles
+
+}
+
+function checkWazuhRemainingFiles() {
+    if [ -d "/var/ossec" ]; then
+        wazuh_remaining_files=1
+    else
+        wazuh_remaining_files=""
+    fi
+}
+
+function checkFilebeatRemainingFiles() {
+    if [ -d "/var/lib/filebeat/" ] || [ -d "/usr/share/filebeat" ] || [ -d "/etc/filebeat" ]; then
+        filebeat_remaining_files=1
+    else
+        filebeat_remaining_files=""
+    fi
+}
+
+function checkElasticRemainingFiles() {
+    if [ -d "/var/lib/elasticsearch/" ] || [ -d "/usr/share/elasticsearch" ] || [ -d "/etc/elasticsearch" ] || [ -f "${base_path}/search-guard-tlstool*" ]; then
+        elastic_remaining_files=1
+    else
+        elastic_remaining_files=""
+    fi
+}
+
+function checkKibanaRemainingFiles() {
     if [ -d "/var/lib/kibana/" ] || [ -d "/usr/share/kibana" ] || [ -d "/etc/kibana" ]; then
         kibana_remaining_files=1
+    else
+        kibana_remaining_files=""
     fi
-
 }
 
-# This function ensures different names in the config.yml file. 
+# This function ensures different names in the config.yml file.
 function checkNames() {
 
     if [ -n "${einame}" ] && [ -n "${kiname}" ] && [ "${einame}" == "${kiname}" ]; then
@@ -261,7 +272,7 @@ function checkNames() {
     if [ -n "${winame}" ] && [ -z "$(echo "${wazuh_servers_node_names[@]}" | grep -w "${winame}")" ]; then
         logger -e "The Wazuh server node name ${winame} does not appear on the configuration file."
         exit 1
-    fi 
+    fi
 
     if [ -n "${einame}" ] && [ -z "$(echo "${elasticsearch_node_names[@]}" | grep -w "${einame}")" ]; then
         logger -e "The Elasticsearch node name ${einame} does not appear on the configuration file."