Skip to content
Snippets Groups Projects
Commit e8f03bb5 authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

[fix] Upgrade JavaMail to 1.6.7, to fix startTtl issue (error "No appropriate...

[fix] Upgrade JavaMail to 1.6.7, to fix startTtl issue (error "No appropriate protocol (protocol is disabled or cipher suites are inappropriate)")
parent 555db02f
Branches
Tags
No related merge requests found
...@@ -83,8 +83,12 @@ ...@@ -83,8 +83,12 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.mail</groupId> <groupId>jakarta.mail</groupId>
<artifactId>mail</artifactId> <artifactId>jakarta.mail-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
</dependency> </dependency>
<!-- Unit test --> <!-- Unit test -->
......
...@@ -28,6 +28,8 @@ import org.duniter.core.model.SmtpConfig; ...@@ -28,6 +28,8 @@ import org.duniter.core.model.SmtpConfig;
import org.duniter.core.util.CollectionUtils; import org.duniter.core.util.CollectionUtils;
import org.duniter.core.util.Preconditions; import org.duniter.core.util.Preconditions;
import org.duniter.core.util.StringUtils; import org.duniter.core.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.activation.CommandMap; import javax.activation.CommandMap;
import javax.activation.MailcapCommandMap; import javax.activation.MailcapCommandMap;
...@@ -41,6 +43,7 @@ import java.util.stream.Collectors; ...@@ -41,6 +43,7 @@ import java.util.stream.Collectors;
public class MailServiceImpl implements MailService, Closeable { public class MailServiceImpl implements MailService, Closeable {
private static Logger log = LoggerFactory.getLogger(MailServiceImpl.class);
private SmtpConfig smtpConfig; private SmtpConfig smtpConfig;
private static Session session; private static Session session;
private static Transport transport; private static Transport transport;
...@@ -280,6 +283,9 @@ public class MailServiceImpl implements MailService, Closeable { ...@@ -280,6 +283,9 @@ public class MailServiceImpl implements MailService, Closeable {
if (config.isStartTLS()) { if (config.isStartTLS()) {
props.put("mail.smtp.starttls.enable", "true"); props.put("mail.smtp.starttls.enable", "true");
} }
if (log.isDebugEnabled()) {
props.put("mail.debug", "true");
}
boolean useAuth = false; boolean useAuth = false;
// auto set authentification if smtp user name is provided // auto set authentification if smtp user name is provided
......
jdk.tls.disabledAlgorithms=MD5withRSA, DH keySize < 768,TLSv1,TLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_GCM_SHA256,TLS_DHE_RSA_WITH_AES_256_CBC_SHA,TLS_DHE_RSA_WITH_AES_256_CBC_SHA256,TLS_DHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_3DES_EDE_CBC_SHA,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_256_CBC_SHA256,TLS_RSA_WITH_AES_256_GCM_SHA384,TLS_RSA_WITH_RC4_128_MD5,TLS_RSA_WITH_RC4_128_SHA
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
<!-- UI versions --> <!-- UI versions -->
<spring.version>4.2.1.RELEASE</spring.version> <spring.version>4.2.1.RELEASE</spring.version>
<aspectj.version>1.8.7</aspectj.version> <aspectj.version>1.8.7</aspectj.version>
<javaMail.version>1.6.7</javaMail.version>
<!-- Unit test --> <!-- Unit test -->
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
...@@ -223,9 +224,15 @@ ...@@ -223,9 +224,15 @@
<version>2.6</version> <version>2.6</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.mail</groupId> <groupId>jakarta.mail</groupId>
<artifactId>mail</artifactId> <artifactId>jakarta.mail-api</artifactId>
<version>1.4.7</version> <version>${javaMail.version}</version>
</dependency>
<dependency>
<groupId>com.sun.mail</groupId>
<artifactId>jakarta.mail</artifactId>
<version>${javaMail.version}</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment