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

feat(alarms): Add possibility to use SMTP master account for system alarms. Fixes #5565.

Browse Source
This commit is contained in:
smizrahi
2023-02-16 18:51:28 +01:00
parent 2c6f5225d4
commit 8001e3f6ab
14 changed files with 113 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoDomainDefaults.h
+4 -1
View File
@@ -60,7 +60,10 @@
- (NSString *) vacationFooterTemplateFile;
- (NSString *) mailingMechanism;
- (NSString *) smtpServer;
- (NSString *) smtpAuthenticationType;
- (BOOL)smtpMasterUserEnabled;
- (NSString *)smtpMasterUserUsername;
- (NSString *) smtpMasterUserPassword;
- (NSString *)smtpAuthenticationType;
- (NSString *) mailSpoolPath;
- (float) softQuotaRatio;
- (BOOL) mailKeepDraftsAfterSend;
SoObjects/SOGo/SOGoDomainDefaults.m
+15
View File
@@ -292,6 +292,21 @@
return server;
}
- (BOOL) smtpMasterUserEnabled
{
return [self boolForKey: @"SOGoSMTPMasterUserEnabled"];
}
- (NSString *) smtpMasterUserUsername
{
return [self stringForKey: @"SOGoSMTPMasterUserUsername"];
}
- (NSString *) smtpMasterUserPassword
{
return [self stringForKey: @"SOGoSMTPMasterUserPassword"];
}
- (NSString *) smtpAuthenticationType
{
return [[self stringForKey: @"SOGoSMTPAuthenticationType"] lowercaseString];
SoObjects/SOGo/SOGoMailer.h
+21 -15
View File
@@ -36,6 +36,9 @@
{
NSString *mailingMechanism;
NSString *smtpServer;
BOOL *smtpMasterUserEnabled;
NSString *smtpMasterUserUsername;
NSString *smtpMasterUserPassword;
NSString *authenticationType;
}
@@ -43,21 +46,24 @@
- (id) initWithDomainDefaults: (SOGoDomainDefaults *) dd;
- (BOOL) requiresAuthentication;
- (NSException *) sendMailData: (NSData *) data
toRecipients: (NSArray *) recipients
sender: (NSString *) sender
withAuthenticator: (id <SOGoAuthenticator>) authenticator
inContext: (WOContext *) woContext;
- (NSException *) sendMailAtPath: (NSString *) filename
toRecipients: (NSArray *) recipients
sender: (NSString *) sender
withAuthenticator: (id <SOGoAuthenticator>) authenticator
inContext: (WOContext *) woContext;
- (NSException *) sendMimePart: (id <NGMimePart>) part
toRecipients: (NSArray *) recipients
sender: (NSString *) sender
withAuthenticator: (id <SOGoAuthenticator>) authenticator
inContext: (WOContext *) woContext;
- (NSException *)sendMailData:(NSData *)data
toRecipients:(NSArray *)recipients
sender:(NSString *)sender
withAuthenticator:(id<SOGoAuthenticator>)authenticator
inContext:(WOContext *)woContext
systemMessage:(BOOL)isSystemMessage;
- (NSException *)sendMailAtPath:(NSString *)filename
toRecipients:(NSArray *)recipients
sender:(NSString *)sender
withAuthenticator:(id<SOGoAuthenticator>)authenticator
inContext:(WOContext *)woContext
systemMessage:(BOOL)isSystemMessage;
- (NSException *)sendMimePart:(id<NGMimePart>)part
toRecipients:(NSArray *)recipients
sender:(NSString *)sender
withAuthenticator:(id<SOGoAuthenticator>)authenticator
inContext:(WOContext *)woContext
systemMessage:(BOOL)isSystemMessage;
@end
SoObjects/SOGo/SOGoMailer.m
+35 -7
View File
@@ -154,6 +154,9 @@
{
ASSIGN (mailingMechanism, [dd mailingMechanism]);
ASSIGN (smtpServer, [dd smtpServer]);
smtpMasterUserEnabled = [dd smtpMasterUserEnabled];
ASSIGN (smtpMasterUserUsername, [dd smtpMasterUserUsername]);
ASSIGN (smtpMasterUserPassword, [dd smtpMasterUserPassword]);
ASSIGN (authenticationType,
[[dd smtpAuthenticationType] lowercaseString]);
}
@@ -167,6 +170,9 @@
{
mailingMechanism = nil;
smtpServer = nil;
smtpMasterUserEnabled = NO;
smtpMasterUserUsername = nil;
smtpMasterUserPassword = nil;
authenticationType = nil;
}
@@ -177,6 +183,8 @@
{
[mailingMechanism release];
[smtpServer release];
[smtpMasterUserUsername release];
[smtpMasterUserPassword release];
[authenticationType release];
[super dealloc];
}
@@ -226,6 +234,7 @@
sender: (NSString *) sender
withAuthenticator: (id <SOGoAuthenticator>) authenticator
inContext: (WOContext *) woContext
systemMessage: (BOOL) isSystemMessage
{
NSString *currentTo, *login, *password;
NSMutableArray *toErrors;
@@ -254,13 +263,26 @@
inDomain: [[authenticator userInContext: woContext] domain]];
password = [authenticator passwordInContext: woContext];
if ([login length] == 0
if (isSystemMessage
&& ![[[SOGoUserManager sharedUserManager] getEmailForUID: [[authenticator userInContext: woContext] loginInDomain]] isEqualToString: sender]
&& smtpMasterUserEnabled) {
if (![client plainAuthenticateUser: smtpMasterUserUsername
withPassword: smtpMasterUserPassword]) {
result = [NSException exceptionWithHTTPStatus: 500
reason: @"cannot send message:"
@" (smtp) authentication failure"];
[self errorWithFormat: @"Could not connect to the SMTP server with master credentials %@", smtpServer];
}
} else {
if ([login length] == 0
|| [login isEqualToString: @"anonymous"]
|| ![client plainAuthenticateUser: login
withPassword: password])
result = [NSException exceptionWithHTTPStatus: 500
reason: @"cannot send message:"
@" (smtp) authentication failure"];
result = [NSException exceptionWithHTTPStatus: 500
reason: @"cannot send message:"
@" (smtp) authentication failure"];
}
}
else if (authenticationType && ![authenticator isKindOfClass: [SOGoEmptyAuthenticator class]])
result = [NSException
@@ -327,6 +349,7 @@
sender: (NSString *) sender
withAuthenticator: (id <SOGoAuthenticator>) authenticator
inContext: (WOContext *) woContext
systemMessage: (BOOL) isSystemMessage
{
NSException *result;
@@ -399,7 +422,8 @@
toRecipients: recipients
sender: [sender pureEMailAddress]
withAuthenticator: authenticator
inContext: woContext];
inContext: woContext
systemMessage: isSystemMessage];
}
}
@@ -411,6 +435,7 @@
sender: (NSString *) sender
withAuthenticator: (id <SOGoAuthenticator>) authenticator
inContext: (WOContext *) woContext
systemMessage: (BOOL) isSystemMessage
{
NSData *mailData;
@@ -421,7 +446,8 @@
toRecipients: recipients
sender: sender
withAuthenticator: authenticator
inContext: woContext];
inContext: woContext
systemMessage: isSystemMessage];
}
- (NSException *) sendMailAtPath: (NSString *) filename
@@ -429,6 +455,7 @@
sender: (NSString *) sender
withAuthenticator: (id <SOGoAuthenticator>) authenticator
inContext: (WOContext *) woContext
systemMessage: (BOOL) isSystemMessage
{
NSException *result;
NSData *mailData;
@@ -439,7 +466,8 @@
toRecipients: recipients
sender: sender
withAuthenticator: authenticator
inContext: woContext];
inContext: woContext
systemMessage: isSystemMessage];
else
result = [NSException exceptionWithHTTPStatus: 500
reason: @"cannot send message: no data"