浏览代码

Blog password hashing

Bob Mottram 9 年前
父节点
当前提交
d9795a2c3a
共有 2 个文件被更改,包括 14 次插入4 次删除
  1. 7
    2
      src/freedombone
  2. 7
    2
      src/freedombone-adduser

+ 7
- 2
src/freedombone 查看文件

8074
 	fi
8074
 	fi
8075
 
8075
 
8076
 	# create a user
8076
 	# create a user
8077
+	FULLBLOG_ADMIN_PASSWORD_HASH=$(freedombone-sec --bloghash "$FULLBLOG_ADMIN_PASSWORD")
8078
+	if [ ${#FULLBLOG_ADMIN_PASSWORD_HASH} -lt 8 ]; then
8079
+		echo $'Blog admin password could not be hashed'
8080
+		exit 625728
8081
+	fi
8077
 	echo ';Password' > /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
8082
 	echo ';Password' > /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
8078
-	echo "password = '$FULLBLOG_ADMIN_PASSWORD'" >> /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
8079
-	echo 'encryption = clear' >> /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
8083
+	echo "password = '$FULLBLOG_ADMIN_PASSWORD_HASH'" >> /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
8084
+	echo 'encryption = bcrypt' >> /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
8080
 	echo ';Role' >> /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
8085
 	echo ';Role' >> /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
8081
 	echo 'role = admin' >> /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
8086
 	echo 'role = admin' >> /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
8082
 
8087
 

+ 7
- 2
src/freedombone-adduser 查看文件

247
 		userdel -r $MY_USERNAME
247
 		userdel -r $MY_USERNAME
248
 		exit 9
248
 		exit 9
249
 	fi
249
 	fi
250
+	NEW_USER_PASSWORD_HASH=$(freedombone-sec --bloghash "$NEW_USER_PASSWORD")
251
+	if [ ${#NEW_USER_PASSWORD_HASH} -lt 8 ]; then
252
+		echo $'Blog admin password could not be hashed'
253
+		exit 783528
254
+	fi
250
 	echo ';Password' > /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
255
 	echo ';Password' > /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
251
-	echo "password = '$NEW_USER_PASSWORD'" >> /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
252
-	echo 'encryption = clear' >> /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
256
+	echo "password = '$NEW_USER_PASSWORD_HASH'" >> /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
257
+	echo 'encryption = bcrypt' >> /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
253
 	echo ';Role' >> /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
258
 	echo ';Role' >> /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
254
 	echo 'role = admin' >> /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
259
 	echo 'role = admin' >> /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini
255
 	echo "$MY_USERNAME added as a blog user"
260
 	echo "$MY_USERNAME added as a blog user"