Mercurial Hosting > luan
annotate mail/src/luan/modules/mail/SmtpCon.java @ 375:e2e70d27c258
simplify mail
author | Franklin Schmidt <fschmidt@gmail.com> |
---|---|
date | Fri, 17 Apr 2015 18:34:02 -0600 |
parents | cbb94a7c7a9e |
children | d9df6d6cb927 |
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; |
228
7580379cdc79
implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
14 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
|
15 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
|
16 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
|
17 import luan.Luan; |
7580379cdc79
implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
18 import luan.LuanState; |
7580379cdc79
implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
19 import luan.LuanTable; |
7580379cdc79
implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
20 import luan.LuanJavaFunction; |
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 |
289
ae7ae2755b48
improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
273
diff
changeset
|
27 public SmtpCon(LuanState luan,LuanTable paramsTbl) throws LuanException { |
ae7ae2755b48
improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
273
diff
changeset
|
28 Map<Object,Object> params = new HashMap<Object,Object>(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 |
7580379cdc79
implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
31 String host = getString(luan,params,"host"); |
7580379cdc79
implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
32 if( host==null ) |
7580379cdc79
implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
33 throw luan.exception( "parameter 'host' is required" ); |
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 ) |
360
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
44 throw luan.exception( "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 { |
360
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
47 throw luan.exception( "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 |
7580379cdc79
implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
53 String username = getString(luan,params,"username"); |
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 { |
7580379cdc79
implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
57 String password = getString(luan,params,"password"); |
7580379cdc79
implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
58 if( password==null ) |
7580379cdc79
implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
59 throw luan.exception( "parameter 'password' is required with 'username'" ); |
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() ) |
ae7ae2755b48
improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
273
diff
changeset
|
71 throw luan.exception( "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 |
289
ae7ae2755b48
improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
273
diff
changeset
|
74 private String getString(LuanState luan,Map<Object,Object> params,String key) throws LuanException { |
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) ) |
270
b2c20fdcf42a
allow alternative-multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
228
diff
changeset
|
77 throw luan.exception( "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 |
7580379cdc79
implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
82 public void send(LuanState luan,LuanTable mailTbl) throws LuanException { |
7580379cdc79
implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
83 try { |
289
ae7ae2755b48
improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
273
diff
changeset
|
84 Map<Object,Object> mailParams = new HashMap<Object,Object>(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 |
289
ae7ae2755b48
improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
273
diff
changeset
|
87 String from = getString(luan,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 |
289
ae7ae2755b48
improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
273
diff
changeset
|
91 String to = getString(luan,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 |
289
ae7ae2755b48
improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
273
diff
changeset
|
95 String cc = getString(luan,mailParams,"cc"); |
ae7ae2755b48
improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
273
diff
changeset
|
96 if( cc != null ) |
ae7ae2755b48
improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
273
diff
changeset
|
97 msg.setRecipients(Message.RecipientType.CC,cc); |
ae7ae2755b48
improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
273
diff
changeset
|
98 |
ae7ae2755b48
improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
273
diff
changeset
|
99 String subject = getString(luan,mailParams,"subject"); |
228
7580379cdc79
implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
100 if( subject != null ) |
7580379cdc79
implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
101 msg.setSubject(subject); |
7580379cdc79
implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
102 |
289
ae7ae2755b48
improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
273
diff
changeset
|
103 Object body = mailParams.remove("body"); |
360
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
104 Object attachments = mailParams.remove("attachments"); |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
105 Part bodyPart = attachments==null ? msg : new MimeBodyPart(); |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
106 |
270
b2c20fdcf42a
allow alternative-multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
228
diff
changeset
|
107 if( body != null ) { |
b2c20fdcf42a
allow alternative-multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
228
diff
changeset
|
108 if( body instanceof String ) { |
360
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
109 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
|
110 } 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
|
111 LuanTable bodyTbl = (LuanTable)body; |
073044e3ac03
fix mmake.sh and multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
270
diff
changeset
|
112 Map<Object,Object> map = new HashMap<Object,Object>(bodyTbl.asMap()); |
270
b2c20fdcf42a
allow alternative-multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
228
diff
changeset
|
113 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
|
114 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
|
115 if( text != null ) { |
270
b2c20fdcf42a
allow alternative-multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
228
diff
changeset
|
116 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
|
117 part.setText(text); |
270
b2c20fdcf42a
allow alternative-multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
228
diff
changeset
|
118 mp.addBodyPart(part); |
b2c20fdcf42a
allow alternative-multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
228
diff
changeset
|
119 } |
273
073044e3ac03
fix mmake.sh and multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
270
diff
changeset
|
120 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
|
121 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
|
122 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
|
123 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
|
124 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
|
125 } |
073044e3ac03
fix mmake.sh and multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
270
diff
changeset
|
126 if( !map.isEmpty() ) |
073044e3ac03
fix mmake.sh and multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
270
diff
changeset
|
127 throw luan.exception( "invalid body types: " + map ); |
360
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
128 bodyPart.setContent(mp); |
270
b2c20fdcf42a
allow alternative-multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
228
diff
changeset
|
129 } else |
360
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
130 throw luan.exception( "parameter 'body' must be a string or table" ); |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
131 } |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
132 |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
133 if( attachments != null ) { |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
134 if( !(attachments instanceof LuanTable) ) |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
135 throw luan.exception( "parameter 'attachments' must be a table" ); |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
136 LuanTable attachmentsTbl = (LuanTable)attachments; |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
137 if( !attachmentsTbl.isList() ) |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
138 throw luan.exception( "parameter 'attachments' must be a list" ); |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
139 MimeMultipart mp = new MimeMultipart("mixed"); |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
140 if( body != null ) |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
141 mp.addBodyPart((MimeBodyPart)bodyPart); |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
142 for( Object attachment : attachmentsTbl.asList() ) { |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
143 if( !(attachment instanceof LuanTable) ) |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
144 throw luan.exception( "each attachment must be a table" ); |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
145 Map<Object,Object> attachmentMap = new HashMap<Object,Object>(((LuanTable)attachment).asMap()); |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
146 Object obj; |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
147 |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
148 obj = attachmentMap.remove("filename"); |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
149 if( obj==null ) |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
150 throw luan.exception( "an attachment is missing 'filename'" ); |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
151 if( !(obj instanceof String) ) |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
152 throw luan.exception( "an attachment filename must be a string" ); |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
153 String filename = (String)obj; |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
154 |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
155 obj = attachmentMap.remove("content_type"); |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
156 if( obj==null ) |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
157 throw luan.exception( "an attachment is missing 'content_type'" ); |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
158 if( !(obj instanceof String) ) |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
159 throw luan.exception( "an attachment content_type must be a string" ); |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
160 String content_type = (String)obj; |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
161 |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
162 Object content = attachmentMap.remove("content"); |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
163 if( content==null ) |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
164 throw luan.exception( "an attachment is missing 'content'" ); |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
165 if( content_type.startsWith("text/") && content instanceof byte[] ) |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
166 content = new String((byte[])content); |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
167 |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
168 if( !attachmentMap.isEmpty() ) |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
169 throw luan.exception( "unrecognized attachment parameters: "+attachmentMap ); |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
170 |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
171 MimeBodyPart part = new MimeBodyPart(); |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
172 part.setContent(content,content_type); |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
173 part.setFileName(filename); |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
174 mp.addBodyPart(part); |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
175 } |
cbb94a7c7a9e
allow mail attachments;
Franklin Schmidt <fschmidt@gmail.com>
parents:
289
diff
changeset
|
176 msg.setContent(mp); |
270
b2c20fdcf42a
allow alternative-multipart mail
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
228
diff
changeset
|
177 } |
228
7580379cdc79
implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
178 |
289
ae7ae2755b48
improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
273
diff
changeset
|
179 if( !mailParams.isEmpty() ) |
ae7ae2755b48
improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
273
diff
changeset
|
180 throw luan.exception( "unrecognized parameters: "+mailParams ); |
ae7ae2755b48
improve Mail;
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
273
diff
changeset
|
181 |
228
7580379cdc79
implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
182 Transport.send(msg); |
7580379cdc79
implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
183 } catch(MessagingException e) { |
7580379cdc79
implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
184 throw luan.exception(e); |
7580379cdc79
implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
185 } |
7580379cdc79
implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
186 } |
7580379cdc79
implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
187 |
7580379cdc79
implement basic mail smtp
fschmidt@gmail.com <fschmidt@gmail.com@21e917c8-12df-6dd8-5cb6-c86387c605b9>
parents:
diff
changeset
|
188 } |