diff options
| -rw-r--r-- | src/org/traccar/notification/NotificationMail.java | 141 | ||||
| -rw-r--r-- | src/org/traccar/notification/PropertiesProvider.java | 51 | ||||
| -rw-r--r-- | test/org/traccar/notification/NotificiationMailTest.java | 60 |
3 files changed, 170 insertions, 82 deletions
diff --git a/src/org/traccar/notification/NotificationMail.java b/src/org/traccar/notification/NotificationMail.java index b3531a97b..1298a484d 100644 --- a/src/org/traccar/notification/NotificationMail.java +++ b/src/org/traccar/notification/NotificationMail.java @@ -24,11 +24,9 @@ import javax.mail.Transport; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; -import org.traccar.Config; import org.traccar.Context; import org.traccar.helper.Log; import org.traccar.model.Event; -import org.traccar.model.Extensible; import org.traccar.model.Position; import org.traccar.model.User; @@ -37,106 +35,86 @@ public final class NotificationMail { private NotificationMail() { } - private static Properties getConfigProperies() { - Config config = Context.getConfig(); - Properties result = new Properties(); - String host = config.getString("mail.smtp.host", null); + private static Properties getProperties(PropertiesProvider provider) { + Properties properties = new Properties(); + String host = provider.getString("mail.smtp.host"); if (host != null) { - result.put("mail.smtp.host", host); - result.put("mail.smtp.port", config.getString("mail.smtp.port", "25")); + properties.put("mail.transport.protocol", provider.getString("mail.transport.protocol", "smtp")); + properties.put("mail.smtp.host", host); + properties.put("mail.smtp.port", provider.getString("mail.smtp.port", "25")); - if (config.getBoolean("mail.smtp.starttls.enable")) { - result.put("mail.smtp.starttls.enable", config.getBoolean("mail.smtp.starttls.enable")); - } else if (config.getBoolean("mail.smtp.ssl.enable")) { - result.put("mail.smtp.ssl.enable", config.getBoolean("mail.smtp.ssl.enable")); + String starttlsEnable = provider.getString("mail.smtp.starttls.enable"); + if (starttlsEnable != null) { + properties.put("mail.smtp.starttls.enable", Boolean.parseBoolean(starttlsEnable)); } - result.put("mail.smtp.ssl.trust", config.getBoolean("mail.smtp.ssl.trust")); - - result.put("mail.smtp.auth", config.getBoolean("mail.smtp.auth")); - - String username = config.getString("mail.smtp.username"); - if (username != null) { - result.put("mail.smtp.username", username); + String starttlsRequired = provider.getString("mail.smtp.starttls.required"); + if (starttlsRequired != null) { + properties.put("mail.smtp.starttls.required", Boolean.parseBoolean(starttlsRequired)); } - String password = config.getString("mail.smtp.password"); - if (password != null) { - result.put("mail.smtp.password", password); - } - String from = config.getString("mail.smtp.from"); - if (from != null) { - result.put("mail.smtp.from", from); - } - } - return result; - } - private static Properties getAttributesProperties(Extensible object) { - Properties result = new Properties(); - - if (object.getAttributes().containsKey("mail.smtp.host")) { - result.put("mail.smtp.host", object.getAttributes().get("mail.smtp.host")); - String port = (String) object.getAttributes().get("mail.smtp.port"); - result.put("mail.smtp.port", (port != null) ? port : "25"); - if (object.getAttributes().containsKey("mail.smtp.starttls.enable")) { - boolean tls = Boolean.parseBoolean((String) object.getAttributes().get("mail.smtp.starttls.enable")); - result.put("mail.smtp.starttls.enable", tls); - } else if (object.getAttributes().containsKey("mail.smtp.ssl.enable")) { - boolean ssl = Boolean.parseBoolean((String) object.getAttributes().get("mail.smtp.ssl.enable")); - result.put("mail.smtp.ssl.enable", ssl); + String sslEnable = provider.getString("mail.smtp.ssl.enable"); + if (sslEnable != null) { + properties.put("mail.smtp.ssl.enable", Boolean.parseBoolean(sslEnable)); } - if (object.getAttributes().containsKey("mail.smtp.ssl.trust")) { - result.put("mail.smtp.ssl.trust", object.getAttributes().get("mail.smtp.ssl.trust")); + String sslTrust = provider.getString("mail.smtp.ssl.trust"); + if (sslTrust != null) { + properties.put("mail.smtp.ssl.trust", sslTrust); } - boolean auth = Boolean.parseBoolean((String) object.getAttributes().get("mail.smtp.auth")); - result.put("mail.smtp.auth", auth); - if (object.getAttributes().containsKey("mail.smtp.username")) { - result.put("mail.smtp.username", object.getAttributes().get("mail.smtp.username")); + properties.put("mail.smtp.auth", provider.getString("mail.smtp.auth")); + + String username = provider.getString("mail.smtp.username"); + if (username != null) { + properties.put("mail.smtp.username", username); } - if (object.getAttributes().containsKey("mail.smtp.password")) { - result.put("mail.smtp.password", object.getAttributes().get("mail.smtp.password")); + String password = provider.getString("mail.smtp.password"); + if (password != null) { + properties.put("mail.smtp.password", password); } - if (object.getAttributes().containsKey("mail.smtp.from")) { - result.put("mail.smtp.from", object.getAttributes().get("mail.smtp.from")); + String from = provider.getString("mail.smtp.from"); + if (from != null) { + properties.put("mail.smtp.from", from); } } - return result; + return properties; } - public static void sendMailSync(long userId, Event event, Position position) { - - Properties mailServerProperties; - Session mailSession; - MimeMessage mailMessage; - + private static void sendMailSync(long userId, Event event, Position position) { try { User user = Context.getPermissionsManager().getUser(userId); - mailServerProperties = getConfigProperies(); - if (!mailServerProperties.containsKey("mail.smtp.host")) { - mailServerProperties = getAttributesProperties(user); - if (!mailServerProperties.containsKey("mail.smtp.host")) { + Properties properties = getProperties(new PropertiesProvider(Context.getConfig())); + if (!properties.containsKey("mail.smtp.host")) { + properties = getProperties(new PropertiesProvider(user)); + if (!properties.containsKey("mail.smtp.host")) { + Log.warning("No SMTP configuration found"); return; } } - mailSession = Session.getDefaultInstance(mailServerProperties); - mailMessage = new MimeMessage(mailSession); + Session session = Session.getInstance(properties); - if (mailServerProperties.getProperty("mail.smtp.from") != null) { - mailMessage.setFrom(new InternetAddress(mailServerProperties.getProperty("mail.smtp.from"))); - } + MimeMessage message = new MimeMessage(session); - mailMessage.addRecipient(Message.RecipientType.TO, new InternetAddress(user.getEmail())); - mailMessage.setSubject(NotificationFormatter.formatTitle(userId, event, position)); - mailMessage.setText(NotificationFormatter.formatMessage(userId, event, position)); + String from = properties.getProperty("mail.smtp.from"); + if (from != null) { + message.setFrom(new InternetAddress(from)); + } - Transport transport = mailSession.getTransport("smtp"); - transport.connect(mailServerProperties.getProperty("mail.smtp.host"), - mailServerProperties.getProperty("mail.smtp.username"), - mailServerProperties.getProperty("mail.smtp.password")); - transport.sendMessage(mailMessage, mailMessage.getAllRecipients()); - transport.close(); + message.addRecipient(Message.RecipientType.TO, new InternetAddress(user.getEmail())); + message.setSubject(NotificationFormatter.formatTitle(userId, event, position)); + message.setText(NotificationFormatter.formatMessage(userId, event, position)); + + Transport transport = session.getTransport(); + try { + transport.connect( + properties.getProperty("mail.smtp.host"), + properties.getProperty("mail.smtp.username"), + properties.getProperty("mail.smtp.password")); + transport.sendMessage(message, message.getAllRecipients()); + } finally { + transport.close(); + } } catch (MessagingException error) { Log.warning(error); @@ -144,12 +122,11 @@ public final class NotificationMail { } public static void sendMailAsync(final long userId, final Event event, final Position position) { - Runnable runnableSend = new Runnable() { + new Thread(new Runnable() { public void run() { sendMailSync(userId, event, position); } - }; - - new Thread(runnableSend).start(); + }).start(); } + } diff --git a/src/org/traccar/notification/PropertiesProvider.java b/src/org/traccar/notification/PropertiesProvider.java new file mode 100644 index 000000000..9a7338591 --- /dev/null +++ b/src/org/traccar/notification/PropertiesProvider.java @@ -0,0 +1,51 @@ +/* + * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.notification; + +import org.traccar.Config; +import org.traccar.model.Extensible; + +public class PropertiesProvider { + + private Config config; + + private Extensible extensible; + + public PropertiesProvider(Config config) { + this.config = config; + } + + public PropertiesProvider(Extensible extensible) { + this.extensible = extensible; + } + + public String getString(String key) { + if (config != null) { + return config.getString(key); + } else { + return (String) extensible.getAttributes().get(key); + } + } + + public String getString(String key, String defaultValue) { + String value = getString(key); + if (value == null) { + value = defaultValue; + } + return value; + } + +} diff --git a/test/org/traccar/notification/NotificiationMailTest.java b/test/org/traccar/notification/NotificiationMailTest.java new file mode 100644 index 000000000..9405ff94f --- /dev/null +++ b/test/org/traccar/notification/NotificiationMailTest.java @@ -0,0 +1,60 @@ +package org.traccar.notification; + +import org.junit.Assert; +import org.junit.Test; +import org.traccar.location.CellInfo; + +import javax.mail.Message; +import javax.mail.Session; +import javax.mail.Transport; +import javax.mail.internet.InternetAddress; +import javax.mail.internet.MimeMessage; +import java.util.Properties; + +public class NotificiationMailTest { + + private static final String FROM = "notification@traccar.org"; + private static final String TO = "anton.tananaev@gmail.com"; + + private static final String BODY = "Test email body."; + private static final String SUBJECT = "Test"; + + private static final String SMTP_USERNAME = "username"; + private static final String SMTP_PASSWORD = "password"; + + private static final String HOST = "email-smtp.us-west-2.amazonaws.com"; + + private static final int PORT = 25; + + @Test + public void test() throws Exception { + + Properties props = System.getProperties(); + props.put("mail.transport.protocol", "smtps"); + props.put("mail.smtp.port", PORT); + + props.put("mail.smtp.auth", "true"); + props.put("mail.smtp.starttls.enable", "true"); + props.put("mail.smtp.starttls.required", "true"); + + Session session = Session.getInstance(props); + + MimeMessage msg = new MimeMessage(session); + msg.setFrom(new InternetAddress(FROM)); + msg.setRecipient(Message.RecipientType.TO, new InternetAddress(TO)); + msg.setSubject(SUBJECT); + msg.setContent(BODY,"text/plain"); + + Transport transport = session.getTransport(); + + try + { + transport.connect(HOST, SMTP_USERNAME, SMTP_PASSWORD); + transport.sendMessage(msg, msg.getAllRecipients()); + } finally { + transport.close(); + } + + } + +} |