Mercurial Hosting > luan

annotate src/luan/modules/mail/SmtpCon.java @ 1275:cc3dabc05f72

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor
author Franklin Schmidt <fschmidt@gmail.com>
date Tue, 04 Dec 2018 21:42:11 -0700
parents 9fa8b8389578
children 25746915a241
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
228
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
1 package luan.modules.mail;
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
2
360
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
3 import java.io.IOException;
270
b2c20fdcf42a allow alternative-multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 228
diff changeset
4 import java.util.Map;
273
073044e3ac03 fix mmake.sh and multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 270
diff changeset
5 import java.util.HashMap;
228
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
6 import java.util.Properties;
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
7 import javax.mail.Authenticator;
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
8 import javax.mail.PasswordAuthentication;
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
9 import javax.mail.Session;
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
10 import javax.mail.Transport;
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
11 import javax.mail.Message;
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
12 import javax.mail.MessagingException;
360
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
13 import javax.mail.Part;
1253
23e8f93055a4 mail - add reply-to
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
14 import javax.mail.internet.InternetAddress;
228
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
15 import javax.mail.internet.MimeMessage;
270
b2c20fdcf42a allow alternative-multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 228
diff changeset
16 import javax.mail.internet.MimeMultipart;
b2c20fdcf42a allow alternative-multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 228
diff changeset
17 import javax.mail.internet.MimeBodyPart;
228
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
18 import luan.Luan;
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
19 import luan.LuanState;
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
20 import luan.LuanTable;
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
21 import luan.LuanException;
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
22
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
23
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
24 public final class SmtpCon {
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
25 private final Session session;
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
26
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1253
diff changeset
27 public SmtpCon(LuanTable paramsTbl) throws LuanException {
1275
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
28 Map<Object,Object> params = paramsTbl.asMap();
228
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
29 Properties props = new Properties(System.getProperties());
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
30
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
31 String host = getString(params,"host");
228
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
32 if( host==null )
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
33 throw new LuanException( "parameter 'host' is required" );
228
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
34 props.setProperty("mail.smtp.host",host);
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
35
289
ae7ae2755b48 improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 273
diff changeset
36 Object port = params.remove("port");
228
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
37 if( port != null ) {
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
38 String s;
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
39 if( port instanceof String ) {
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
40 s = (String)port;
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
41 } else if( port instanceof Number ) {
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
42 Integer i = Luan.asInteger(port);
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
43 if( i == null )
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
44 throw new LuanException( "parameter 'port' must be an integer" );
228
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
45 s = i.toString();
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
46 } else {
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
47 throw new LuanException( "parameter 'port' must be an integer" );
228
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
48 }
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
49 props.setProperty("mail.smtp.socketFactory.port", s);
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
50 props.setProperty("mail.smtp.port", s);
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
51 }
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
52
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
53 String username = getString(params,"username");
228
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
54 if( username == null ) {
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
55 session = Session.getInstance(props);
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
56 } else {
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
57 String password = getString(params,"password");
228
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
58 if( password==null )
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
59 throw new LuanException( "parameter 'password' is required with 'username'" );
228
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
60 props.setProperty("mail.smtp.auth","true");
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
61 final PasswordAuthentication pa = new PasswordAuthentication(username,password);
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
62 Authenticator auth = new Authenticator() {
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
63 protected PasswordAuthentication getPasswordAuthentication() {
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
64 return pa;
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
65 }
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
66 };
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
67 session = Session.getInstance(props,auth);
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
68 }
289
ae7ae2755b48 improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 273
diff changeset
69
ae7ae2755b48 improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 273
diff changeset
70 if( !params.isEmpty() )
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
71 throw new LuanException( "unrecognized parameters: "+params );
228
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
72 }
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
73
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1253
diff changeset
74 private static String getString(Map<Object,Object> params,String key) throws LuanException {
289
ae7ae2755b48 improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 273
diff changeset
75 Object val = params.remove(key);
228
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
76 if( val!=null && !(val instanceof String) )
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
77 throw new LuanException( "parameter '"+key+"' must be a string" );
228
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
78 return (String)val;
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
79 }
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
80
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
81
1267
9fa8b8389578 add LuanTable.luan;
Franklin Schmidt <fschmidt@gmail.com>
parents: 1253
diff changeset
82 public void send(LuanTable mailTbl) throws LuanException {
228
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
83 try {
1275
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
84 Map<Object,Object> mailParams = mailTbl.asMap();
228
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
85 MimeMessage msg = new MimeMessage(session);
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
86
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
87 String from = getString(mailParams,"from");
228
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
88 if( from != null )
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
89 msg.setFrom(from);
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
90
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
91 String to = getString(mailParams,"to");
228
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
92 if( to != null )
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
93 msg.setRecipients(Message.RecipientType.TO,to);
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
94
1253
23e8f93055a4 mail - add reply-to
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
95 String replyTo = getString(mailParams,"reply-to");
23e8f93055a4 mail - add reply-to
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
96 if( replyTo != null )
23e8f93055a4 mail - add reply-to
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
97 msg.setReplyTo(InternetAddress.parse(replyTo));
23e8f93055a4 mail - add reply-to
Franklin Schmidt <fschmidt@gmail.com>
parents: 775
diff changeset
98
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
99 String cc = getString(mailParams,"cc");
289
ae7ae2755b48 improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 273
diff changeset
100 if( cc != null )
ae7ae2755b48 improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 273
diff changeset
101 msg.setRecipients(Message.RecipientType.CC,cc);
ae7ae2755b48 improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 273
diff changeset
102
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
103 String subject = getString(mailParams,"subject");
228
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
104 if( subject != null )
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
105 msg.setSubject(subject);
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
106
289
ae7ae2755b48 improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 273
diff changeset
107 Object body = mailParams.remove("body");
360
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
108 Object attachments = mailParams.remove("attachments");
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
109 Part bodyPart = attachments==null ? msg : new MimeBodyPart();
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
110
270
b2c20fdcf42a allow alternative-multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 228
diff changeset
111 if( body != null ) {
b2c20fdcf42a allow alternative-multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 228
diff changeset
112 if( body instanceof String ) {
360
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
113 bodyPart.setText((String)body);
270
b2c20fdcf42a allow alternative-multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 228
diff changeset
114 } else if( body instanceof LuanTable ) {
273
073044e3ac03 fix mmake.sh and multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 270
diff changeset
115 LuanTable bodyTbl = (LuanTable)body;
1275
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
116 Map<Object,Object> map = bodyTbl.asMap();
270
b2c20fdcf42a allow alternative-multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 228
diff changeset
117 MimeMultipart mp = new MimeMultipart("alternative");
273
073044e3ac03 fix mmake.sh and multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 270
diff changeset
118 String text = (String)map.remove("text");
073044e3ac03 fix mmake.sh and multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 270
diff changeset
119 if( text != null ) {
270
b2c20fdcf42a allow alternative-multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 228
diff changeset
120 MimeBodyPart part = new MimeBodyPart();
273
073044e3ac03 fix mmake.sh and multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 270
diff changeset
121 part.setText(text);
270
b2c20fdcf42a allow alternative-multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 228
diff changeset
122 mp.addBodyPart(part);
b2c20fdcf42a allow alternative-multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 228
diff changeset
123 }
273
073044e3ac03 fix mmake.sh and multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 270
diff changeset
124 String html = (String)map.remove("html");
073044e3ac03 fix mmake.sh and multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 270
diff changeset
125 if( html != null ) {
073044e3ac03 fix mmake.sh and multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 270
diff changeset
126 MimeBodyPart part = new MimeBodyPart();
073044e3ac03 fix mmake.sh and multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 270
diff changeset
127 part.setContent(html,"text/html");
073044e3ac03 fix mmake.sh and multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 270
diff changeset
128 mp.addBodyPart(part);
073044e3ac03 fix mmake.sh and multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 270
diff changeset
129 }
073044e3ac03 fix mmake.sh and multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 270
diff changeset
130 if( !map.isEmpty() )
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
131 throw new LuanException( "invalid body types: " + map );
360
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
132 bodyPart.setContent(mp);
270
b2c20fdcf42a allow alternative-multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 228
diff changeset
133 } else
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
134 throw new LuanException( "parameter 'body' must be a string or table" );
360
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
135 }
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
136
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
137 if( attachments != null ) {
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
138 if( !(attachments instanceof LuanTable) )
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
139 throw new LuanException( "parameter 'attachments' must be a table" );
360
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
140 LuanTable attachmentsTbl = (LuanTable)attachments;
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
141 if( !attachmentsTbl.isList() )
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
142 throw new LuanException( "parameter 'attachments' must be a list" );
360
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
143 MimeMultipart mp = new MimeMultipart("mixed");
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
144 if( body != null )
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
145 mp.addBodyPart((MimeBodyPart)bodyPart);
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
146 for( Object attachment : attachmentsTbl.asList() ) {
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
147 if( !(attachment instanceof LuanTable) )
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
148 throw new LuanException( "each attachment must be a table" );
1275
Franklin Schmidt <fschmidt@gmail.com>
parents: 1267
diff changeset
149 Map<Object,Object> attachmentMap = ((LuanTable)attachment).asMap();
360
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
150 Object obj;
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
151
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
152 obj = attachmentMap.remove("filename");
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
153 if( obj==null )
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
154 throw new LuanException( "an attachment is missing 'filename'" );
360
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
155 if( !(obj instanceof String) )
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
156 throw new LuanException( "an attachment filename must be a string" );
360
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
157 String filename = (String)obj;
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
158
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
159 obj = attachmentMap.remove("content_type");
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
160 if( obj==null )
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
161 throw new LuanException( "an attachment is missing 'content_type'" );
360
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
162 if( !(obj instanceof String) )
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
163 throw new LuanException( "an attachment content_type must be a string" );
360
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
164 String content_type = (String)obj;
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
165
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
166 Object content = attachmentMap.remove("content");
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
167 if( content==null )
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
168 throw new LuanException( "an attachment is missing 'content'" );
360
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
169 if( content_type.startsWith("text/") && content instanceof byte[] )
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
170 content = new String((byte[])content);
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
171
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
172 if( !attachmentMap.isEmpty() )
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
173 throw new LuanException( "unrecognized attachment parameters: "+attachmentMap );
360
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
174
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
175 MimeBodyPart part = new MimeBodyPart();
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
176 part.setContent(content,content_type);
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
177 part.setFileName(filename);
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
178 mp.addBodyPart(part);
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
179 }
cbb94a7c7a9e allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents: 289
diff changeset
180 msg.setContent(mp);
270
b2c20fdcf42a allow alternative-multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 228
diff changeset
181 }
228
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
182
289
ae7ae2755b48 improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 273
diff changeset
183 if( !mailParams.isEmpty() )
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
184 throw new LuanException( "unrecognized parameters: "+mailParams );
289
ae7ae2755b48 improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents: 273
diff changeset
185
228
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
186 Transport.send(msg);
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
187 } catch(MessagingException e) {
646
cdc70de628b5 simplify LuanException
Franklin Schmidt <fschmidt@gmail.com>
parents: 578
diff changeset
188 throw new LuanException(e);
228
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
189 }
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
190 }
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
191
7580379cdc79 implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff changeset
192 }