Fixes issue #2

tuxudo · Sep 9, 2024 · 420b575 · 420b575
1 parent 3ecc3ad
commit 420b575
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/macos_security_compliance_controller.php b/macos_security_compliance_controller.php
@@ -87,7 +87,9 @@ public function get_tab_data($serial_number = '')
 
         $sql = "SELECT `last_compliance_check`, `baseline`, `compliant`, `fails`, `passes`, `exempt`, `total`, `compliance_json`
                     FROM macos_security_compliance 
-                    WHERE serial_number = '$serial_number'";
+                    LEFT JOIN reportdata USING (serial_number)
+                    ".get_machine_group_filter()."
+                    AND serial_number = '$serial_number'";
 
         $queryobj = new Macos_security_compliance_model();
         $macos_security_compliance_tab = $queryobj->query($sql);

diff --git a/scripts/macos_security_compliance b/scripts/macos_security_compliance
@@ -45,7 +45,14 @@ def process_audit(audit):
 
     for item in pl:
         if item == 'lastComplianceCheck':
-            out['last_compliance_check'] = str(int(time.mktime(datetime.datetime.strptime(pl[item], "%a %b %d %H:%M:%S %Z %Y").timetuple())))
+            try:
+                out['last_compliance_check'] = str(int(time.mktime(datetime.datetime.strptime(pl[item], "%Y-%m-%d %H:%M:%S%z").timetuple()))) # Sonoma baselines v3.0 and newer
+            except:
+                try:
+                    out['last_compliance_check'] = str(int(time.mktime(datetime.datetime.strptime(pl[item], "%a %b %d %H:%M:%S %Z %Y").timetuple()))) # Ventura and older, US local only
+                except:
+                    out['last_compliance_check'] = str(int(os.path.getmtime(audit))) # Use file last modified time
+
         else:
             total += 1
             try: