1.60.35

Author: strongbox-mark

StrongBox/Strongbox.entitlements

@@ -4,10 +4,10 @@
 <dict>
 	<key>aps-environment</key>
 	<string>Production</string>
-    <key>com.apple.developer.aps-environment</key>
-    <string>Production</string>
-    <key>com.apple.developer.icloud-container-environment</key>
-    <string>Production</string>
+	<key>com.apple.developer.aps-environment</key>
+	<string>Production</string>
+	<key>com.apple.developer.icloud-container-environment</key>
+	<string>Production</string>
 	<key>com.apple.developer.authentication-services.autofill-credential-provider</key>
 	<true/>
 	<key>com.apple.developer.default-data-protection</key>

model/cloudkit/CloudKitDatabasesInteractor.swift

@@ -330,12 +330,14 @@ class CloudKitDatabasesInteractor: NSObject {
     }
 
     func mergeOrUpdateDatabases(_ ckDbs: [CloudKitHostedDatabase]) async throws {
-        removeNoneExistentDatabases(ckDbs)
+        removeDeletedDatabases(ckDbs)
 
 
 
         for db in ckDbs {
-            try await mergeCloudKitDatabaseIn(db)
+            if db.deletedAt == nil {
+                try await mergeCloudKitDatabaseIn(db)
+            }
         }
     }
 
@@ -412,18 +414,17 @@ class CloudKitDatabasesInteractor: NSObject {
         }
     }
 
-    func removeNoneExistentDatabases(_ ckDbs: [CloudKitHostedDatabase]) {
+    private func removeDeletedDatabases(_ ckDbs: [CloudKitHostedDatabase]) {
+        
+        
 
 
-        let allIds = Set(ckDbs.map(\.id))
-
-        let toRemove = existingCloudKitDatabases.filter { db in
-            guard let cloudKitDatabaseId = cloudKitIdentifierFromStrongboxDatabase(db) else {
-                swlog("🔴 ERROR: Could not read fileId! \(#function)!!")
-                return true 
-            }
+        let deletedCkDbs = ckDbs.filter { ckDb in
+            ckDb.deletedAt != nil
+        }
 
-            return !allIds.contains(cloudKitDatabaseId)
+        let toRemove = deletedCkDbs.compactMap { deletedCkDb in
+            findStrongboxDatabaseForCloudKitDatabase(cloudKitIdentifier: deletedCkDb.id)
         }
 
         for removeMe in toRemove {

model/cloudkit/CloudKitHostedDatabase.swift

@@ -15,6 +15,7 @@ extension CloudKitHostedDatabase {
         static let filename = "filename"
         static let dataBlob = "dataBlob"
         static let modDate = "modDate"
+        static let deletedAt = "deletedAt" 
     }
 }
 
@@ -24,6 +25,7 @@ struct CloudKitHostedDatabase: Identifiable {
     let nickname: String
     let filename: String
     let modDate: Date
+    let deletedAt: Date?
     let dataBlob: Data? 
     let associatedCkRecord: CKRecord
     let sharedWithMe: Bool
@@ -55,9 +57,12 @@ struct CloudKitHostedDatabase: Identifiable {
             return nil
         }
 
+        let deletedAt = record.encryptedValues[RecordKeys.deletedAt] as? Date
+
         self.nickname = nickname
         self.filename = filename
         self.modDate = modDate
+        self.deletedAt = deletedAt
 
         if let asset = record[RecordKeys.dataBlob] as? CKAsset {
 

model/cloudkit/CloudKitManager.swift

@@ -112,6 +112,7 @@ class CloudKitManager {
             CloudKitHostedDatabase.RecordKeys.nickname,
             CloudKitHostedDatabase.RecordKeys.filename,
             CloudKitHostedDatabase.RecordKeys.modDate,
+            CloudKitHostedDatabase.RecordKeys.deletedAt,
             CKRecord.SystemFieldKey.share,
         ]
 
@@ -148,11 +149,12 @@ class CloudKitManager {
             CloudKitHostedDatabase.RecordKeys.nickname,
             CloudKitHostedDatabase.RecordKeys.filename,
             CloudKitHostedDatabase.RecordKeys.modDate,
+            CloudKitHostedDatabase.RecordKeys.deletedAt,
             CKRecord.SystemFieldKey.share,
 
         ]
 
-        return try await executeCloudKitOperation(theDatabase: cloudKitDatabase) { database in
+        let all = try await executeCloudKitOperation(theDatabase: cloudKitDatabase) { database in
             var all: [CloudKitHostedDatabase] = []
 
             let (results, initialQueryCursor) = try await database.records(matching: query, inZoneWith: zone.zoneID, desiredKeys: desiredKeys)
@@ -178,6 +180,34 @@ class CloudKitManager {
 
             return all
         }
+
+        
+
+        maintenanceDeleteOldDatabasesMarkedDeletedAt(all)
+
+        return all
+    }
+
+    func maintenanceDeleteOldDatabasesMarkedDeletedAt(_ databases: [CloudKitHostedDatabase]) {
+        let olds = databases.filter { ckDb in
+            if !ckDb.sharedWithMe, let deletedAt = ckDb.deletedAt, (deletedAt as NSDate).isMoreThanXDaysAgo(90) {
+                return true
+            } else {
+                return false
+            }
+        }
+
+        if !olds.isEmpty {
+            Task {
+                for old in olds {
+                    do {
+                        try await deleteActual(id: old.id)
+                    } catch {
+                        swlog("🔴 Cannot cleanup an old database [\(old)] marked deleted more than 90 days ago.")
+                    }
+                }
+            }
+        }
     }
 
     func updateDatabase(_ id: CloudKitDatabaseIdentifier, dataBlob: Data) async throws -> CloudKitHostedDatabase {
@@ -195,6 +225,22 @@ class CloudKitManager {
     }
 
     func delete(id: CloudKitDatabaseIdentifier) async throws {
+        
+        
+        
+        
+        
+        
+
+        let existing = try await getDatabase(id: id, includeDataBlob: false) 
+
+        
+        
+
+        _ = try await saveOrUpdate(existing.associatedCkRecord, sharedWithMe: id.sharedWithMe, modDate: .now, dataBlob: Data(), deletedAt: .now)
+    }
+
+    func deleteActual(id: CloudKitDatabaseIdentifier) async throws {
         guard !id.sharedWithMe else {
             swlog("🔴 Cannot delete a database we don't own")
             throw CloudKitManagerError.invalidParameters
@@ -207,13 +253,16 @@ class CloudKitManager {
         }
     }
 
-    private func saveOrUpdate(_ ckRecord: CKRecord, sharedWithMe: Bool, nickName: String? = nil, fileName: String? = nil, modDate: Date? = nil, dataBlob: Data? = nil) async throws -> CloudKitHostedDatabase {
+    private func saveOrUpdate(_ ckRecord: CKRecord, sharedWithMe: Bool, nickName: String? = nil, fileName: String? = nil, modDate: Date? = nil, dataBlob: Data? = nil, deletedAt: Date? = nil) async throws -> CloudKitHostedDatabase {
         if let nickName {
             ckRecord.encryptedValues[CloudKitHostedDatabase.RecordKeys.nickname] = nickName
         }
         if let fileName {
             ckRecord.encryptedValues[CloudKitHostedDatabase.RecordKeys.filename] = fileName
         }
+        if let deletedAt {
+            ckRecord.encryptedValues[CloudKitHostedDatabase.RecordKeys.deletedAt] = deletedAt
+        }
 
         var tmpAssetUrlToDelete: URL? = nil