Bob Mottram 8 年 前
コミット
bc7301c747
共有1 個のファイルを変更した4 個の追加6 個の削除を含む
  1. 4
    6
      src/freedombone-app-irc

+ 4
- 6
src/freedombone-app-irc ファイルの表示

@@ -107,10 +107,8 @@ function add_user_irc_bouncer {
107 107
 
108 108
     stop_irc_bouncer
109 109
 
110
-    new_user_salt_base1="$(create_password 20)"
111
-    new_user_salt_base2=$(echo "$new_user_salt_base1" | sed "s|#|.|g")
112
-    new_user_salt=$(echo "$new_user_salt_base2" | sed "s|#|.|g")
113
-    new_user_hash=$(echo "${new_user_password}${new_user_salt}" | sha256sum | awk -F ' ' '{print $1}')
110
+    ZNC_SALT="$(dd if=/dev/urandom bs=16c count=1 | md5sum | awk '{print $1}')"
111
+    new_user_hash=$(echo "${new_user_password}${ZNC_SALT}" | sha256sum | awk -F ' ' '{print $1}')
114 112
 
115 113
     echo "<User ${new_username}>" >> /home/znc/.znc/configs/znc.conf
116 114
     #new_user_pass="sha256#${new_user_hash}#${new_user_salt}#"
@@ -139,8 +137,8 @@ function add_user_irc_bouncer {
139 137
     echo '        LoadModule = perform' >> /home/znc/.znc/configs/znc.conf
140 138
     echo '        LoadModule = simple_away' >> /home/znc/.znc/configs/znc.conf
141 139
     echo '' >> /home/znc/.znc/configs/znc.conf
142
-    echo "        Server     = ${DEFAULT_DOMAIN_NAME} +${IRC_PORT} ${new_user_password}" >> /home/znc/.znc/configs/znc.conf
143
-    echo "        Server     = ${IRC_ONION_HOSTNAME} +${IRC_PORT} ${new_user_password}" >> /home/znc/.znc/configs/znc.conf
140
+    echo "        Server     = ${DEFAULT_DOMAIN_NAME} +${IRC_PORT}" >> /home/znc/.znc/configs/znc.conf
141
+    echo "        Server     = ${IRC_ONION_HOSTNAME} +${IRC_PORT}" >> /home/znc/.znc/configs/znc.conf
144 142
     echo '' >> /home/znc/.znc/configs/znc.conf
145 143
     echo "        <Chan ${PROJECT_NAME}>" >> /home/znc/.znc/configs/znc.conf
146 144
     echo '        </Chan>' >> /home/znc/.znc/configs/znc.conf