diff --git a/Pareto/Checks/Firewall and Sharing/FirewallStealth.swift b/Pareto/Checks/Firewall and Sharing/FirewallStealth.swift index f50d0c3..45d6fc8 100644 --- a/Pareto/Checks/Firewall and Sharing/FirewallStealth.swift +++ b/Pareto/Checks/Firewall and Sharing/FirewallStealth.swift @@ -23,6 +23,15 @@ class FirewallStealthCheck: ParetoCheck { return FirewallCheck.sharedInstance.isActive && isActive } + override public var hasDebug: Bool { + return true + } + + override public func debugInfo() -> String { + let dictionary = readDefaultsFile(path: "/Library/Preferences/com.apple.alf.plist") + return "com.apple.alf.plist:\n\(dictionary.debugDescription)" + } + override public var showSettings: Bool { if teamEnforced { return false diff --git a/Pareto/Info.plist b/Pareto/Info.plist index d0e2a0b..d7ffe28 100644 --- a/Pareto/Info.plist +++ b/Pareto/Info.plist @@ -26,7 +26,7 @@ CFBundleVersion - 4885 + 4886 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/Pareto/Models/TimeMachineBackup.swift b/Pareto/Models/TimeMachineBackup.swift index 29bd8f7..c063087 100644 --- a/Pareto/Models/TimeMachineBackup.swift +++ b/Pareto/Models/TimeMachineBackup.swift @@ -14,6 +14,7 @@ enum EncryptionState: String { struct TimeMachineDestinations { let LastKnownEncryptionState: EncryptionState let DestinationID: String + let DiskImageKeychainUUID: String let ReferenceLocalSnapshotDate: Date // Last time of backup let BackupAlias: Data let IsNAS: Bool @@ -22,6 +23,7 @@ struct TimeMachineDestinations { guard let dict = obj else { LastKnownEncryptionState = EncryptionState.Unknown DestinationID = "" + DiskImageKeychainUUID = "" ReferenceLocalSnapshotDate = Date.distantPast BackupAlias = Data(capacity: 0) IsNAS = false @@ -32,11 +34,12 @@ struct TimeMachineDestinations { IsNAS = backup.contains("afp://") || backup.contains("smb://") LastKnownEncryptionState = EncryptionState(rawValue: dict["LastKnownEncryptionState"] as? String ?? "") ?? EncryptionState.Unknown DestinationID = dict["DestinationID"] as? String ?? "" + DiskImageKeychainUUID = dict["DiskImageKeychainUUID"] as? String ?? "" ReferenceLocalSnapshotDate = dict["ReferenceLocalSnapshotDate"] as? Date ?? Date.distantPast } var isEncrypted: Bool { - return LastKnownEncryptionState == EncryptionState.Encrypted + return LastKnownEncryptionState == EncryptionState.Encrypted || !DiskImageKeychainUUID.isEmpty } var isUpToDateBackup: Bool {