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

feat(core): Support smtps and STARTTLS for SMTP

Browse Source 
Support uri schemes for SMTP, enabling STARTTLS and SMTPS for SMTP
connections.
The new format for configuration value SMTPServer supports passing a
URI scheme (either smtp:// or smtps://). To support old configurations,
if no scheme is given, smtp:// is assumed.

Fixes #31
This commit is contained in:
Nicolas Höft
2020-05-16 04:58:40 +02:00
parent 9198fc9bf6
commit cd3095e43b
5 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/SOGo/SOGoMailer.m
+11 -23
View File
@@ -25,6 +25,7 @@
#import <NGObjWeb/NSException+HTTP.h>
#import <NGExtensions/NSObject+Logs.h>
#import <NGExtensions/NSURL+misc.h>
#import <NGMail/NGSendMail.h>
#import <NGMail/NGSmtpClient.h>
#import <NGMime/NGMimePartGenerator.h>
@@ -221,40 +222,27 @@
}
- (NSException *) _smtpSendData: (NSData *) mailData
toRecipients: (NSArray *) recipients
sender: (NSString *) sender
toRecipients: (NSArray *) recipients
sender: (NSString *) sender
withAuthenticator: (id <SOGoAuthenticator>) authenticator
inContext: (WOContext *) woContext
{
NSString *currentTo, *host, *login, *password;
NGInternetSocketAddress *addr;
NSString *currentTo, *login, *password;
NSMutableArray *toErrors;
NSEnumerator *addresses;
NSEnumerator *addresses;
NGSmtpClient *client;
NSException *result;
NSRange r;
unsigned int port;
NSURL * smtpUrl;
client = [NGSmtpClient smtpClient];
host = smtpServer;
result = nil;
port = 25;
// We check if there is a port specified in the smtpServer ivar value
r = [smtpServer rangeOfString: @":"];
if (r.length)
{
port = [[smtpServer substringFromIndex: r.location+1] intValue];
host = [smtpServer substringToIndex: r.location];
}
smtpUrl = [[[NSURL alloc] initWithString: smtpServer] autorelease];
addr = [NGInternetSocketAddress addressWithPort: port
onHost: host];
client = [NGSmtpClient clientWithURL: smtpUrl];
NS_DURING
{
[client connectToAddress: addr];
[client connect];
if ([authenticationType isEqualToString: @"plain"])
{
/* XXX Allow static credentials by peeking at the classname */
@@ -302,7 +290,7 @@
@" (smtp) all recipients discarded"];
else if ([toErrors count] > 0)
result = [NSException exceptionWithHTTPStatus: 500
reason: [NSString stringWithFormat:
reason: [NSString stringWithFormat:
@"cannot send message (smtp) - recipients discarded:\n%@",
[toErrors componentsJoinedByString: @", "]]];
else
@@ -318,7 +306,7 @@
}
NS_HANDLER
{
[self errorWithFormat: @"Could not connect to the SMTP server %@ on port %d", host, port];
[self errorWithFormat: @"Could not connect to the SMTP server %@", smtpServer];
result = [NSException exceptionWithHTTPStatus: 500
reason: @"cannot send message:"
@" (smtp) error when connecting"];