dnrops
/
MacPass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feature(TouchId): use new key storage dictionary instead of a lot of file based default keys

This commit is contained in:
Michael Starke 2023-02-23 23:07:12 +01:00
parent 78f2de9393
commit c123120882
2 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MacPass/MPDocument+BiometricEncryptionSupport.m
View File

@ -16,10 +16,6 @@
@dynamic biometricKey; @dynamic biometricKey;
- (NSString *)biometricKey { - (NSString *)biometricKey {
if(nil == self.fileURL || nil == self.fileURL.lastPathComponent) {
return nil;
}
return [self.fileURL.lastPathComponent sha1HexDigest]; return [self.fileURL.lastPathComponent sha1HexDigest];
} }

36
MacPass/MPTouchIdCompositeKeyStore.m
View File

@ -44,7 +44,7 @@
switch(touchIdEnabledState) { switch(touchIdEnabledState) {
case MPTouchIDKeyStorageTransient: case MPTouchIDKeyStorageTransient:
// clear persistent store // clear persistent store
[NSUserDefaults.standardUserDefaults removeObjectForKey:kMPSettingsKeyTouchIdEncryptedKeyStore]; [self _clearPersistenCompositeKeyData];
break; break;
case MPTouchIDKeyStoragePersistent: case MPTouchIDKeyStoragePersistent:
// clear transient store // clear transient store
@ -52,9 +52,10 @@
break; break;
default: default:
// clear persitent and transient store // clear persitent and transient store
[NSUserDefaults.standardUserDefaults removeObjectForKey:kMPSettingsKeyTouchIdEncryptedKeyStore]; [self _clearPersistenCompositeKeyData];
[self.keys removeAllObjects]; [self.keys removeAllObjects];
} }
_touchIdEnabledState = touchIdEnabledState;
} }
- (void)saveCompositeKey:(KPKCompositeKey *)compositeKey forDocumentKey:(NSString *)documentKey { - (void)saveCompositeKey:(KPKCompositeKey *)compositeKey forDocumentKey:(NSString *)documentKey {
@ -65,10 +66,9 @@
return; return;
} }
/* FIXME this behavour is wrong. Old keys do not get cleared so this leaves a lot of data behind that should be cleaned up*/
switch(self.touchIdEnabledState) { switch(self.touchIdEnabledState) {
case MPTouchIDKeyStorageTransient: case MPTouchIDKeyStorageTransient:
[NSUserDefaults.standardUserDefaults removeObjectForKey:documentKey]; [self _clearPersistenCompositeKeyData];
if(nil != encryptedCompositeKey) { if(nil != encryptedCompositeKey) {
self.keys[documentKey] = encryptedCompositeKey; self.keys[documentKey] = encryptedCompositeKey;
} }
@ -76,11 +76,11 @@
case MPTouchIDKeyStoragePersistent: case MPTouchIDKeyStoragePersistent:
self.keys[documentKey] = nil; self.keys[documentKey] = nil;
if(nil != encryptedCompositeKey) { if(nil != encryptedCompositeKey) {
[NSUserDefaults.standardUserDefaults setObject:encryptedCompositeKey forKey:documentKey]; [self _persistCompositeKeyData:encryptedCompositeKey forDocumentKey:documentKey];
} }
break; break;
case MPTouchIDKeyStorageDisabled: case MPTouchIDKeyStorageDisabled:
[NSUserDefaults.standardUserDefaults removeObjectForKey:documentKey]; [self _clearPersistenCompositeKeyData];
self.keys[documentKey] = nil; self.keys[documentKey] = nil;
break; break;
default: default:
@ -91,7 +91,7 @@
- (NSData *)loadEncryptedCompositeKeyForDocumentKey:(NSString *)documentKey { - (NSData *)loadEncryptedCompositeKeyForDocumentKey:(NSString *)documentKey {
NSInteger touchIdMode = [NSUserDefaults.standardUserDefaults integerForKey:kMPSettingsKeyTouchIdEnabled]; NSInteger touchIdMode = [NSUserDefaults.standardUserDefaults integerForKey:kMPSettingsKeyTouchIdEnabled];
NSData* transientKey = self.keys[documentKey]; NSData* transientKey = self.keys[documentKey];
NSData* persistentKey = [NSUserDefaults.standardUserDefaults dataForKey:documentKey]; NSData* persistentKey = [self _persitentCompositeKeyDataForDocumentKey:documentKey];
if(nil == transientKey && nil == persistentKey) { if(nil == transientKey && nil == persistentKey) {
return nil; return nil;
} }
@ -247,5 +247,27 @@
} }
} }
- (NSData *)_persitentCompositeKeyDataForDocumentKey:(NSString *)key {
if(key.length == 0) {
return nil;
}
return [NSUserDefaults.standardUserDefaults objectForKey:kMPSettingsKeyTouchIdEncryptedKeyStore][key];
}
- (void)_persistCompositeKeyData:(NSData *)data forDocumentKey:(NSString *)key {
if(data.length == 0 || key.length == 0) {
return;
}
NSMutableDictionary *dict = [[NSUserDefaults.standardUserDefaults objectForKey:kMPSettingsKeyTouchIdEncryptedKeyStore] mutableCopy];
if(nil == dict) {
dict = [[NSMutableDictionary alloc] init];
}
dict[key] = data;
[NSUserDefaults.standardUserDefaults setObject:[dict copy] forKey:kMPSettingsKeyTouchIdEncryptedKeyStore];
}
- (void)_clearPersistenCompositeKeyData {
[NSUserDefaults.standardUserDefaults removeObjectForKey:kMPSettingsKeyTouchIdEncryptedKeyStore];
}
@end @end