amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-19 21:53:19 +00:00
Code Issues Projects Releases Wiki Activity

Improve validation of mail account delegators

Browse Source
This commit is contained in:
Francis Lachapelle
2016-10-26 15:42:50 -04:00
parent 65a653ac0c
commit b44bf86164
3 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoUser.m
+33 -7
View File
@@ -634,8 +634,9 @@
NSUInteger index;
[self userDefaults];
[self userSettings];
mailSettings = [[self userSettings] objectForKey: @"Mail"];
mailSettings = [_settings objectForKey: @"Mail"];
mailAccount = [NSMutableDictionary new];
// 1. login
@@ -800,18 +801,43 @@
delegators = [mailSettings objectForKey: @"DelegateFrom"];
if (delegators)
{
NSDictionary *delegatorAccount;
SOGoUser *delegator;
BOOL dirty;
NSDictionary *delegatorAccount, *delegatorSettings;
NSMutableArray *validDelegators;
NSString *delegatorLogin;
SOGoUser *delegatorUser;
dirty = NO;
validDelegators = [NSMutableArray array];
max = [delegators count];
for (count = 0; count < max; count++)
{
delegator = [SOGoUser userWithLogin: [delegators objectAtIndex: count]];
if (delegator)
// 1. Verify if delegator is valid
delegatorLogin = [delegators objectAtIndex: count];
delegatorUser = [SOGoUser userWithLogin: delegatorLogin];
if (delegatorUser)
{
delegatorAccount = [[delegator mailAccountsWithDelegatedIdentities: NO] objectAtIndex: 0];
[identities addObjectsFromArray: [delegatorAccount objectForKey: @"identities"]];
// 2. Verify if delegator still delegates to user
delegatorSettings = [[delegatorUser userSettings] objectForKey: @"Mail"];
delegates = [delegatorSettings objectForKey: @"DelegateTo"];
if ([delegates containsObject: [self login]])
{
[validDelegators addObject: delegatorLogin];
delegatorAccount = [[delegatorUser mailAccountsWithDelegatedIdentities: NO] objectAtIndex: 0];
[identities addObjectsFromArray: [delegatorAccount objectForKey: @"identities"]];
}
else
dirty = YES;
}
else
dirty = YES;
}
if (dirty)
{
[mailSettings setObject: validDelegators
forKey: @"DelegateFrom"];
[_settings synchronize];
}
}
}