Fix for missing PKI key pairs in SSH check

ref: #88
ParetoSecurity · Dec 13, 2021 · e60984d · e60984d
1 parent 9a0f7a7
commit e60984d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/Pareto/Checks/Access Security/SSHKeys.swift b/Pareto/Checks/Access Security/SSHKeys.swift
@@ -47,18 +47,23 @@ class SSHKeysCheck: ParetoCheck {
     }
 
     override func checkPasses() -> Bool {
-        let files = try? FileManager.default.contentsOfDirectory(at: sshPath, includingPropertiesForKeys: nil)
-        for pub in (files!.filter { $0.pathExtension == "pub" }) {
-            let privateKey = pub.path.replacingOccurrences(of: ".pub", with: "")
-            if !itExists(privateKey) {
-                continue
-            }
-            if !isPasswordEnabled(withKey: privateKey) {
-                os_log("Checking %{public}s", pub.path)
-                sshKey = pub.lastPathComponent.replacingOccurrences(of: ".pub", with: "")
-                return false
+        do {
+            let files = try FileManager.default.contentsOfDirectory(at: sshPath, includingPropertiesForKeys: nil).filter { $0.pathExtension == "pub" }
+            for pub in files {
+                let privateKey = pub.path.replacingOccurrences(of: ".pub", with: "")
+                if !itExists(privateKey) {
+                    continue
+                }
+                if !isPasswordEnabled(withKey: privateKey) {
+                    os_log("Checking %{public}s", pub.path)
+                    sshKey = pub.lastPathComponent.replacingOccurrences(of: ".pub", with: "")
+                    return false
+                }
             }
+            return true
+        } catch {
+            os_log("Failed to check SSH keys %{public}s", error.localizedDescription)
+            return true
         }
-        return true
     }
 }
diff --git a/Pareto/Info.plist b/Pareto/Info.plist
@@ -26,7 +26,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>3626</string>
+	<string>3629</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>