mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-11-22 07:14:21 +00:00
feat(preferences): can set SOGoForwardConstraints to 3 to accept both internal and external domains from SOGoForwardConstraintsDomains
This commit is contained in:
1 parent
d1634054d6
commit
c872fb4d9c
6 files changed
+82
-8
No files matched your search
@@ -1532,6 +1532,44 @@ static NSArray *reminderValues = nil;
|
||||
return (forwardEnabled ? @"true" : @"false");
|
||||
}
|
||||
|
||||
- (BOOL) doForwardsMatchTheConstraints: (NSArray *) forwardMails
|
||||
{
|
||||
NSArray *allUserMails, *domainConstraints;
|
||||
NSMutableArray *allUserDomains;
|
||||
NSString *currentMail, *currentDomain, *userMail;
|
||||
SOGoDomainDefaults *dd;
|
||||
int constraint;
|
||||
|
||||
dd = [[context activeUser] domainDefaults];
|
||||
constraint = [dd forwardConstraints];
|
||||
|
||||
if(constraint > 0)
|
||||
{
|
||||
allUserMails = [[user allEmails] uniqueObjects];
|
||||
allUserDomains = [NSMutableArray array];
|
||||
for(userMail in allUserMails)
|
||||
{
|
||||
[allUserDomains push: [userMail mailDomain]];
|
||||
}
|
||||
for(currentMail in forwardMails)
|
||||
{
|
||||
currentDomain = [currentMail mailDomain];
|
||||
domainConstraints = [dd forwardConstraintsDomains];
|
||||
if (constraint == 1 && [allUserDomains indexOfObject: currentDomain] == NSNotFound)
|
||||
return NO;
|
||||
else if (constraint == 2 && [allUserDomains indexOfObject: currentDomain] != NSNotFound)
|
||||
return NO;
|
||||
else if (constraint == 2 && (!domainConstraints || [domainConstraints indexOfObject: currentDomain] == NSNotFound))
|
||||
return NO;
|
||||
else if (constraint == 3 &&
|
||||
[allUserDomains indexOfObject: currentDomain] == NSNotFound &&
|
||||
(!domainConstraints || [domainConstraints indexOfObject: currentDomain] == NSNotFound))
|
||||
return NO;
|
||||
}
|
||||
}
|
||||
return YES;
|
||||
}
|
||||
|
||||
/**
|
||||
* @api {post} /so/:username/Preferences/save Save user's defaults and settings
|
||||
* @apiVersion 1.0.0
|
||||
@@ -1561,8 +1599,8 @@ static NSArray *reminderValues = nil;
|
||||
if ((v = [o objectForKey: @"defaults"]))
|
||||
{
|
||||
NSMutableDictionary *sanitizedLabels;
|
||||
NSArray *allKeys, *accounts, *identities;
|
||||
NSDictionary *newLabels;
|
||||
NSArray *allKeys, *accounts, *identities, *forwardMails;
|
||||
NSDictionary *newLabels, *forwardPref;
|
||||
NSString *name;
|
||||
id loginModule;
|
||||
|
||||
@@ -1600,6 +1638,20 @@ static NSArray *reminderValues = nil;
|
||||
[v removeObjectForKey: @"SOGoAlternateAvatar"];
|
||||
[[[user userDefaults] source] removeObjectForKey: @"SOGoAlternateAvatar"];
|
||||
}
|
||||
|
||||
//We check if there are forward constraints
|
||||
forwardPref = [v objectForKey: @"Forward"];
|
||||
if(forwardPref && [forwardPref isKindOfClass: [NSDictionary class]]
|
||||
&& [forwardPref objectForKey: @"enabled"]
|
||||
&& [[forwardPref objectForKey: @"enabled"] boolValue])
|
||||
{
|
||||
BOOL doForward = NO;
|
||||
forwardMails = [forwardPref objectForKey: @"forwardAddress"];
|
||||
if (forwardMails && [forwardMails isKindOfClass: [NSArray class]] && [forwardMails count]>0)
|
||||
doForward = [self doForwardsMatchTheConstraints: [forwardPref objectForKey: @"forwardAddress"]];
|
||||
if(!doForward)
|
||||
[v removeObjectForKey: @"Forward"];
|
||||
}
|
||||
|
||||
if ([self userHasMailAccess])
|
||||
{
|
||||
@@ -1658,7 +1710,7 @@ static NSArray *reminderValues = nil;
|
||||
// - forceDefaultIdentity => SOGoMailForceDefaultIdentity
|
||||
// - receipts.receiptAction => SOGoMailReceiptAllow
|
||||
// - receipts.receiptNonRecipientAction => SOGoMailReceiptNonRecipientAction
|
||||
// - receipts.receiptOutsideDomainAction => SOGoMailReceiptOutsideDomainAction
|
||||
// - receipts.receiptOutsideDomaforwardAddressinAction => SOGoMailReceiptOutsideDomainAction
|
||||
// - receipts.receiptAnyAction => SOGoMailReceiptAnyAction
|
||||
// - security.alwaysSign => SOGoMailCertificateAlwaysSign
|
||||
// - security.alwaysEncrypt => SOGoMailCertificateAlwaysEncrypt
|
||||
|
||||
Reference in new issue
Block a user