From 2f8bb5a2a6729c13d9e2233dfe81821dd8a1a580 Mon Sep 17 00:00:00 2001
From: Jason Ertel <jason.ertel@securityonionsolutions.com>
Date: Tue, 19 Oct 2021 16:04:10 -0400
Subject: [PATCH] Fix Docker-created corruption of SOC user roles file

---
 salt/common/tools/sbin/so-user | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/salt/common/tools/sbin/so-user b/salt/common/tools/sbin/so-user
index 5a52a9d59..9bf36cf99 100755
--- a/salt/common/tools/sbin/so-user
+++ b/salt/common/tools/sbin/so-user
@@ -182,6 +182,10 @@ function ensureRoleFileExists() {
       echo "Database file does not exist yet, installation is likely not yet complete."
     fi
 
+    if [[ -d "$socRolesFile" ]]; then
+      echo "Removing invalid roles directory created by Docker"
+      rm -fr "$socRolesFile"
+    fi
     mv "${rolesTmpFile}" "${socRolesFile}"
   fi
 }