oxen-io/session-ios
1
0
Fork 0
mirror of https://github.com/oxen-io/session-ios.git synced 2023-12-13 21:30:14 +01:00
Code Issues Projects Releases Wiki Activity

Add test app context; use mock "document" and "shared data container" directories in tests, use mock keychain storage in tests.

Browse source
This commit is contained in:
Matthew Chen 2018-08-31 13:06:24 -04:00
parent 399dd13cee
commit 535241ef9e
1 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
SignalServiceKit/src/Storage/OWSStorage.m
View file

@ -13,7 +13,7 @@
#import "OWSStorage+Subclass.h"
#import "TSAttachmentStream.h"
#import <Curve25519Kit/Randomness.h>
#import <SAMKeychain/SAMKeychain.h>
#import <SignalServiceKit/SignalServiceKit-Swift.h>
#import <YapDatabase/YapDatabase.h>
#import <YapDatabase/YapDatabaseAutoView.h>
#import <YapDatabase/YapDatabaseCrossProcessNotification.h>
@ -750,7 +750,13 @@ NSString *const kNSUserDefaults_DatabaseExtensionVersionMap = @"kNSUserDefaults_
{
OWSLogInfo(@"removing legacy passphrase");
[SAMKeychain deletePasswordForService:keychainService account:keychainDBLegacyPassphrase];
NSError *_Nullable error;
BOOL result = [CurrentAppContext().keychainStorage removeWithKey:keychainDBLegacyPassphrase
service:keychainService
error:&error];
if (error || !result) {
OWSFailDebug(@"could not remove legacy passphrase.");
}
}
- (void)ensureDatabaseKeySpecExists
@ -837,8 +843,19 @@ NSString *const kNSUserDefaults_DatabaseExtensionVersionMap = @"kNSUserDefaults_
+ (void)deleteDBKeys
{
[SAMKeychain deletePasswordForService:keychainService account:keychainDBLegacyPassphrase];
[SAMKeychain deletePasswordForService:keychainService account:keychainDBCipherKeySpec];
NSError *_Nullable error;
BOOL result = [CurrentAppContext().keychainStorage removeWithKey:keychainDBLegacyPassphrase
service:keychainService
error:&error];
if (error || !result) {
OWSFailDebug(@"could not remove legacy passphrase.");
}
result = [CurrentAppContext().keychainStorage removeWithKey:keychainDBCipherKeySpec
service:keychainService
error:&error];
if (error || !result) {
OWSFailDebug(@"could not remove cipher key spec.");
}
}
- (unsigned long long)databaseFileSize
@ -861,7 +878,12 @@ NSString *const kNSUserDefaults_DatabaseExtensionVersionMap = @"kNSUserDefaults_
OWSAssertDebug(keychainKey.length > 0);
OWSAssertDebug(errorHandle);
return [SAMKeychain passwordDataForService:keychainService account:keychainKey error:errorHandle];
NSData *_Nullable data =
[CurrentAppContext().keychainStorage dataForKey:keychainKey service:keychainService error:errorHandle];
if (*errorHandle || !data) {
OWSLogWarn(@"could not load keychain value.");
}
return data;
}
+ (void)storeKeyChainValue:(NSData *)data keychainKey:(NSString *)keychainKey
@ -870,8 +892,8 @@ NSString *const kNSUserDefaults_DatabaseExtensionVersionMap = @"kNSUserDefaults_
OWSAssertDebug(data.length > 0);
NSError *error;
[SAMKeychain setAccessibilityType:kSecAttrAccessibleAfterFirstUnlockThisDeviceOnly];
BOOL success = [SAMKeychain setPasswordData:data forService:keychainService account:keychainKey error:&error];
BOOL success =
[CurrentAppContext().keychainStorage setWithData:data forKey:keychainKey service:keychainService error:&error];
if (!success || error) {
OWSFailDebug(@"Could not store database metadata");
OWSProdCritical([OWSAnalyticsEvents storageErrorCouldNotStoreKeychainValue]);