Merge pull request #2872 from Security-Onion-Solutions/automation/ami

Add locking to so-firewall

salt/common/tools/sbin/so-firewall

@@ -15,10 +15,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import os
 import subprocess
 import sys
+import time
 import yaml
 
+lockFile = "/tmp/so-firewall.lock"
 hostgroupsFilename = "/opt/so/saltstack/local/salt/firewall/hostgroups.local.yaml"
 portgroupsFilename = "/opt/so/saltstack/local/salt/firewall/portgroups.local.yaml"
 defaultPortgroupsFilename = "/opt/so/saltstack/default/salt/firewall/portgroups.yaml"
@@ -356,8 +359,30 @@ def main():
     "addportgroup": addportgroup
   }
 
+  code=1
+
+  try:
+    lockAttempts = 0
+    maxAttempts = 30
+    while lockAttempts < maxAttempts:
+      lockAttempts = lockAttempts + 1
+      try:
+        f = open(lockFile, "x")
+        f.close()
+        break
+      except:
+        time.sleep(2)
+
+    if lockAttempts == maxAttempts:
+      print("Lock file (" + lockFile + ") could not be created; proceeding without lock.")
+
     cmd = commands.get(args[0], showUsage)
     code = cmd(options, args[1:])
+  finally:
+    try:
+      os.remove(lockFile)
+    except:
+      print("Lock file (" + lockFile + ") already removed")
 
   sys.exit(code)
 

salt/common/tools/sbin/so-user

@@ -26,9 +26,9 @@ if [[ $# -lt 1 || $# -gt 2 ]]; then
   echo "   update: Updates a user's password; requires 'email' parameter"
   echo "   enable: Enables a user; requires 'email' parameter"
   echo "  disable: Disables a user; requires 'email' parameter"
-  echo " validate: Validates that the given email address and password are acceptable for defining a new user; requires 'email' parameter"
-  echo " valemail: Validates that the given email address is acceptable for defining a new user; requires 'email' parameter"
-  echo "  valpass: Validates that a password is acceptable for defining a new user"
+  echo " validate: Validates that the given email address and password are acceptable; requires 'email' parameter"
+  echo " valemail: Validates that the given email address is acceptable; requires 'email' parameter"
+  echo "  valpass: Validates that a password is acceptable"
   echo ""
   echo " Note that the password can be piped into STDIN to avoid prompting for it"
   exit 1