From e07f4bd0ed31c2d05e02ce0833a42da0b8217129 Mon Sep 17 00:00:00 2001 From: Josh Brower Date: Wed, 8 Feb 2023 13:03:33 -0500 Subject: [PATCH 1/3] Workaround for FleetDM PW Req --- salt/common/tools/sbin/so-fleet-user-add | 7 ++++++- setup/so-functions | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/salt/common/tools/sbin/so-fleet-user-add b/salt/common/tools/sbin/so-fleet-user-add index 2b803326b..747e8a780 100755 --- a/salt/common/tools/sbin/so-fleet-user-add +++ b/salt/common/tools/sbin/so-fleet-user-add @@ -53,8 +53,10 @@ if [[ $? -ne 0 ]]; then exit 2 fi +TEMPPW=$FLEET_SA_PW! + # Create New User -CREATE_OUTPUT=$(docker exec so-fleet fleetctl user create --email $USER_EMAIL --name $USER_EMAIL --password $USER_PASS --global-role admin 2>&1) +CREATE_OUTPUT=$(docker exec so-fleet fleetctl user create --email $USER_EMAIL --name $USER_EMAIL --password $TEMPPW --global-role admin 2>&1) if [[ $? -eq 0 ]]; then echo "Successfully added user to Fleet" @@ -64,6 +66,9 @@ else exit 2 fi +# Reset New User Password to user supplied password +echo "$USER_PW" | so-fleet-user-update "$USER_EMAIL" + # Disable forced password reset MYSQL_OUTPUT=$(docker exec so-mysql mysql -u root --password=$MYSQL_PW fleet -e \ "UPDATE users SET admin_forced_password_reset = 0 WHERE email = '$USER_EMAIL'" 2>&1) diff --git a/setup/so-functions b/setup/so-functions index a38a8ce7b..f39b65c43 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1511,7 +1511,7 @@ generate_passwords(){ PLAYBOOKADMINPASS=$(get_random_value) PLAYBOOKAUTOMATIONPASS=$(get_random_value) FLEETPASS=$(get_random_value) - FLEETSAPASS=$(get_random_value) + FLEETSAPASS="$(get_random_value)!" FLEETJWT=$(get_random_value) GRAFANAPASS=$(get_random_value) SENSORONIKEY=$(get_random_value) From 4dd54cea6c37a4ff988afb9e0b20cb62bdf03ee6 Mon Sep 17 00:00:00 2001 From: Josh Brower Date: Wed, 8 Feb 2023 16:58:47 -0500 Subject: [PATCH 2/3] Use correct variable name --- salt/common/tools/sbin/so-fleet-user-add | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/common/tools/sbin/so-fleet-user-add b/salt/common/tools/sbin/so-fleet-user-add index 747e8a780..8bba73853 100755 --- a/salt/common/tools/sbin/so-fleet-user-add +++ b/salt/common/tools/sbin/so-fleet-user-add @@ -67,7 +67,7 @@ else fi # Reset New User Password to user supplied password -echo "$USER_PW" | so-fleet-user-update "$USER_EMAIL" +echo "$USER_PASS" | so-fleet-user-update "$USER_EMAIL" # Disable forced password reset MYSQL_OUTPUT=$(docker exec so-mysql mysql -u root --password=$MYSQL_PW fleet -e \ From 09bebf08d6e648763e79f3923b0282e5737bbcf4 Mon Sep 17 00:00:00 2001 From: Josh Brower Date: Thu, 9 Feb 2023 09:10:50 -0500 Subject: [PATCH 3/3] Fix FleetDM SOC Link --- salt/soc/files/soc/tools.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/soc/files/soc/tools.json b/salt/soc/files/soc/tools.json index b53f112e5..a2f1338de 100644 --- a/salt/soc/files/soc/tools.json +++ b/salt/soc/files/soc/tools.json @@ -3,6 +3,6 @@ { "name": "toolGrafana", "description": "toolGrafanaHelp", "icon": "fa-external-link-alt", "target": "so-grafana", "link": "/grafana/d/so_overview" }, { "name": "toolCyberchef", "description": "toolCyberchefHelp", "icon": "fa-external-link-alt", "target": "so-cyberchef", "link": "/cyberchef/" }, { "name": "toolPlaybook", "description": "toolPlaybookHelp", "icon": "fa-external-link-alt", "target": "so-playbook", "link": "/playbook/projects/detection-playbooks/issues/" }, - { "name": "toolFleet", "description": "toolFleetHelp", "icon": "fa-external-link-alt", "target": "so-fleet", "link": "/fleet/" }, + { "name": "toolFleet", "description": "toolFleetHelp", "icon": "fa-external-link-alt", "target": "so-fleet", "link": "/fleet/dashboard" }, { "name": "toolNavigator", "description": "toolNavigatorHelp", "icon": "fa-external-link-alt", "target": "so-navigator", "link": "/navigator/" } -] \ No newline at end of file +]