Skip to content

Guard CloudKit startup in non-entitled builds #322

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
tymrtn wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Guard CloudKit startup in non-entitled builds #322

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
101 changes: 93 additions & 8 deletions MJCloudKitUserDefaultsSync/MJCloudKitUserDefaultsSync/MJCloudKitUserDefaultsSync.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,39 @@

#import "MJCloudKitUserDefaultsSync.h"
#import <CloudKit/CloudKit.h>
#import <Security/Security.h>

// String constants we use.
static NSString *const recordZoneName = @"MJCloudKitUserDefaultsSync";
static NSString *const subscriptionID = @"UserDefaultSubscription";
static NSString *const recordType = @"UserDefault";
static NSString *const recordName = @"UserDefaults";

static BOOL MJCloudKitProcessHasICloudEntitlement(void) {
static dispatch_once_t onceToken;
static BOOL hasEntitlement = NO;
dispatch_once(&onceToken, ^{
SecTaskRef task = SecTaskCreateFromSelf(kCFAllocatorDefault);
if ( nil == task ) {
return;
}

CFTypeRef entitlementValue = SecTaskCopyValueForEntitlement(task, CFSTR("com.apple.developer.icloud-container-identifiers"), NULL);
if ( nil != entitlementValue ) {
if ( CFArrayGetTypeID() == CFGetTypeID(entitlementValue) ) {
hasEntitlement = (CFArrayGetCount((CFArrayRef)entitlementValue) > 0);
}
else if ( CFStringGetTypeID() == CFGetTypeID(entitlementValue) ) {
hasEntitlement = (CFStringGetLength((CFStringRef)entitlementValue) > 0);
}
CFRelease(entitlementValue);
}

CFRelease(task);
});
return hasEntitlement;
}

@interface MJCloudKitUserDefaultsSync_NotificationHander : NSObject
@end
@implementation MJCloudKitUserDefaultsSync_NotificationHander {
Expand Down Expand Up @@ -892,8 +918,21 @@ - (void)commonStartInitialStepsOnContainerIdentifier:(NSString *)containerIdenti
DLog(@"Waited for sync queue to clear before adding new criteria.");
});

NSString *effectiveContainerIdentifier = containerIdentifier;
if ( nil == effectiveContainerIdentifier || 0 == [effectiveContainerIdentifier length] ) {
NSString *bundleIdentifier = [[NSBundle mainBundle] bundleIdentifier];
if ( nil != bundleIdentifier && 0 != [bundleIdentifier length] ) {
effectiveContainerIdentifier = [NSString stringWithFormat:@"iCloud.%@", bundleIdentifier];
DLog(@"Missing container identifier. Falling back to %@", effectiveContainerIdentifier);
}
}
if ( nil == effectiveContainerIdentifier || 0 == [effectiveContainerIdentifier length] ) {
DLog(@"No valid container identifier available.");
return;
}

[databaseContainerIdentifier release];
databaseContainerIdentifier = [containerIdentifier retain];
databaseContainerIdentifier = [effectiveContainerIdentifier retain];
}

- (void)pause {
Expand Down Expand Up @@ -1051,7 +1090,38 @@ - (void)checkCloudKitUpdates {
- (void)attemptToEnable {
dispatch_suspend(startStopQueue);
DLog(@"Attempting to enable");
[[CKContainer defaultContainer] accountStatusWithCompletionHandler:^(CKAccountStatus accountStatus, NSError *error) {
if ( nil == databaseContainerIdentifier || 0 == [databaseContainerIdentifier length] ) {
DLog(@"No container identifier configured; skipping enable.");
dispatch_resume(startStopQueue);
[self decrementUserActions];
return;
}
if ( !MJCloudKitProcessHasICloudEntitlement() ) {
DLog(@"Missing iCloud entitlement. Skipping CloudKit enable.");
[self stopObservingActivity];
dispatch_resume(startStopQueue);
[self decrementUserActions];
return;
}

CKContainer *statusContainer = nil;
@try {
statusContainer = [CKContainer containerWithIdentifier:databaseContainerIdentifier];
}
@catch (NSException *exception) {
DLog(@"Unable to create CloudKit container for account check: %@", exception);
dispatch_resume(startStopQueue);
[self decrementUserActions];
return;
}
if ( nil == statusContainer ) {
DLog(@"Unable to create CloudKit container for account check.");
dispatch_resume(startStopQueue);
[self decrementUserActions];
return;
}

[statusContainer accountStatusWithCompletionHandler:^(CKAccountStatus accountStatus, NSError *error) {
switch ( accountStatus ) {
case CKAccountStatusAvailable: // is iCloud enabled
DLog(@"iCloud Available");
Expand Down Expand Up @@ -1096,11 +1166,27 @@ - (void)startObservingActivity {
observingActivity = YES;

// Setup database connections.
CKContainer *container = [CKContainer containerWithIdentifier:databaseContainerIdentifier];
int environmentValue = ((NSNumber *)[[container valueForKey:@"containerID"] valueForKey:@"environment"]).intValue;
productionMode = (1 == environmentValue);
publicDB = [container publicCloudDatabase];
privateDB = [container privateCloudDatabase];
@try {
CKContainer *container = [CKContainer containerWithIdentifier:databaseContainerIdentifier];
if ( nil == container ) {
DLog(@"Unable to create CloudKit container.");
observingActivity = NO;
dispatch_resume(startStopQueue);
[self decrementUserActions];
return;
}
int environmentValue = ((NSNumber *)[[container valueForKey:@"containerID"] valueForKey:@"environment"]).intValue;
productionMode = (1 == environmentValue);
publicDB = [container publicCloudDatabase];
privateDB = [container privateCloudDatabase];
}
@catch (NSException *exception) {
DLog(@"CloudKit unavailable: %@", exception);
observingActivity = NO;
dispatch_resume(startStopQueue);
[self decrementUserActions];
return;
}

// Create a record zone ID.
[recordZoneID release];
Expand Down Expand Up @@ -1488,4 +1574,3 @@ - (void)dealloc {
DLog(@"Deallocated");
}
@end