Skip to content

Verify SMTP server hostname on SSL/TLS connections #527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NicoPiel wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −0
Open

Verify SMTP server hostname on SSL/TLS connections #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions server/src/main/java/com/mirth/connect/connectors/smtp/DefaultSmtpConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,10 @@ public void configureEncryption(ConnectorProperties connectorProperties, Email e
if ("SSL".equalsIgnoreCase(props.getEncryption())) {
email.setSSLOnConnect(true);
email.setSslSmtpPort(props.getSmtpPort());
email.setSSLCheckServerIdentity(true);
} else if ("TLS".equalsIgnoreCase(props.getEncryption())) {
email.setStartTLSEnabled(true);
email.setSSLCheckServerIdentity(true);
}
}

Expand Down
2 changes: 2 additions & 0 deletions ...er/src/main/java/com/mirth/connect/server/controllers/DefaultConfigurationController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1660,8 +1660,10 @@ public ConnectionTestResponse sendTestEmail(Properties properties) throws Except
if ("SSL".equalsIgnoreCase(encryption)) {
email.setSSLOnConnect(true);
email.setSslSmtpPort(portString);
email.setSSLCheckServerIdentity(true);
} else if ("TLS".equalsIgnoreCase(encryption)) {
email.setStartTLSEnabled(true);
email.setSSLCheckServerIdentity(true);
}

if (authentication) {
Expand Down
2 changes: 2 additions & 0 deletions server/src/main/java/com/mirth/connect/server/util/ServerSMTPConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,11 @@ public void send(String toList, String ccList, String from, String subject, Stri

if (StringUtils.equalsIgnoreCase(secure, "TLS")) {
email.setStartTLSEnabled(true);
email.setSSLCheckServerIdentity(true);
} else if (StringUtils.equalsIgnoreCase(secure, "SSL")) {
email.setSSLOnConnect(true);
email.setSslSmtpPort(port);
email.setSSLCheckServerIdentity(true);
}

// These have to be set after the authenticator, so that a new mail session isn't created
Expand Down
Loading