HIDCHE_PW_SALT 추가

hidche/account.env

@@ -3,6 +3,7 @@
 MYSQL_ROOT_PASSWORD=
 MYSQL_USER=hidche
 MYSQL_PASSWORD=
+HIDCHE_PW_SALT=
 HIDCHE_DB_PREFIX=hidche
 
 

hidche/db/entrypoint_hidche_db.sh

@@ -187,7 +187,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 			if [ "$HIDCHE_DB_PREFIX" ]; then
 				for dbName in "${hidcheDBList[@]}"; do
 					fullDBName="${HIDCHE_DB_PREFIX}_${dbName}"
-					subPW=`echo -n ${dbName}${MYSQL_USER}${MYSQL_PASSWORD}${dbName} | shasum -a 512`
+					subPW=`echo -n ${dbName}${HIDCHE_PW_SALT}${MYSQL_USER}${MYSQL_PASSWORD}${dbName}${HIDCHE_PW_SALT} | shasum -a 512`
 					subPW=${subPW:0:32}
 					echo "CREATE USER '$fullDBName'@'%' IDENTIFIED BY '$subPW' ;" | "${mysql[@]}"
 					echo "GRANT ALL ON \`$fullDBName\`.* TO '$MYSQL_USER'@'%' ;" | "${mysql[@]}"

hidche/install/install_hidche.py

@@ -57,7 +57,7 @@ while True:
 
 session = requests.session()
 
-db_root_pw = hash_password('root', env['MYSQL_USER']+env['MYSQL_PASSWORD'])[:32]
+db_root_pw = hash_password('root'+env['HIDCHE_PW_SALT'], env['MYSQL_USER']+env['MYSQL_PASSWORD'])[:32]
 db_root_name = '%s_root'%env['HIDCHE_DB_PREFIX']
 
 setupDBResult = session.post('http://web/sam/f_install/j_setup_db.php', {
@@ -100,7 +100,7 @@ for serverName in serverList:
     })
     print(serverName, updateResult.text)
 
-    db_pw = hash_password(serverName, env['MYSQL_USER']+env['MYSQL_PASSWORD'])[:32]
+    db_pw = hash_password(serverName+env['HIDCHE_PW_SALT'], env['MYSQL_USER']+env['MYSQL_PASSWORD'])[:32]
     db_name = '%s_%s'%(env['HIDCHE_DB_PREFIX'], serverName)
     resetResult = session.post('http://web/sam/%s/j_install_db.php'%serverName, {
         'db_host':'db',