CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6265 from Security-Onion-Solutions/fix/fleet-users

Browse Source 
Fix FleetDM SA Creation for SOUP
This commit is contained in:
Josh Brower
2021-11-17 14:09:59 -05:00
committed by GitHub
parent aca684d55a 773c580e77
commit 2fe4fa06a6
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
salt/common/tools/sbin/soup
View File

@@ -447,19 +447,17 @@ post_to_2.3.90() {
FLEET_HASH=$(docker exec so-soctopus python -c "import bcrypt; print(bcrypt.hashpw('$FLEET_SA_PW'.encode('utf-8'), bcrypt.gensalt()).decode('utf-8'));" 2>&1) FLEET_HASH=$(docker exec so-soctopus python -c "import bcrypt; print(bcrypt.hashpw('$FLEET_SA_PW'.encode('utf-8'), bcrypt.gensalt()).decode('utf-8'));" 2>&1)
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
echo "Failed to generate Fleet password hash" echo "Failed to generate Fleet password hash, unable to add service account to Fleet"
exit 2 else
fi
MYSQL_OUTPUT=$(docker exec so-mysql mysql -u root --password=$MYSQL_PW fleet -e \ MYSQL_OUTPUT=$(docker exec so-mysql mysql -u root --password=$MYSQL_PW fleet -e \
"INSERT INTO users (password,salt,email,name,global_role) VALUES ('$FLEET_HASH','','$FLEET_USER','$FLEET_USER','admin')" 2>&1) "INSERT INTO users (password,salt,email,name,global_role) VALUES ('$FLEET_HASH','','$FLEET_SA_EMAIL','$FLEET_SA_EMAIL','admin')" 2>&1)
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then
echo "Successfully added service account to Fleet" echo "Successfully added service account to Fleet"
else else
echo "Unable to add service account to Fleet" echo "Unable to add service account to Fleet"
echo "$MYSQL_OUTPUT" echo "$MYSQL_OUTPUT"
exit 2 fi
fi fi
POSTVERSION=2.3.90 POSTVERSION=2.3.90