Changeset 31729 for main/trunk/greenstone3

Timestamp:

2017-06-12T11:56:25+12:00 (7 years ago)

Author:

kjdon

Message:

modified to use tls or ssl to send mail if requested

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/BerryBasket.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/BerryBasket.java

@@ -556 +556 @@
         password = GlobalProperties.getProperty("mail.smtp.password");
         String from = GlobalProperties.getProperty("mail.from");
-
+        String port = GlobalProperties.getProperty("mail.smtp.port");
+        String mail_security = GlobalProperties.getProperty("mail.security");
         String mailer = "msgsend";
 
@@ -580 +581 @@
             }
 
+
+            if (port != null && !port.trim().equals("")) {
+                props.put("mail.smtp.port", port);
+            }
+            
+            if (mail_security != null) {
+                mail_security = mail_security.trim();
+                if (mail_security.equals("ssl")) {
+                props.put("mail.smtp.ssl.enable", "true"); 
+                } else if (mail_security.equals("tls")) {
+                props.put("mail.smtp.starttls.enable", "true");
+                }
+                else if (mail_security.equals("")) {
+                logger.error("unknown security protocol "+mail_security +", should be ssl or tls");
+                }
+            }
+
+            // this doesn't seem to matter having this when
+            // username and password are empty
+            props.put("mail.smtp.auth", "true");
+
             //setup username and password to the smtp server
+            
             if (username == null || username.trim().equals(""))
                 username = "";
             if (password == null || password.trim().equals(""))
                 password = "";
+            
             Authenticator auth = new Authenticator()
             {
@@ -619 +643 @@
         catch (Exception e)
         {
-            e.printStackTrace();
-            result.appendChild(result_doc.createTextNode(e.getMessage()));
+            logger.error("Error sending mail!");
+            e.printStackTrace();
+            result.appendChild(result_doc.createTextNode(e.getMessage()));
         }