瀏覽代碼

znc salt value

Bob Mottram 8 年之前
父節點
當前提交
a68d343ec1
共有 1 個文件被更改,包括 3 次插入5 次删除
  1. 3
    5
      src/freedombone-app-irc

+ 3
- 5
src/freedombone-app-irc 查看文件

@@ -108,16 +108,14 @@ function add_user_irc_bouncer {
108 108
     stop_irc_bouncer
109 109
 
110 110
     ZNC_SALT_BASE="$(create_password 30)"
111
-    ZNC_SALT="$(echo \"${ZNC_SALT_BASE}\" | md5sum | awk '{print $1}')"
112
-    new_user_hash=$(echo "${new_user_password}${new_user_salt}" | sha256sum | awk -F ' ' '{print $1}')
111
+    ZNC_SALT="$(echo \"${ZNC_SALT_BASE}\" | md5sum | awk -F ' ' '{print $1}')"
112
+    new_user_hash=$(echo "${new_user_password}${ZNC_SALT}" | sha256sum | awk -F ' ' '{print $1}')
113 113
 
114 114
     echo "<User ${new_username}>" >> /home/znc/.znc/configs/znc.conf
115
-    #new_user_pass="sha256#${new_user_hash}#${new_user_salt}#"
116
-    #echo "    Pass       = ${new_user_pass}" >> /home/znc/.znc/configs/znc.conf
117 115
     echo '    <Pass password>' >> /home/znc/.znc/configs/znc.conf
118 116
     echo '        Method = sha256' >> /home/znc/.znc/configs/znc.conf
119 117
     echo "        Hash = ${new_user_hash}" >> /home/znc/.znc/configs/znc.conf
120
-    echo "        Salt = ${new_user_salt}" >> /home/znc/.znc/configs/znc.conf
118
+    echo "        Salt = ${ZNC_SALT}" >> /home/znc/.znc/configs/znc.conf
121 119
     echo '    </Pass>' >> /home/znc/.znc/configs/znc.conf
122 120
     echo "    Admin      = ${is_admin}" >> /home/znc/.znc/configs/znc.conf
123 121
     echo "    Nick       = ${new_username}" >> /home/znc/.znc/configs/znc.conf