amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-22 20:05:25 +00:00
Code Issues Projects Releases Wiki Activity

feat(preferences): show special characters when changing password

Browse Source
This commit is contained in:
Hivert Quentin
2023-05-17 18:12:21 +02:00
parent 9ab59e7420
commit 6050c4ee61
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoPasswordPolicy.m
+22 -8
View File
@@ -33,6 +33,8 @@ static const NSString *POLICY_MIN_DIGIT = @"POLICY_MIN_DIGIT";
static const NSString *POLICY_MIN_SPECIAL_SYMBOLS = @"POLICY_MIN_SPECIAL_SYMBOLS"; static const NSString *POLICY_MIN_SPECIAL_SYMBOLS = @"POLICY_MIN_SPECIAL_SYMBOLS";
static const NSString *POLICY_MIN_LENGTH = @"POLICY_MIN_LENGTH"; static const NSString *POLICY_MIN_LENGTH = @"POLICY_MIN_LENGTH";
static const NSString *SPECIAL_SYMBOL_ALLOWED = @"%$&*(){}!?\\@#.,:;+=";
@implementation SOGoPasswordPolicy @implementation SOGoPasswordPolicy
- (id) init - (id) init
@@ -58,7 +60,7 @@ static const NSString *POLICY_MIN_LENGTH = @"POLICY_MIN_LENGTH";
return [NSArray arrayWithObjects: [NSString stringWithFormat:@"(.*[a-z].*){%i}", [count intValue]], return [NSArray arrayWithObjects: [NSString stringWithFormat:@"(.*[a-z].*){%i}", [count intValue]],
[NSString stringWithFormat:@"(.*[A-Z].*){%i}", [count intValue]], [NSString stringWithFormat:@"(.*[A-Z].*){%i}", [count intValue]],
[NSString stringWithFormat:@"(.*[0-9].*){%i}", [count intValue]], [NSString stringWithFormat:@"(.*[0-9].*){%i}", [count intValue]],
[NSString stringWithFormat:@"([%%$&*(){}!?\\@#.,:;+=].*){%i,}", [count intValue]], [NSString stringWithFormat:@"([%%%@].*){%i,}", SPECIAL_SYMBOL_ALLOWED, [count intValue]],
[NSString stringWithFormat:@".{%i,}", [count intValue]], [NSString stringWithFormat:@".{%i,}", [count intValue]],
nil]; nil];
} }
@@ -97,13 +99,25 @@ static const NSString *POLICY_MIN_LENGTH = @"POLICY_MIN_LENGTH";
if ([[self policies] containsObject: label]) { if ([[self policies] containsObject: label]) {
NSNumber *value = [policy objectForKey:@"value"]; NSNumber *value = [policy objectForKey:@"value"];
if (0 < value) { if (0 < value) {
NSString *newLabel = [[translations objectForKey: label] if (![POLICY_MIN_SPECIAL_SYMBOLS isEqualToString: label]) {
stringByReplacingOccurrencesOfString: @"%{0}" NSString *newLabel = [[translations objectForKey: label]
withString: [value stringValue]]; stringByReplacingOccurrencesOfString: @"%{0}"
[userTranslatedPasswordPolicy addObject:[NSDictionary dictionaryWithObjectsAndKeys: withString: [value stringValue]];
newLabel, @"label", [userTranslatedPasswordPolicy addObject:[NSDictionary dictionaryWithObjectsAndKeys:
[policy objectForKey:@"regex"], @"regex", newLabel, @"label",
nil]]; [policy objectForKey:@"regex"], @"regex",
nil]];
} else {
NSString *newLabel = [[[[translations objectForKey: label]
stringByReplacingOccurrencesOfString: @"%{0}"
withString: [value stringValue]]
stringByAppendingString: @" "]
stringByAppendingString: SPECIAL_SYMBOL_ALLOWED];
[userTranslatedPasswordPolicy addObject:[NSDictionary dictionaryWithObjectsAndKeys:
newLabel, @"label",
[policy objectForKey:@"regex"], @"regex",
nil]];
}
} else { } else {
// Do nothing // Do nothing
} }