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

Improve algorithm for determining if a user sync is necessary; Apply salt state in foreground to avoid collisions with setup salt states.

Browse Source
This commit is contained in:
Jason Ertel
2021-06-21 12:38:02 -04:00
parent 5e042bf4b8
commit f36ef86ccc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
salt/common/tools/sbin/so-user
View File

@@ -236,12 +236,12 @@ function syncElastic() {
} }
function syncAll() { function syncAll() {
if [[ -f "$databasePath" && -f "$elasticUsersFile" ]]; then if [[ -z "$FORCE_SYNC" && -f "$databasePath" && -f "$elasticUsersFile" ]]; then
usersFileAgeSecs=$((echo $(date +%s) - $(date +%s -r "$elasticUsersFile"))) usersFileAgeSecs=$(echo $(($(date +%s) - $(date +%s -r "$elasticUsersFile"))))
staleCount=$(echo "select count(*) from identity_credentials where updated_at >= Datetime('now', '-${usersFileAgeSecs} seconds');" \ staleCount=$(echo "select count(*) from identity_credentials where updated_at >= Datetime('now', '-${usersFileAgeSecs} seconds');" \
| sqlite3 "$databasePath") | sqlite3 "$databasePath")
if [[ "$staleCount" == "0" ]]; then if [[ "$staleCount" == "0" ]]; then
return 1 fail "Users are already in sync. Run 'FORCE_SYNC=1 $0 sync' to force a full sync anyway."
fi fi
fi fi
syncElastic syncElastic