Skip to content

Commit

Permalink
0002809: Parameter to trust mail server certificate
Browse files Browse the repository at this point in the history
  • Loading branch information
@erilong
erilong committed Sep 20, 2016
1 parent bfb81ec commit 57522ee
Show file tree
Hide file tree
Showing 4 changed files with 112 additions and 14 deletions.
1 change: 1 addition & 0 deletions symmetric-core/src/main/java/org/jumpmind/symmetric/common/ParameterConstants.java
View file
Expand Up @@ -350,6 +350,7 @@ private ParameterConstants() {
public static final String SMTP_PASSWORD = "smtp.password";
public static final String SMTP_USE_STARTTLS = "smtp.starttls";
public static final String SMTP_USE_AUTH = "smtp.auth";
public static final String SMTP_ALLOW_UNTRUSTED_CERT = "smtp.allow.untrusted.cert";

public final static String CHANNEL_THREADING = "channel.threading.enabled";

Expand Down
4 changes: 3 additions & 1 deletion symmetric-core/src/main/java/org/jumpmind/symmetric/service/IMailService.java
View file
Expand Up @@ -4,7 +4,9 @@

public interface IMailService {

public void sendEmail(String subject, String text, String recipients);
public String sendEmail(String subject, String text, String recipients);

public String sendEmail(String subject, String text, String recipients, TypedProperties prop);

public String testTransport(TypedProperties prop);

Expand Down
64 changes: 51 additions & 13 deletions symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/MailService.java
View file
Expand Up @@ -40,37 +40,53 @@ public class MailService extends AbstractService implements IMailService {

protected static final String JAVAMAIL_HOST_NAME = "mail.host";
protected static final String JAVAMAIL_TRANSPORT = "mail.transport";
protected static final String JAVAMAIL_PORT_NUMBER = "mail.port";
protected static final String JAVAMAIL_PORT_NUMBER = "mail.smtp.port";
protected static final String JAVAMAIL_PORT_NUMBER_SSL = "mail.smtps.port";
protected static final String JAVAMAIL_FROM = "mail.from";
protected static final String JAVAMAIL_USERNAME = "mail.user";
protected static final String JAVAMAIL_PASSWORD = "mail.password";
protected static final String JAVAMAIL_USE_STARTTLS = "mail.smtp.starttls.enable";
protected static final String JAVAMAIL_USE_AUTH = "mail.smtp.auth";
protected static final String JAVAMAIL_TRUST_HOST = "mail.smtp.ssl.trust";
protected static final String JAVAMAIL_TRUST_HOST_SSL = "mail.smtps.ssl.trust";

public MailService(IParameterService parameterService, ISymmetricDialect symmetricDialect) {
super(parameterService, symmetricDialect);
}

public String sendEmail(String subject, String text, String recipients) {
return sendEmail(subject, text, recipients, getJavaMailProperties(),
parameterService.getString(ParameterConstants.SMTP_TRANSPORT, "smtp"),
parameterService.is(ParameterConstants.SMTP_USE_AUTH, false),
parameterService.getString(ParameterConstants.SMTP_USER),
parameterService.getString(ParameterConstants.SMTP_PASSWORD));
}

public void sendEmail(String subject, String text, String recipients) {
Session session = Session.getInstance(getJavaMailProperties());
public String sendEmail(String subject, String text, String recipients, TypedProperties prop) {
return sendEmail(subject, text, recipients, getJavaMailProperties(prop),
prop.get(ParameterConstants.SMTP_TRANSPORT, "smtp"),
prop.is(ParameterConstants.SMTP_USE_AUTH, false),
prop.get(ParameterConstants.SMTP_USER), prop.get(ParameterConstants.SMTP_PASSWORD));
}

protected String sendEmail(String subject, String text, String recipients, Properties prop,
String transportType, boolean useAuth, String user, String password) {
Session session = Session.getInstance(prop);
Transport transport;
try {
transport = session.getTransport(parameterService.getString(ParameterConstants.SMTP_TRANSPORT, "smtp"));
transport = session.getTransport(transportType);
} catch (NoSuchProviderException e) {
log.error("Failure while obtaining transport", e);
return;
return getNestedErrorMessage(e);
}

try {
if (parameterService.is(ParameterConstants.SMTP_USE_AUTH, false)) {
transport.connect(parameterService.getString(ParameterConstants.SMTP_USER),
parameterService.getString(ParameterConstants.SMTP_PASSWORD));
if (useAuth) {
transport.connect(user, password);
} else {
transport.connect();
}
} catch (MessagingException e) {
log.error("Failure while connecting to transport", e);
return;
return getNestedErrorMessage(e);
}

try {
Expand All @@ -83,15 +99,18 @@ public void sendEmail(String subject, String text, String recipients) {
transport.sendMessage(message, message.getAllRecipients());
} catch (MessagingException e) {
log.error("Failure while sending notification", e);
return getNestedErrorMessage(e);
}
} catch (MessagingException e) {
log.error("Failure while preparing notification", e);
return e.getMessage();
} finally {
try {
transport.close();
} catch (MessagingException e) {
}
}
return null;
}

public String testTransport(TypedProperties prop) {
Expand All @@ -107,9 +126,9 @@ public String testTransport(TypedProperties prop) {
transport.connect();
}
} catch (NoSuchProviderException e) {
error = e.getMessage();
error = getNestedErrorMessage(e);
} catch (MessagingException e) {
error = e.getMessage();
error = getNestedErrorMessage(e);
} finally {
try {
if (transport != null) {
Expand All @@ -121,23 +140,42 @@ public String testTransport(TypedProperties prop) {
return error;
}

protected String getNestedErrorMessage(Exception e) {
String error = e.getMessage();
Throwable e2 = e.getCause();
if (e2 != null) {
error += "\n" + e2.getMessage();
Throwable e3 = e2.getCause();
if (e3 != null) {
error += "\n" + e3.getMessage();
}
}
return error;
}

protected Properties getJavaMailProperties() {
Properties prop = new Properties();
prop.setProperty(JAVAMAIL_HOST_NAME, parameterService.getString(ParameterConstants.SMTP_HOST, "localhost"));
prop.setProperty(JAVAMAIL_PORT_NUMBER, parameterService.getString(ParameterConstants.SMTP_PORT, "25"));
prop.setProperty(JAVAMAIL_PORT_NUMBER_SSL, parameterService.getString(ParameterConstants.SMTP_PORT, "25"));
prop.setProperty(JAVAMAIL_FROM, parameterService.getString(ParameterConstants.SMTP_FROM, "root@localhost"));
prop.setProperty(JAVAMAIL_USE_STARTTLS, parameterService.getString(ParameterConstants.SMTP_USE_STARTTLS, "false"));
prop.setProperty(JAVAMAIL_USE_AUTH, parameterService.getString(ParameterConstants.SMTP_USE_AUTH, "false"));
prop.setProperty(JAVAMAIL_TRUST_HOST, parameterService.is(ParameterConstants.SMTP_ALLOW_UNTRUSTED_CERT, false) ? "*" : "");
prop.setProperty(JAVAMAIL_TRUST_HOST_SSL, parameterService.is(ParameterConstants.SMTP_ALLOW_UNTRUSTED_CERT, false) ? "*" : "");
return prop;
}

protected Properties getJavaMailProperties(TypedProperties typedProp) {
Properties prop = new Properties();
prop.setProperty(JAVAMAIL_HOST_NAME, typedProp.get(ParameterConstants.SMTP_HOST, "localhost"));
prop.setProperty(JAVAMAIL_PORT_NUMBER, typedProp.get(ParameterConstants.SMTP_PORT, "25"));
prop.setProperty(JAVAMAIL_PORT_NUMBER_SSL, typedProp.get(ParameterConstants.SMTP_PORT, "25"));
prop.setProperty(JAVAMAIL_FROM, typedProp.get(ParameterConstants.SMTP_FROM, "root@localhost"));
prop.setProperty(JAVAMAIL_USE_STARTTLS, String.valueOf(typedProp.is(ParameterConstants.SMTP_USE_STARTTLS, false)));
prop.setProperty(JAVAMAIL_USE_AUTH, String.valueOf(typedProp.is(ParameterConstants.SMTP_USE_AUTH, false)));
prop.setProperty(JAVAMAIL_TRUST_HOST, typedProp.is(ParameterConstants.SMTP_ALLOW_UNTRUSTED_CERT, false) ? "*" : "");
prop.setProperty(JAVAMAIL_TRUST_HOST_SSL, typedProp.is(ParameterConstants.SMTP_ALLOW_UNTRUSTED_CERT, false) ? "*" : "");
return prop;
}

Expand Down
57 changes: 57 additions & 0 deletions symmetric-core/src/main/resources/symmetric-default.properties
View file
Expand Up @@ -1914,3 +1914,60 @@ hybrid.push.pull.buffer.status.updates=true
# DatabaseOverridable: true
# Tags: other, firebird
firebird.extract.varchar.row.old.pk.data=20000,20000,1000

# The hostname of the mail server
#
# DatabaseOverridable: true
# Tags: smtp
smtp.host=localhost

# The transport type to use when connecting to mail server, either smtp or smtps.
#
# DatabaseOverridable: true
# Tags: smtp
smtp.transport=smtp

# The port number of the mail server
#
# DatabaseOverridable: true
# Tags: smtp
smtp.port=25

# The email address to use in the "from" header when sending email.
#
# DatabaseOverridable: true
# Tags: smtp
smtp.from=symmetricds@localhost

# Whether or not to authenticate with the mail server.
#
# DatabaseOverridable: true
# Type: boolean
# Tags: smtp
smtp.auth=false

# When authenticating with the mail server, the username to use.
#
# DatabaseOverridable: true
# Tags: smtp
smtp.user=

# When authenticating with the mail server, the password to use.
#
# DatabaseOverridable: true
# Tags: smtp
smtp.password=

# Whether or not to use TLS after connecting to the mail server.
#
# DatabaseOverridable: true
# Type: boolean
# Tags: smtp
smtp.starttls=false

# Whether or not to accept an untrusted certificate for SSL/TLS when connecting to the mail server.
#
# DatabaseOverridable: true
# Type: boolean
# Tags: smtp
smtp.allow.untrusted.cert=false

0 comments on commit 57522ee

Please sign in to comment.