nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-22 15:19:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enables TouchID unlock for multiple Database files.

Browse Source 
This changeset adds the optional fileURL parameter to the
requestPasswordWithMessage function in MPPasswordInputController.
The controller uses this URL as a key to store the encrypted
masterpassword in a dictionary.

In my opinion edge cases like when a file is moved or replaced
do not have to get special handling since the worst case scenario
is that TouchID unlock does not work and users have still the
option to unlock with the masterpassword.

Also this changeset removes the unused
requestPasswordWithCompletionHandler function
This commit is contained in:
Julius Zint
2020-08-16 12:19:48 +02:00
parent 94956a673b
commit 5157ec823f
4 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MacPass/MPDocument.m
View File

@@ -440,7 +440,7 @@ NSString *const MPDocumentGroupKey = @"MPDocumentGrou
}
// just return yes regardless since we will display the sheet again if needed!
return YES;
}];
} forFile:nil];
sheet.contentViewController = passwordInputController;
[self.windowForSheet beginSheet:sheet completionHandler:^(NSModalResponse returnCode) { /* nothing to do, rest is done in other handler! */ }];
}

6
MacPass/MPDocumentWindowController.m
View File

@@ -325,13 +325,17 @@ typedef void (^MPPasswordChangedBlock)(BOOL didChangePassword);
self.passwordInputController = [[MPPasswordInputController alloc] init];
}
self.contentViewController = self.passwordInputController;
NSURL* fileURL = nil;
if(self.document != nil) {
fileURL = [self.document fileURL];
}
[self.passwordInputController requestPasswordWithMessage:message cancelLabel:nil completionHandler:^BOOL(NSString *password, NSURL *keyURL, BOOL didCancel, NSError *__autoreleasing *error) {
if(didCancel) {
return NO;
}
return [((MPDocument *)self.document) unlockWithPassword:password keyFileURL:keyURL error:error];
}];
} forFile:fileURL];
}
- (void)editPassword:(id)sender {

3
MacPass/MPPasswordInputController.h
View File

@@ -28,8 +28,7 @@
typedef BOOL (^passwordInputCompletionBlock)(NSString *password, NSURL *keyURL, BOOL didCancel, NSError *__autoreleasing*error);
- (void)requestPasswordWithCompletionHandler:(passwordInputCompletionBlock)completionHandler;
- (void)requestPasswordWithMessage:(NSString *)message cancelLabel:(NSString *)cancelLabel completionHandler:(passwordInputCompletionBlock)completionHandler;
- (void)requestPasswordWithMessage:(NSString *)message cancelLabel:(NSString *)cancelLabel completionHandler:(passwordInputCompletionBlock)completionHandler forFile:(NSURL*) fileURL;
@end

17
MacPass/MPPasswordInputController.m
View File

@@ -50,6 +50,7 @@ static NSMutableDictionary* touchIDSecuredPasswords;
@property (copy) NSString *message;
@property (copy) NSString *cancelLabel;
@property (copy) NSString *absoluteURLString;
@property (assign) BOOL showPassword;
@property (nonatomic, assign) BOOL enablePassword;
@@ -94,15 +95,21 @@ static NSMutableDictionary* touchIDSecuredPasswords;
return self.passwordTextField;
}
- (void)requestPasswordWithMessage:(NSString *)message cancelLabel:(NSString *)cancelLabel completionHandler:(passwordInputCompletionBlock)completionHandler {
- (void)requestPasswordWithMessage:(NSString *)message cancelLabel:(NSString *)cancelLabel completionHandler:(passwordInputCompletionBlock)completionHandler forFile:(NSURL*) fileURL{
self.completionHandler = completionHandler;
self.message = message;
self.cancelLabel = cancelLabel;
if(fileURL) {
self.absoluteURLString = [fileURL absoluteString];
}
else {
self.absoluteURLString = nil;
}
[self _reset];
}
- (void)requestPasswordWithCompletionHandler:(passwordInputCompletionBlock)completionHandler {
[self requestPasswordWithMessage:nil cancelLabel:nil completionHandler:completionHandler];
[self requestPasswordWithMessage:nil cancelLabel:nil completionHandler:completionHandler forFile:nil];
}
#pragma mark Properties
@@ -136,7 +143,7 @@ static NSMutableDictionary* touchIDSecuredPasswords;
BOOL result = self.completionHandler(password, self.keyPathControl.URL, cancel, &error);
if(cancel || result) {
if(result && self.keyPathControl.URL == nil) {
[self _storePasswordForTouchIDUnlock:password forDatabase:@"DatabaseID"];
[self _storePasswordForTouchIDUnlock:password forDatabase:self.absoluteURLString];
}
return;
}
@@ -306,7 +313,7 @@ static NSMutableDictionary* touchIDSecuredPasswords;
self.enablePassword = YES;
self.passwordTextField.stringValue = @"";
self.messageInfoTextField.hidden = (nil == self.message);
self.touchIdButton.hidden = [touchIDSecuredPasswords valueForKey:@"DatabaseID"] == nil;
self.touchIdButton.hidden = [touchIDSecuredPasswords valueForKey:self.absoluteURLString] == nil;
if(self.message) {
self.messageInfoTextField.stringValue = self.message;
@@ -392,7 +399,7 @@ static NSMutableDictionary* touchIDSecuredPasswords;
}
- (IBAction)unlockWithTouchID:(id)sender {
NSString* password = [self _loadPasswordForTochIDUnlock:@"DatabaseID"];
NSString* password = [self _loadPasswordForTochIDUnlock:self.absoluteURLString];
if(password != nil) {
NSError* error;
self.completionHandler(password, nil, false, &error);