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

extracted MPModifiedKey, fixed autotype obfuscation to correctly use modifiers

Browse Source
This commit is contained in:
michael starke
2017-01-26 12:34:12 +01:00
parent 1bf75fd0b1
commit fef22bce05
9 changed files with 89 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
MacPass/MPAutotypeCommand.m
View File

@@ -261,10 +261,9 @@ typedef struct {
* http://keepass.info/help/v2/autotype_obfuscation.html
*/
NSString *paste = @"";
NSMutableString *paste = [@"" mutableCopy];
NSMutableArray *typeKeys = [[NSMutableArray alloc] init];
NSMutableArray *modifiers = [[NSMutableArray alloc] init];
NSMutableArray<NSValue *> *typeKeys = [[NSMutableArray alloc] init];
/*
* seed the random number generator using the first 4 bytes of the string's SHA1
@@ -279,29 +278,21 @@ typedef struct {
for (NSUInteger i = 0; i < pasteContent.length; i++) {
NSUInteger part = random() % 2;
unichar key = [pasteContent characterAtIndex:i];
MPModifiedKey mKey = [MPKeyMapper modifiedKeyForCharacter:[NSString stringWithFormat:@"%c", key]];
NSString *key = [pasteContent substringWithRange:NSMakeRange(i, 1)];
MPModifiedKey mKey = [MPKeyMapper modifiedKeyForCharacter:key];
/* append unknown keycodes to the paste since we can't type them */
if (part == 0 || mKey.keyCode == kMPUnknownKeyCode) {
paste = [paste stringByAppendingFormat:@"%c", key];
[typeKeys addObject:@(kVK_RightArrow)];
[modifiers addObject:@0];
[paste appendString:key];
[typeKeys addObject:[NSValue valueWithModifiedKey:MPMakeModifiedKey(0, kVK_RightArrow)]];
}
else {
[typeKeys addObject:@(mKey.keyCode)];
if ([[NSCharacterSet uppercaseLetterCharacterSet] characterIsMember:key])
[modifiers addObject:@(kCGEventFlagMaskShift)];
else
[modifiers addObject:@0];
[typeKeys addObject:[NSValue valueWithModifiedKey:mKey ]];
}
}
/* move to the end of the content */
for (NSUInteger i = typeKeys.count; i < pasteContent.length; i++) {
[typeKeys addObject:@(kVK_RightArrow)];
[modifiers addObject:@0];
[typeKeys addObject:[NSValue valueWithModifiedKey:MPMakeModifiedKey(0, kVK_RightArrow)]];
}
/* add paste command */
@@ -315,7 +306,7 @@ typedef struct {
}
for (NSUInteger i = 0; i < typeKeys.count; i++) {
[commands addObject:[[MPAutotypeKeyPress alloc] initWithModifierMask:[modifiers[i] longLongValue] keyCode:[typeKeys[i] unsignedShortValue]]];
[commands addObject:[[MPAutotypeKeyPress alloc] initWithModifiedKey:typeKeys[i].modifiedKeyValue]];
}
}
}
@@ -412,6 +403,10 @@ typedef struct {
return YES;
}
- (void)sendPressKey:(MPModifiedKey)key {
[self sendPressKey:key.keyCode modifierFlags:key.modifier];
}
- (void)sendPressKey:(CGKeyCode)keyCode modifierFlags:(CGEventFlags)flags {
CGEventSourceRef eventSource = CGEventSourceCreate(kCGEventSourceStatePrivate);