fix: Handle empty dict in TimeMachine check for related checks

ParetoSecurity · Feb 5, 2025 · cd27afc · cd27afc
1 parent 3878ed1
commit cd27afc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/Pareto/Checks/System Integrity/TimeMachine.swift b/Pareto/Checks/System Integrity/TimeMachine.swift
@@ -31,7 +31,7 @@ class TimeMachineCheck: ParetoCheck {
     }
 
     override public var isRunnable: Bool {
-        guard let config = readDefaultsFile(path: "/Library/Preferences/com.apple.TimeMachine.plist") as? [String: Any] else {
+        guard readDefaultsFile(path: "/Library/Preferences/com.apple.TimeMachine.plist") is [String: Any] else {
             return false
         }
         return config.count > 1 && isActive

diff --git a/Pareto/Checks/System Integrity/TimeMachineIsEncrypted.swift b/Pareto/Checks/System Integrity/TimeMachineIsEncrypted.swift
@@ -22,7 +22,16 @@ class TimeMachineIsEncryptedCheck: ParetoCheck {
     }
 
     override public var isRunnable: Bool {
-        return TimeMachineCheck.sharedInstance.isRunnable && isActive
+        if TimeMachineCheck.sharedInstance.isRunnable && isActive {
+            let dict = readDefaultsFile(path: "/Library/Preferences/com.apple.TimeMachine.plist") as! [String: Any]?
+            guard let settings = dict else {
+                return false
+            }
+            let tmConf = TimeMachineConfig(dict: settings)
+            return tmConf.canCheckIsEncryptedBackup
+        }
+
+        return false
     }
 
     override public var showSettings: Bool {

diff --git a/Pareto/Info.plist b/Pareto/Info.plist
@@ -26,7 +26,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>5538</string>
+	<string>5539</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>