Merge pull request #909 from Security-Onion-Solutions/fix/1.4.1

Update to 1.4.1

README.md

@@ -1,3 +1,8 @@
+## Hybrid Hunter Beta 1.4.1 - Beta 3
+
+- Fix install script to handle hostnames properly.
+
+
 ## Hybrid Hunter Beta 1.4.0 - Beta 3
 
 - Complete overhaul of the way we handle custom and default settings and data. You will now see a default and local directory under the saltstack directory. All customizations are stored in local.

VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

salt/soc/files/soc/changes.json

@@ -1,6 +1,7 @@
 {
-  "title": "Introducing Hybrid Hunter 1.4.0 Beta 3",
+  "title": "Introducing Hybrid Hunter 1.4.1 Beta 3",
   "changes": [
+    { "summary": "Fix install script to handle hostnames properly." },
     { "summary": "Complete overhaul of the way we handle custom and default settings and data. You will now see a default and local directory under the saltstack directory. All customizations are stored in local." },
     { "summary": "The way firewall rules are handled has been completely revamped. This will allow the user to customize firewall rules much easier." }, 
     { "summary": "Users can now change their own password in SOC." },

setup/so-functions

@@ -19,7 +19,7 @@ source ./so-whiptail
 source ./so-variables
 source ./so-common-functions
 
-SOVERSION=1.4.0
+SOVERSION=1.4.1
 
 accept_salt_key_remote() {
 	systemctl restart salt-minion

setup/so-whiptail

@@ -951,16 +951,23 @@ whiptail_set_hostname() {
 
 	HOSTNAME=$(cat /etc/hostname)
 
+	if [[ "$HOSTNAME" == *'localhost'* ]]; then HOSTNAME=securityonion; fi
+
 	HOSTNAME=$(whiptail --title "Security Onion Setup" --inputbox \
-	"Enter the Hostname you would like to set." 10 75 "$HOSTNAME" 3>&1 1>&2 2>&3)
+	"Enter the hostname (not FQDN) you would like to set." 10 75 "$HOSTNAME" 3>&1 1>&2 2>&3)
 
 	local exitstatus=$?
 	whiptail_check_exitstatus $exitstatus
 
-	while [[ "$HOSTNAME" == *'localhost'* ]] ; do
-		whiptail --title "Security Onion Setup" --msgbox "Please choose a hostname that doesn't contain localhost." 8 75
+	while [[ $HOSTNAME == *'localhost'* || ! ( $HOSTNAME =~ ^[a-zA-Z0-9\-]*$ ) ]] ; do
+		local error_message
+		error_message=$(echo "Please choose a valid hostname. It cannot contain localhost; and must contain only \
+			the ASCII letters 'a' through 'z' (case-insensitive), the digits '0' through '9', \
+			and hyphen ('-')" | tr -d '\t')
+		whiptail --title "Security Onion Setup" \
+		--msgbox "$error_message" 10 75
 		HOSTNAME=$(whiptail --title "Security Onion Setup" --inputbox \
-		"Enter the Hostname you would like to set." 10 75 "$HOSTNAME" 3>&1 1>&2 2>&3)
+		"Enter the hostname (not FQDN) you would like to set." 10 75 "$HOSTNAME" 3>&1 1>&2 2>&3)
 		local exitstatus=$?
 		whiptail_check_exitstatus $exitstatus
 	done