From a358caabf4e3fff517ffcb3935e48761109e775e Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Fri, 28 Oct 2016 19:02:08 +0100
Subject: [PATCH] Salt base

---
 src/freedombone-app-irc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/freedombone-app-irc b/src/freedombone-app-irc
index 74c835ac..7ace8c79 100755
--- a/src/freedombone-app-irc
+++ b/src/freedombone-app-irc
@@ -107,8 +107,9 @@ function add_user_irc_bouncer {
 
     stop_irc_bouncer
 
-    ZNC_SALT="$(dd if=/dev/urandom bs=16c count=1 | md5sum | awk '{print $1}')"
-    new_user_hash=$(echo "${new_user_password}${ZNC_SALT}" | sha256sum | awk -F ' ' '{print $1}')
+    ZNC_SALT_BASE="$(create_password 30)"
+    ZNC_SALT="$(echo \"${ZNC_SALT_BASE}\" | md5sum | awk '{print $1}')"
+    new_user_hash=$(echo "${new_user_password}${new_user_salt}" | sha256sum | awk -F ' ' '{print $1}')
 
     echo "<User ${new_username}>" >> /home/znc/.znc/configs/znc.conf
     #new_user_pass="sha256#${new_user_hash}#${new_user_salt}#"
@@ -137,8 +138,8 @@ function add_user_irc_bouncer {
     echo '        LoadModule = perform' >> /home/znc/.znc/configs/znc.conf
     echo '        LoadModule = simple_away' >> /home/znc/.znc/configs/znc.conf
     echo '' >> /home/znc/.znc/configs/znc.conf
-    echo "        Server     = ${DEFAULT_DOMAIN_NAME} +${IRC_PORT}" >> /home/znc/.znc/configs/znc.conf
-    echo "        Server     = ${IRC_ONION_HOSTNAME} +${IRC_PORT}" >> /home/znc/.znc/configs/znc.conf
+    echo "        Server     = ${DEFAULT_DOMAIN_NAME} +${IRC_PORT} ${new_user_password}" >> /home/znc/.znc/configs/znc.conf
+    echo "        Server     = ${IRC_ONION_HOSTNAME} +${IRC_PORT} ${new_user_password}" >> /home/znc/.znc/configs/znc.conf
     echo '' >> /home/znc/.znc/configs/znc.conf
     echo "        <Chan ${PROJECT_NAME}>" >> /home/znc/.znc/configs/znc.conf
     echo '        </Chan>' >> /home/znc/.znc/configs/znc.conf