aboutsummaryrefslogtreecommitdiff
path: root/src/org/traccar/notification/NotificationMail.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/org/traccar/notification/NotificationMail.java')
-rw-r--r--src/org/traccar/notification/NotificationMail.java152
1 files changed, 64 insertions, 88 deletions
diff --git a/src/org/traccar/notification/NotificationMail.java b/src/org/traccar/notification/NotificationMail.java
index f8449e7d2..17e4d6be4 100644
--- a/src/org/traccar/notification/NotificationMail.java
+++ b/src/org/traccar/notification/NotificationMail.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 Anton Tananaev (anton.tananaev@gmail.com)
+ * Copyright 2016 Anton Tananaev (anton@traccar.org)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -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,119 +35,97 @@ 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));
+ }
+ String starttlsRequired = provider.getString("mail.smtp.starttls.required");
+ if (starttlsRequired != null) {
+ properties.put("mail.smtp.starttls.required", Boolean.parseBoolean(starttlsRequired));
+ }
+
+ String sslEnable = provider.getString("mail.smtp.ssl.enable");
+ if (sslEnable != null) {
+ properties.put("mail.smtp.ssl.enable", Boolean.parseBoolean(sslEnable));
+ }
+ String sslTrust = provider.getString("mail.smtp.ssl.trust");
+ if (sslTrust != null) {
+ properties.put("mail.smtp.ssl.trust", sslTrust);
}
- result.put("mail.smtp.ssl.trust", config.getBoolean("mail.smtp.ssl.trust"));
- result.put("mail.smtp.auth", config.getBoolean("mail.smtp.auth"));
+ properties.put("mail.smtp.auth", provider.getString("mail.smtp.auth"));
- String username = config.getString("mail.smtp.username");
+ String username = provider.getString("mail.smtp.username");
if (username != null) {
- result.put("mail.smtp.user", username);
+ properties.put("mail.smtp.username", username);
}
- String password = config.getString("mail.smtp.password");
+ String password = provider.getString("mail.smtp.password");
if (password != null) {
- result.put("mail.smtp.password", password);
+ properties.put("mail.smtp.password", password);
}
- String from = config.getString("mail.smtp.from");
+ String from = provider.getString("mail.smtp.from");
if (from != null) {
- result.put("mail.smtp.from", from);
+ properties.put("mail.smtp.from", from);
}
}
- return result;
+ return properties;
}
- 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);
- }
- if (object.getAttributes().containsKey("mail.smtp.ssl.trust")) {
- result.put("mail.smtp.ssl.trust", object.getAttributes().get("mail.smtp.ssl.trust"));
- }
- boolean auth = Boolean.parseBoolean((String) object.getAttributes().get("mail.smtp.auth"));
- result.put("mail.smtp.auth", auth);
+ public static void sendMailSync(long userId, Event event, Position position) throws MessagingException {
+ User user = Context.getPermissionsManager().getUser(userId);
- if (object.getAttributes().containsKey("mail.smtp.username")) {
- result.put("mail.smtp.username", object.getAttributes().get("mail.smtp.username"));
- }
- if (object.getAttributes().containsKey("mail.smtp.password")) {
- result.put("mail.smtp.password", object.getAttributes().get("mail.smtp.password"));
- }
- if (object.getAttributes().containsKey("mail.smtp.from")) {
- result.put("mail.smtp.from", object.getAttributes().get("mail.smtp.from"));
+ 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;
}
}
- return result;
- }
-
- public static void sendMailSync(long userId, Event event, Position position) {
-
- Properties mailServerProperties;
- Session mailSession;
- MimeMessage mailMessage;
- try {
- User user = Context.getPermissionsManager().getUser(userId);
-
- mailServerProperties = getConfigProperies();
- if (!mailServerProperties.containsKey("mail.smtp.host")) {
- mailServerProperties = getAttributesProperties(user);
- if (!mailServerProperties.containsKey("mail.smtp.host")) {
- return;
- }
- }
- mailSession = Session.getInstance(mailServerProperties, null);
+ Session session = Session.getInstance(properties);
- mailMessage = new MimeMessage(mailSession);
+ MimeMessage message = new MimeMessage(session);
- if (mailServerProperties.getProperty("mail.smtp.from") != null) {
- mailMessage.setFrom(new InternetAddress(mailServerProperties.getProperty("mail.smtp.from")));
- }
+ String from = properties.getProperty("mail.smtp.from");
+ if (from != null) {
+ message.setFrom(new InternetAddress(from));
+ }
- mailMessage.addRecipient(Message.RecipientType.TO, new InternetAddress(user.getEmail()));
- mailMessage.setSubject(NotificationFormatter.formatTitle(userId, event, position));
- mailMessage.setText(NotificationFormatter.formatMessage(userId, event, position));
+ 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 = 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 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);
}
}
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);
+ try {
+ sendMailSync(userId, event, position);
+ } catch (MessagingException error) {
+ Log.warning(error);
+ }
}
- };
-
- new Thread(runnableSend).start();
+ }).start();
}
+
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-06 19:42:51 +0000