From 4cfccd57391cf9060655cce64e62b1f50cf4575b Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 22 Sep 2015 17:04:37 +0200
Subject: [PATCH] OO-1691: add an option tp specify the port of the smtp host,
add an additional optional for start tls to trust the host
---
src/main/java/org/olat/core/util/_spring/utilCorecontext.xml | 1 +
.../org/olat/core/util/mail/manager/MailManagerImpl.java | 5 +++++
src/main/resources/serviceconfig/olat.properties | 1 +
3 files changed, 7 insertions(+)
diff --git a/src/main/java/org/olat/core/util/_spring/utilCorecontext.xml b/src/main/java/org/olat/core/util/_spring/utilCorecontext.xml
index 83bd3edbf9e..e9abc3c7a93 100644
--- a/src/main/java/org/olat/core/util/_spring/utilCorecontext.xml
+++ b/src/main/java/org/olat/core/util/_spring/utilCorecontext.xml
@@ -24,6 +24,7 @@
<property name="mailConfig">
<map>
<entry key="mailhost" value="${smtp.host}"/>
+ <entry key="mailport" value="${smtp.port}"/>
<entry key="mailTimeout" value="${smtp.timeout}"/> <!-- timeout in milliseconds -->
<entry key="smtpUser" value="${smtp.user}"/>
<entry key="smtpPwd" value="${smtp.pwd}"/>
diff --git a/src/main/java/org/olat/core/util/mail/manager/MailManagerImpl.java b/src/main/java/org/olat/core/util/mail/manager/MailManagerImpl.java
index 8ab00be68b1..8e70688a925 100644
--- a/src/main/java/org/olat/core/util/mail/manager/MailManagerImpl.java
+++ b/src/main/java/org/olat/core/util/mail/manager/MailManagerImpl.java
@@ -1445,6 +1445,7 @@ public class MailManagerImpl extends BasicManager implements MailManager {
*/
private MimeMessage createMessage(Address bounceAdress) {
String mailhost = WebappHelper.getMailConfig("mailhost");
+ String mailport = WebappHelper.getMailConfig("mailport");
String mailhostTimeout = WebappHelper.getMailConfig("mailTimeout");
boolean sslEnabled = Boolean.parseBoolean(WebappHelper.getMailConfig("sslEnabled"));
boolean sslCheckCertificate = Boolean.parseBoolean(WebappHelper.getMailConfig("sslCheckCertificate"));
@@ -1462,12 +1463,16 @@ public class MailManagerImpl extends BasicManager implements MailManager {
Properties p = new Properties();
p.put("mail.smtp.from", bounceAdress.toString());
p.put("mail.smtp.host", mailhost);
+ if(StringHelper.containsNonWhitespace(mailport)) {
+ p.put("mail.smtp.port", mailport);
+ }
p.put("mail.smtp.timeout", mailhostTimeout);
p.put("mail.smtp.connectiontimeout", mailhostTimeout);
p.put("mail.smtp.ssl.enable", sslEnabled);
p.put("mail.smtp.ssl.checkserveridentity", sslCheckCertificate);
if(startTls) {
p.put("mail.smtp.starttls.enable", "true");
+ p.put("mail.smtp.ssl.trust", mailhost);
}
Session mailSession;
diff --git a/src/main/resources/serviceconfig/olat.properties b/src/main/resources/serviceconfig/olat.properties
index 7a856ae251b..c6b20f361b2 100644
--- a/src/main/resources/serviceconfig/olat.properties
+++ b/src/main/resources/serviceconfig/olat.properties
@@ -117,6 +117,7 @@ session.timeout.authenticated=7200
# mail support can be disabled by leaving the following entry blank or
# setting it to the keyword 'disabled' (without quotes!)
smtp.host=localhost
+smtp.port=
# if required by your local SMTP you may need to provide credentials
smtp.user=
smtp.pwd=
--
GitLab