cqrenet/mxids
3
0
Fork 0
Code Pull Requests 10 Actions Releases Activity

Fix #106

Browse Source
This commit is contained in:
Max Dor
2019-01-04 19:26:45 +01:00
parent e6f9c30611
commit df44428a85
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/io/kamax/mxisd/threepid/connector/email/EmailSmtpConnector.java
View File

@@ -57,11 +57,14 @@ public class EmailSmtpConnector implements IEmailConnector {
Properties sCfg = new Properties(); Properties sCfg = new Properties();
sCfg.setProperty("mail.smtp.host", cfg.getHost()); sCfg.setProperty("mail.smtp.host", cfg.getHost());
sCfg.setProperty("mail.smtp.port", Integer.toString(cfg.getPort())); sCfg.setProperty("mail.smtp.port", Integer.toString(cfg.getPort()));
// This seems very fiddly as we need to call different connect() methods depending
// If there is authentication or not. We set those for the sake of completeness and
// Backward compatibility. See previously opened issues about Email and SMTP.
if (StringUtils.isAllEmpty(cfg.getLogin(), cfg.getPassword())) { if (StringUtils.isAllEmpty(cfg.getLogin(), cfg.getPassword())) {
sCfg.setProperty("mail.smtp.auth", "false"); sCfg.setProperty("mail.smtp.auth", "false");
} else { } else {
sCfg.setProperty("mail.smtp.user", cfg.getLogin()); sCfg.setProperty("mail.smtp.auth", "true");
sCfg.setProperty("mail.smtp.password", cfg.getPassword());
} }
session = Session.getInstance(sCfg); session = Session.getInstance(sCfg);
@@ -103,7 +106,14 @@ public class EmailSmtpConnector implements IEmailConnector {
transport.setRequireStartTLS(cfg.getTls() > 1); transport.setRequireStartTLS(cfg.getTls() > 1);
log.info("Connecting to {}:{}", cfg.getHost(), cfg.getPort()); log.info("Connecting to {}:{}", cfg.getHost(), cfg.getPort());
transport.connect(); if (StringUtils.isAllEmpty(cfg.getLogin(), cfg.getPassword())) {
log.info("Not using SMTP authentication");
transport.connect();
} else {
log.info("Using SMTP authentication");
transport.connect(cfg.getLogin(), cfg.getPassword());
}
try { try {
transport.sendMessage(msg, InternetAddress.parse(recipient)); transport.sendMessage(msg, InternetAddress.parse(recipient));
log.info("Invite to {} was sent", recipient); log.info("Invite to {} was sent", recipient);