Remove inotify beacon due to it not functioning as documented; Add back so-user changes to sync upon so-user changes

This commit is contained in:
Jason Ertel
2021-06-03 15:15:35 -04:00
parent 58ae3479dc
commit 316035910f
3 changed files with 5 additions and 14 deletions

View File

@@ -314,6 +314,7 @@ case "${operation}" in
validateEmail "$email"
updatePassword
createUser "$email"
syncAll
echo "Successfully added new user to SOC"
check_container thehive && echo $password | so-thehive-user-add "$email"
check_container fleet && echo $password | so-fleet-user-add "$email"
@@ -329,6 +330,7 @@ case "${operation}" in
[[ "$email" == "" ]] && fail "Email address must be provided"
updateUser "$email"
syncAll
echo "Successfully updated user"
;;
@@ -337,6 +339,7 @@ case "${operation}" in
[[ "$email" == "" ]] && fail "Email address must be provided"
updateStatus "$email" 'active'
syncAll
echo "Successfully enabled user"
check_container thehive && so-thehive-user-enable "$email" true
check_container fleet && so-fleet-user-enable "$email" true
@@ -347,6 +350,7 @@ case "${operation}" in
[[ "$email" == "" ]] && fail "Email address must be provided"
updateStatus "$email" 'locked'
syncAll
echo "Successfully disabled user"
check_container thehive && so-thehive-user-enable "$email" false
check_container fleet && so-fleet-user-enable "$email" false
@@ -357,6 +361,7 @@ case "${operation}" in
[[ "$email" == "" ]] && fail "Email address must be provided"
deleteUser "$email"
syncAll
echo "Successfully deleted user"
check_container thehive && so-thehive-user-enable "$email" false
check_container fleet && so-fleet-user-enable "$email" false

View File

@@ -1,7 +0,0 @@
beacons:
watch_sqlite_db:
- files:
/opt/so/conf/kratos/db/db.sqlite:
mask:
- modify
- beacon_module: inotify

View File

@@ -123,13 +123,6 @@ syncesusers:
- /opt/so/saltstack/local/salt/elasticsearch/files/users
- /opt/so/saltstack/local/salt/elasticsearch/files/users_roles
beacons_config:
file.managed:
- name: /etc/salt/minion.d/beacons.conf
- source: salt://manager/files/beacons.conf
- onchanges_in:
- service: salt_minion_service
{% else %}
{{sls}}_state_not_allowed: