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

Merging standard and custom characters sets

Browse Source
This commit is contained in:
Mario Sangiorgio
2015-08-08 01:01:21 +01:00
parent e4332530eb
commit a1297b1409
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
MacPass/NSString+MPPasswordCreation.m
View File

@@ -32,6 +32,20 @@ static NSString *allowedCharactersString(MPPasswordCharacterFlags flags) {
return characterString; return characterString;
} }
static NSString *mergeWithoutDuplicates(NSString* baseCharacters, NSString* customCharacters){
NSInteger maxLength =[baseCharacters length] + [customCharacters length];
NSMutableString* mergedCharacters = [NSMutableString stringWithCapacity: maxLength];
[mergedCharacters appendString:baseCharacters];
[customCharacters enumerateSubstringsInRange: NSMakeRange(0, [customCharacters length])
options: NSStringEnumerationByComposedCharacterSequences
usingBlock: ^(NSString *inSubstring, NSRange inSubstringRange, NSRange inEnclosingRange, BOOL *outStop) {
if(![mergedCharacters containsString:inSubstring]){
[mergedCharacters appendString:inSubstring];
}
}];
return [NSString stringWithString:mergedCharacters];
}
@implementation NSString (MPPasswordCreation) @implementation NSString (MPPasswordCreation)
+ (NSString *)passwordFromString:(NSString *)source length:(NSUInteger)length { + (NSString *)passwordFromString:(NSString *)source length:(NSUInteger)length {
@@ -46,7 +60,9 @@ static NSString *allowedCharactersString(MPPasswordCharacterFlags flags) {
withCustomCharacters:(NSString*)customCharacters withCustomCharacters:(NSString*)customCharacters
length:(NSUInteger)length { length:(NSUInteger)length {
NSMutableString *password = [NSMutableString stringWithCapacity:length]; NSMutableString *password = [NSMutableString stringWithCapacity:length];
NSString *characters = allowedCharactersString(allowedCharacters); NSString *characters = mergeWithoutDuplicates(
allowedCharactersString(allowedCharacters),
customCharacters);
while([password length] < length) { while([password length] < length) {
NSString *randomCharacter = [characters randomCharacter]; NSString *randomCharacter = [characters randomCharacter];
if([randomCharacter length] > 0) { if([randomCharacter length] > 0) {