Skip to content

Fix: restore NSPersistentStoreFileProtectionKey and iCloud backup exclusion for health data (CWE-311, CWE-312) #750

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iaohkut-from-NightWolf-Team wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: restore NSPersistentStoreFileProtectionKey and iCloud backup exclusion for health data (CWE-311, CWE-312) #750

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion CareKitStore/CareKitStore/CoreData/OCKStore.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,6 @@ public final class OCKStore: OCKStoreProtocol, Equatable {
if case .onDisk(let protection) = self.storeType {
let fileManager = FileManager()
let attributes: [FileAttributeKey: Any] = [
FileAttributeKey(kCFURLIsExcludedFromBackupKey as String): true,
FileAttributeKey.protectionKey: protection
]

Expand All @@ -296,6 +295,7 @@ public final class OCKStore: OCKStoreProtocol, Equatable {
descriptor.url = storeURL
descriptor.type = NSSQLiteStoreType
descriptor.shouldAddStoreAsynchronously = false
descriptor.setOption(storeType.securityClass as NSObject, forKey: NSPersistentStoreFileProtectionKey)
container.persistentStoreDescriptions = [descriptor]

// This closure runs synchronously because of the settings above
Expand All @@ -306,6 +306,20 @@ public final class OCKStore: OCKStoreProtocol, Equatable {
loadError = error
return
}

if case .onDisk = self.storeType {
do {
guard var storeUrl = descriptor.url else {
loadError = OCKStoreError.invalidValue(reason: "Bad URL")
return
}
var resourceValues = URLResourceValues()
resourceValues.isExcludedFromBackup = true
try storeUrl.setResourceValues(resourceValues)
} catch {
loadError = error
}
}
})

if let error = loadError {
Expand Down