MaDgIK
/
uoa-admin-tools-library
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Trunk | Admin Tools Library]: 

1. MailConfig.java: Added field "sslProtocols".
2. AdminToolsLibraryCheckDeployController.java: Expose property "admintoolslibrary.mail.sslProtocols".
3. EmailSender.java: Set "mail.smtp.ssl.protocols" with value from property "admintoolslibrary.mail.sslProtocols", if it is not null.
This commit is contained in:
Konstantina Galouni 2021-11-15 13:19:56 +00:00
parent a262fe2c45
commit f9f542291e
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/eu/dnetlib/uoaadmintoolslibrary/configuration/properties/MailConfig.java
View File

@ -10,6 +10,7 @@ public class MailConfig {
private String from;
private String username;
private String password;
private String sslProtocols;
public void setHost(String host) {
this.host = host;
@ -35,6 +36,10 @@ public class MailConfig {
this.password = password;
}
public void setSslProtocols(String sslProtocols) {
this.sslProtocols = sslProtocols;
}
public String getHost() {
return host;
}
@ -58,4 +63,8 @@ public class MailConfig {
public String getPassword() {
return password;
}
public String getSslProtocols() {
return sslProtocols;
}
}

1
src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/AdminToolsLibraryCheckDeployController.java
View File

@ -40,6 +40,7 @@ public class AdminToolsLibraryCheckDeployController {
public Map<String, String> checkEverything() {
Map<String, String> response = new HashMap<>();
response.put("admintoolslibrary.mail.auth",mailConfig.getAuth());
response.put("admintoolslibrary.mail.sslProtocols",mailConfig.getSslProtocols());
response.put("admintoolslibrary.mail.from", mailConfig.getFrom());
response.put("admintoolslibrary.mail.host", mailConfig.getHost());
response.put("admintoolslibrary.mail.port", mailConfig.getPort());

4
src/main/java/eu/dnetlib/uoaadmintoolslibrary/emailSender/EmailSender.java
View File

@ -30,8 +30,8 @@ public class EmailSender {
properties.put("mail.smtp.port", mailConfig.getPort());
properties.put("mail.smtp.auth", mailConfig.getAuth()); //enable authentication
properties.put("mail.smtp.starttls.enable", "true");
if(mailConfig.getHost().equals("smtp.gmail.com")) {
properties.put("mail.smtp.ssl.protocols", "TLSv1.2");
if(mailConfig.getSslProtocols() != null) {
properties.put("mail.smtp.ssl.protocols", mailConfig.getSslProtocols());
}
logger.debug("Try to connect to mail sender with "+ mailConfig.getUsername());
Session session = Session.getInstance(properties,