skylab/MasterPassword
2
0
Fork 0
Code Releases Activity

More fixes of temporary moc accesses.

Browse Source
This commit is contained in:
Maarten Billemont 2013-04-13 14:03:50 -04:00
parent abe874cda3
commit 5bf8842031
7 changed files with 78 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/inspectionProfiles/Project_Default.xml
View File

@ -3,6 +3,7 @@
<option name="myName" value="Project Default" />
<option name="myLocal" value="false" />
<inspection_tool class="FunctionImplicitDeclarationInspection" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="ImplicitIntegerAndEnumConversion" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="LossyEncoding" enabled="true" level="WARNING" enabled_by_default="true" />
<inspection_tool class="MethodIsLaterInTheScope" enabled="false" level="WARNING" enabled_by_default="false" />
<inspection_tool class="OCNotLocalizedStringInspection" enabled="false" level="WARNING" enabled_by_default="false" />

119
MasterPassword/ObjC/MPAppDelegate_Key.m
View File

@ -92,60 +92,7 @@ static NSDictionary *keyQuery(MPUserEntity *user) {
user.keyID = tryKey.keyID;
// Migrate existing elements.
MPKey *recoverKey = nil;
#ifdef PEARL_UIKIT
PearlAlert *activityAlert = [PearlAlert showActivityWithTitle:PearlString(@"Migrating %d sites...", [user.elements count])];
#endif
for (MPElementEntity *element in user.elements) {
if (element.type & MPElementTypeClassStored && ![element contentUsingKey:tryKey]) {
id content = nil;
if (recoverKey)
content = [element contentUsingKey:recoverKey];
while (!content) {
__block NSString *masterPassword = nil;
#ifdef PEARL_UIKIT
dispatch_group_t recoverPasswordGroup = dispatch_group_create();
dispatch_group_enter(recoverPasswordGroup);
[PearlAlert showAlertWithTitle:@"Enter Old Master Password"
message:PearlString(@"Your old master password is required to migrate the stored password for %@", element.name)
viewStyle:UIAlertViewStyleSecureTextInput
initAlert:nil
tappedButtonBlock:^(UIAlertView *alert_, NSInteger buttonIndex_) {
@try {
if (buttonIndex_ == [alert_ cancelButtonIndex])
// Don't Migrate
return;
masterPassword = [alert_ textFieldAtIndex:0].text;
}
@finally {
dispatch_group_leave(recoverPasswordGroup);
}
} cancelTitle:@"Don't Migrate" otherTitles:@"Migrate", nil];
dispatch_group_wait(recoverPasswordGroup, DISPATCH_TIME_FOREVER);
#endif
if (!masterPassword)
// Don't Migrate
break;
recoverKey = [element.algorithm keyForPassword:masterPassword ofUserNamed:user.name];
content = [element contentUsingKey:recoverKey];
}
if (!content)
// Don't Migrate
break;
[element setContent:content usingKey:tryKey];
}
}
[user saveContext];
#ifdef PEARL_UIKIT
[activityAlert cancelAlert];
#endif
[self migrateElementsForUser:user inContext:user.managedObjectContext toKey:tryKey];
}
}
@ -216,7 +163,7 @@ static NSDictionary *keyQuery(MPUserEntity *user) {
}
user.lastUsed = [NSDate date];
[user saveContext];
[user.managedObjectContext saveToStore];
self.activeUser = user;
[[NSNotificationCenter defaultCenter] postNotificationName:MPSignedInNotification object:self];
@ -230,4 +177,66 @@ static NSDictionary *keyQuery(MPUserEntity *user) {
return YES;
}
- (void)migrateElementsForUser:(MPUserEntity *)user inContext:(NSManagedObjectContext *)moc toKey:(MPKey *)newKey {
if (![user.elements count])
// Nothing to migrate.
return;
MPKey *recoverKey = newKey;
#ifdef PEARL_UIKIT
PearlAlert *activityAlert = [PearlAlert showActivityWithTitle:PearlString( @"Migrating %d sites...", [user.elements count] )];
#endif
for (MPElementEntity *element in user.elements) {
if (element.type & MPElementTypeClassStored) {
id content = nil;
while (!(content = [element contentUsingKey:recoverKey])) {
// Failed to decrypt element with the current recoveryKey. Ask user for a new one to use.
__block NSString *masterPassword = nil;
#ifdef PEARL_UIKIT
dispatch_group_t recoverPasswordGroup = dispatch_group_create();
dispatch_group_enter( recoverPasswordGroup );
[PearlAlert showAlertWithTitle:@"Enter Old Master Password"
message:PearlString( @"Your old master password is required to migrate the stored password for %@",
element.name )
viewStyle:UIAlertViewStyleSecureTextInput
initAlert:nil tappedButtonBlock:^(UIAlertView *alert_, NSInteger buttonIndex_) {
@try {
if (buttonIndex_ == [alert_ cancelButtonIndex])
// Don't Migrate
return;
masterPassword = [alert_ textFieldAtIndex:0].text;
}
@finally {
dispatch_group_leave( recoverPasswordGroup );
}
} cancelTitle:@"Don't Migrate" otherTitles:@"Migrate", nil];
dispatch_group_wait( recoverPasswordGroup, DISPATCH_TIME_FOREVER );
#endif
if (!masterPassword)
// Don't Migrate
break;
recoverKey = [element.algorithm keyForPassword:masterPassword ofUserNamed:user.name];
}
if (!content)
// Don't Migrate
break;
if (![recoverKey isEqualToKey:newKey])
[element setContent:content usingKey:newKey];
}
}
[moc saveToStore];
#ifdef PEARL_UIKIT
[activityAlert cancelAlert];
#endif
}
@end

12
MasterPassword/ObjC/MPEntities.m
View File

@ -15,7 +15,7 @@
NSError *error;
if (![self save:&error]) {
err(@"While saving: %@", NSStringFromClass([self class]), error);
err(@"While saving: %@", error);
return NO;
}
@ -194,13 +194,12 @@
- (id)contentUsingKey:(MPKey *)key {
if (!(self.type & MPElementTypeClassGenerated)) {
err(@"Corrupt element: %@, type: %d is not in MPElementTypeClassGenerated", self.name, self.type);
return nil;
}
assert(self.type & MPElementTypeClassGenerated);
if (![self.name length])
return nil;
if (!key)
return nil;
return [self.algorithm generateContentForElement:self usingKey:key];
}
@ -222,6 +221,9 @@
assert(self.type & MPElementTypeClassStored);
if (!key)
return nil;
NSData *encryptedContent;
if (self.type & MPElementFeatureDevicePrivate)
encryptedContent = [PearlKeyChain dataOfItemForQuery:[MPElementStoredEntity queryForDevicePrivateElementNamed:self.name]];

2
MasterPassword/ObjC/iOS/MPElementListController.m
View File

@ -44,7 +44,7 @@
element.type = type;
element.lastUsed = [NSDate date];
element.version = MPAlgorithmDefaultVersion;
[element saveContext];
[moc saveToStore];
NSManagedObjectID *elementOID = [element objectID];
dispatch_async(dispatch_get_main_queue(), ^{

2
MasterPassword/ObjC/iOS/MPMainViewController.m
View File

@ -138,7 +138,7 @@
self.outdatedAlertContainer.alpha = 1;
self.suppressOutdatedAlert = YES;
}];
[activeUser saveContext];
[activeUser.managedObjectContext saveToStore];
});
if (![[MPiOSConfig get].actionsTipShown boolValue])

6
MasterPassword/ObjC/iOS/MPPreferencesViewController.m
View File

@ -49,7 +49,7 @@
if (selected) {
MPUserEntity *activeUser = [MPAppDelegate get].activeUser;
activeUser.avatar = (unsigned)avatar.tag;
[activeUser saveContext];
[activeUser.managedObjectContext saveToStore];
}
} options:0];
avatar.selected = (a == [MPAppDelegate get].activeUser.avatar);
@ -134,7 +134,7 @@
MPUserEntity *activeUser = [MPAppDelegate get].activeUser;
activeUser.defaultType = type;
[activeUser saveContext];
[activeUser.managedObjectContext saveToStore];
self.defaultTypeLabel.text = [[MPAppDelegate get].key.algorithm shortNameOfType:activeUser.defaultType];
}
@ -153,7 +153,7 @@
[[MPAppDelegate get] storeSavedKeyFor:activeUser];
else
[[MPAppDelegate get] forgetSavedKeyFor:activeUser];
[activeUser saveContext];
[activeUser.managedObjectContext saveToStore];
}
- (IBAction)settings:(UIBarButtonItem *)sender {

2
MasterPassword/ObjC/iOS/MPUnlockViewController.m
View File

@ -809,7 +809,7 @@
if (buttonIndex == [sheet firstOtherButtonIndex])
[moc performBlock:^{
[[MPAppDelegate get] changeMasterPasswordFor:targetedUser didResetBlock:^{
[[MPAppDelegate get] changeMasterPasswordFor:targetedUser inContext:moc didResetBlock:^{
dispatch_async(dispatch_get_main_queue(), ^{
[[self avatarForUser:targetedUser] setSelected:YES];
});