浏览代码

Salt base

Bob Mottram 8 年前
父节点
当前提交
a358caabf4
共有 1 个文件被更改,包括 5 次插入4 次删除
  1. 5
    4
      src/freedombone-app-irc

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

107
 
107
 
108
     stop_irc_bouncer
108
     stop_irc_bouncer
109
 
109
 
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}')
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}')
112
 
113
 
113
     echo "<User ${new_username}>" >> /home/znc/.znc/configs/znc.conf
114
     echo "<User ${new_username}>" >> /home/znc/.znc/configs/znc.conf
114
     #new_user_pass="sha256#${new_user_hash}#${new_user_salt}#"
115
     #new_user_pass="sha256#${new_user_hash}#${new_user_salt}#"
137
     echo '        LoadModule = perform' >> /home/znc/.znc/configs/znc.conf
138
     echo '        LoadModule = perform' >> /home/znc/.znc/configs/znc.conf
138
     echo '        LoadModule = simple_away' >> /home/znc/.znc/configs/znc.conf
139
     echo '        LoadModule = simple_away' >> /home/znc/.znc/configs/znc.conf
139
     echo '' >> /home/znc/.znc/configs/znc.conf
140
     echo '' >> /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
141
+    echo "        Server     = ${DEFAULT_DOMAIN_NAME} +${IRC_PORT} ${new_user_password}" >> /home/znc/.znc/configs/znc.conf
142
+    echo "        Server     = ${IRC_ONION_HOSTNAME} +${IRC_PORT} ${new_user_password}" >> /home/znc/.znc/configs/znc.conf
142
     echo '' >> /home/znc/.znc/configs/znc.conf
143
     echo '' >> /home/znc/.znc/configs/znc.conf
143
     echo "        <Chan ${PROJECT_NAME}>" >> /home/znc/.znc/configs/znc.conf
144
     echo "        <Chan ${PROJECT_NAME}>" >> /home/znc/.znc/configs/znc.conf
144
     echo '        </Chan>' >> /home/znc/.znc/configs/znc.conf
145
     echo '        </Chan>' >> /home/znc/.znc/configs/znc.conf