merge

scripts/install.sh

@@ -69,6 +69,10 @@ pushd .
 cd /opt/mistborn
 git submodule update --init --recursive
 
+# Check updates
+echo "Checking updates"
+source ./scripts/subinstallers/check_updates.sh
+
 # MISTBORN_DEFAULT_PASSWORD
 source ./scripts/subinstallers/passwd.sh
 
@@ -90,8 +94,7 @@ else
     echo "SSH key exists for $USER"
 fi
 
-# initial load update package list
-sudo apt-get update
+# initial load update package list during check_updates.sh
 
 # install figlet
 sudo -E apt-get install -y figlet

scripts/services/wazuh/agent.sh

@@ -8,12 +8,12 @@ fi
 
 # install curl
 echo "install curl"
-sudo apt-get install -y curl
+sudo -E apt-get install -y curl
 
 # prepare repo
 echo "Adding Wazuh Repository"
-curl -s https://packages.wazuh.com/key/GPG-KEY-WAZUH | sudo apt-key add -
-echo "deb https://packages.wazuh.com/4.x/apt/ stable main" | sudo tee /etc/apt/sources.list.d/wazuh.list
+curl -s https://packages.wazuh.com/key/GPG-KEY-WAZUH | sudo -E apt-key add -
+echo "deb https://packages.wazuh.com/4.x/apt/ stable main" | sudo -E tee /etc/apt/sources.list.d/wazuh.list
 
 apt-get update
 

scripts/subinstallers/check_updates.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+sudo apt-get update
+
+UPDATES=$(sudo apt-get dist-upgrade -s --quiet=2 | grep ^Inst | wc -l)
+
+if [[ "$UPDATES" -ne "0" ]]; then
+    echo "Please run updates and reboot before installing Mistborn: sudo apt-get update && sudo apt-get -y dist-upgrade"
+    exit 1;
+fi

scripts/subinstallers/extra/wazuh.sh

@@ -23,14 +23,14 @@ import secrets
 import random
 import string
 
-random_pass = ([secrets.choice("@$!*?-_"),
+random_pass = ([secrets.choice("@$!*?-"),
                            secrets.choice(string.digits),
                            secrets.choice(string.ascii_lowercase),
                            secrets.choice(string.ascii_uppercase),
                            ]
                           + [secrets.choice(string.ascii_lowercase
                                            + string.ascii_uppercase
-                                           + "@$!*?-_"
+                                           + "@$!*?-"
                                            + string.digits) for i in range(12)])
 
 random.shuffle(random_pass)