21c0565619
[ADDED] Importing mpsites exports.
[RENAMED] keyHashHex -> keyID.
[RENAMED] Calculated -> Generated.
[FIXED] iOS: Dismiss mail VC when done with it.
[FIXED] iOS: Properly hide content tip icons when a content tip is
shown while one with an icon is still active.
[FIXED] iOS: Settings bundle was using old keys.
147 lines
5.2 KiB
Objective-C
147 lines
5.2 KiB
Objective-C
//
|
|
// MPAppDelegate.m
|
|
// MasterPassword
|
|
//
|
|
// Created by Maarten Billemont on 24/11/11.
|
|
// Copyright (c) 2011 Lyndir. All rights reserved.
|
|
//
|
|
|
|
#import "MPConfig.h"
|
|
#import "MPAppDelegate_Shared.h"
|
|
#import "MPElementEntity.h"
|
|
|
|
@implementation MPAppDelegate (Key)
|
|
|
|
static NSDictionary *keyQuery() {
|
|
|
|
static NSDictionary *MPKeyQuery = nil;
|
|
if (!MPKeyQuery)
|
|
MPKeyQuery = [PearlKeyChain createQueryForClass:kSecClassGenericPassword
|
|
attributes:[NSDictionary dictionaryWithObject:@"Saved Master Password"
|
|
forKey:(__bridge id)kSecAttrService]
|
|
matches:nil];
|
|
|
|
return MPKeyQuery;
|
|
}
|
|
|
|
static NSDictionary *keyHashQuery() {
|
|
|
|
static NSDictionary *MPKeyHashQuery = nil;
|
|
if (!MPKeyHashQuery)
|
|
MPKeyHashQuery = [PearlKeyChain createQueryForClass:kSecClassGenericPassword
|
|
attributes:[NSDictionary dictionaryWithObject:@"Master Password Verification"
|
|
forKey:(__bridge id)kSecAttrService]
|
|
matches:nil];
|
|
|
|
return MPKeyHashQuery;
|
|
}
|
|
|
|
- (void)forgetKey {
|
|
|
|
dbg(@"Deleting key and hash from key chain.");
|
|
[PearlKeyChain deleteItemForQuery:keyQuery()];
|
|
[PearlKeyChain deleteItemForQuery:keyHashQuery()];
|
|
|
|
[[NSNotificationCenter defaultCenter] postNotificationName:MPNotificationKeyForgotten object:self];
|
|
#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
|
|
[TestFlight passCheckpoint:MPTestFlightCheckpointMPForgotten];
|
|
#endif
|
|
}
|
|
|
|
- (IBAction)signOut:(id)sender {
|
|
|
|
[self updateKey:nil];
|
|
}
|
|
|
|
- (void)loadStoredKey {
|
|
|
|
if ([[MPConfig get].saveKey boolValue]) {
|
|
// Key is stored in keychain. Load it.
|
|
dbg(@"Loading key from key chain.");
|
|
[self updateKey:[PearlKeyChain dataOfItemForQuery:keyQuery()]];
|
|
dbg(@" -> Key %@.", self.key? @"found": @"NOT found");
|
|
} else {
|
|
// Key should not be stored in keychain. Delete it.
|
|
if ([PearlKeyChain deleteItemForQuery:keyQuery()] != errSecItemNotFound)
|
|
dbg(@"Deleted key from key chain.");
|
|
#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
|
|
[TestFlight passCheckpoint:MPTestFlightCheckpointMPUnstored];
|
|
#endif
|
|
}
|
|
}
|
|
|
|
- (BOOL)tryMasterPassword:(NSString *)tryPassword {
|
|
|
|
NSData *keyHash = [PearlKeyChain dataOfItemForQuery:keyHashQuery()];
|
|
dbg(@"Key hash %@.", keyHash? @"known": @"NOT known");
|
|
|
|
if (![tryPassword length])
|
|
return NO;
|
|
|
|
NSData *tryKey = keyForPassword(tryPassword);
|
|
NSData *tryKeyHash = keyHashForKey(tryKey);
|
|
if (keyHash)
|
|
// A key hash is known -> a key is set.
|
|
// Make sure the user's entered key matches it.
|
|
if (![keyHash isEqual:tryKeyHash]) {
|
|
dbg(@"Key phrase hash mismatch. Expected: %@, answer: %@.", keyHash, tryKeyHash);
|
|
|
|
#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
|
|
[TestFlight passCheckpoint:MPTestFlightCheckpointMPMismatch];
|
|
#endif
|
|
return NO;
|
|
}
|
|
|
|
#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
|
|
[TestFlight passCheckpoint:MPTestFlightCheckpointMPAsked];
|
|
#endif
|
|
|
|
[self updateKey:tryKey];
|
|
return YES;
|
|
}
|
|
|
|
- (void)updateKey:(NSData *)key {
|
|
|
|
self.key = key;
|
|
|
|
if (key)
|
|
[[NSNotificationCenter defaultCenter] postNotificationName:MPNotificationKeySet object:self];
|
|
else
|
|
[[NSNotificationCenter defaultCenter] postNotificationName:MPNotificationKeyUnset object:self];
|
|
|
|
if (key) {
|
|
self.keyHash = keyHashForKey(key);
|
|
self.keyID = [self.keyHash encodeHex];
|
|
|
|
dbg(@"Updating key ID to: %@.", self.keyID);
|
|
[PearlKeyChain addOrUpdateItemForQuery:keyHashQuery()
|
|
withAttributes:[NSDictionary dictionaryWithObjectsAndKeys:
|
|
self.keyHash, (__bridge id)kSecValueData,
|
|
#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
|
|
kSecAttrAccessibleWhenUnlocked, (__bridge id)kSecAttrAccessible,
|
|
#endif
|
|
nil]];
|
|
if ([[MPConfig get].saveKey boolValue]) {
|
|
dbg(@"Storing key in key chain.");
|
|
[PearlKeyChain addOrUpdateItemForQuery:keyQuery()
|
|
withAttributes:[NSDictionary dictionaryWithObjectsAndKeys:
|
|
key, (__bridge id)kSecValueData,
|
|
#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
|
|
kSecAttrAccessibleWhenUnlocked, (__bridge id)kSecAttrAccessible,
|
|
#endif
|
|
nil]];
|
|
}
|
|
|
|
#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
|
|
[TestFlight passCheckpoint:[NSString stringWithFormat:MPTestFlightCheckpointSetKeyphraseLength, key.length]];
|
|
#endif
|
|
}
|
|
}
|
|
|
|
- (NSData *)keyWithLength:(NSUInteger)keyLength {
|
|
|
|
return [self.key subdataWithRange:NSMakeRange(0, MIN(keyLength, self.key.length))];
|
|
}
|
|
|
|
@end
|