Fix issue where accidental empty property for SMTP still causes authentication to be attempted.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/cdc417d9 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/cdc417d9 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/cdc417d9 Branch: refs/heads/master Commit: cdc417d98deecc2e28229cec519a7b5a8d8794f2 Parents: 406a742 Author: Michael Russo <mru...@apigee.com> Authored: Sat Nov 5 13:01:41 2016 -0700 Committer: Michael Russo <mru...@apigee.com> Committed: Sat Nov 5 13:01:41 2016 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/usergrid/utils/MailUtils.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/cdc417d9/stack/core/src/main/java/org/apache/usergrid/utils/MailUtils.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/utils/MailUtils.java b/stack/core/src/main/java/org/apache/usergrid/utils/MailUtils.java index 6210297..5c9f7b1 100644 --- a/stack/core/src/main/java/org/apache/usergrid/utils/MailUtils.java +++ b/stack/core/src/main/java/org/apache/usergrid/utils/MailUtils.java @@ -121,7 +121,13 @@ public class MailUtils { Transport transport = session.getTransport(); - transport.connect( host, username, password ); + // make sure empty strings aren't mistakenly passed in for the user and password to prevent SMTP auth + if ( StringUtils.isEmpty(username) || StringUtils.isEmpty(password)){ + transport.connect( host, null, null ); + }else{ + transport.connect( host, username, password ); + } + transport.sendMessage( msg, msg.getAllRecipients() ); transport.close();
