import java.net.*;
import java.io.*;
-// soft line limit (suggested): 78 chars / hard line limit: 998 chars
+// FIXME this is important
// folded headers: can insert CRLF anywhere that whitespace appears (before the whitespace)
+
+// soft line limit (suggested): 78 chars / hard line limit: 998 chars
// date/time parsing: see spec, 3.3
+// FIXME: messages must NEVER contain 8-bit binary data; this is a violation of IMAP
+
// FEATURE: PGP-signature-parsing
// FEATURE: mailing list header parsing
// FEATURE: delivery status notification (and the sneaky variety)
public class Message extends JSReflection {
public final String allHeaders; // pristine headers
- public final Hashtable headers; // hash of headers (not including resent's and traces)
+ public final CaseInsensitiveHash headers; // hash of headers (not including resent's and traces)
public final String body; // entire body
public final int lines; // lines in the body
public final Date date;
public final Address to;
- public final Address from; // if multiple From entries, this is sender
- public final Address replyto; // if none provided, this is equal to sender
+ public final Address from; // if multiple From entries, this is sender
+ public final Address replyto; // if none provided, this is equal to sender
public final String subject;
public final String messageid;
public final Address[] cc;
public final Trace[] traces;
public final Address envelopeFrom;
- public final Address[] envelopeTo;
+ public final Address envelopeTo;
public final Date arrival; // when the message first arrived at this machine; IMAP "internal date message attr"
- // FIXME: need to be able to read back in the EnvelopeFrom / EnvelopeTo fields
public void dump(OutputStream os) throws IOException {
Writer w = new OutputStreamWriter(os);
+ w.write("X-org.ibex.mail.headers.envelope.From: " + envelopeFrom + "\r\n");
+ w.write("X-org.ibex.mail.headers.envelope.To: " + envelopeTo + "\r\n");
w.write(allHeaders);
- w.write("X-org.ibex.mail-envelopeFrom: " + envelopeFrom + "\r\n");
- w.write("X-org.ibex.mail-envelopeTo: "); for(int i=0; i<envelopeTo.length; i++) w.write(envelopeTo[i] + " "); w.write("\r\n");
+ w.write("\r\n");
w.write(body);
w.flush();
}
public static class Malformed extends MailException.Malformed { public Malformed(String s) { super(s); } }
- public Message(Address envelopeFrom, Address[] envelopeTo, String s, Date arrival)
+ public Message(Address envelopeFrom, Address envelopeTo, String s, Date arrival)
{ this(envelopeFrom, envelopeTo, new LineReader(new StringReader(s)), arrival); }
- public Message(Address envelopeFrom, Address[] envelopeTo, LineReader rs) { this(envelopeFrom, envelopeTo, rs, null); }
- public Message(Address envelopeFrom, Address[] envelopeTo, LineReader rs, Date arrival) {
+ public Message(Address envelopeFrom, Address envelopeTo, LineReader rs) { this(envelopeFrom, envelopeTo, rs, null); }
+ public Message(Address envelopeFrom, Address envelopeTo, LineReader rs, Date arrival) {
try {
this.arrival = arrival == null ? new Date() : arrival;
this.headers = new CaseInsensitiveHash();
Address to = null, from = null, replyto = null;
String subject = null, messageid = null;
Vec cc = new Vec(), bcc = new Vec(), resent = new Vec(), traces = new Vec();
+ int lines = 0;
for(String s = rs.readLine(); s != null && !s.equals(""); s = rs.readLine()) {
all.append(s);
+ lines++;
all.append("\r\n");
if (s.length() == 0 || Character.isSpace(s.charAt(0))) {
if (key == null) throw new Malformed("Message began with a blank line; no headers");
((Hashtable)resent.lastElement()).put(key.substring(7), val);
} else if (key.startsWith("Return-Path")) {
rs.pushback(s); traces.addElement(new Trace(rs));
- } else if (key.equals("X-org.ibex.mail.headers.envelopeFrom")) {
+ } else if (key.equals("X-org.ibex.mail.headers.envelope.From")) {
if (envelopeFrom == null) envelopeFrom = new Address(val);
- } else if (key.equals("X-org.ibex.mail.headers.envelopeTo")) {
- if (envelopeTo == null) envelopeToHeader.addElement(new Address(val));
+ } else if (key.equals("X-org.ibex.mail.headers.envelope.To")) {
+ if (envelopeTo == null) envelopeTo = new Address(val);
} else {
// just append it to the previous one; valid for Comments/Keywords
if (headers.get(key) != null) val = headers.get(key) + " " + val;
((CaseInsensitiveHash)headers).add(key, val);
}
}
- if (envelopeTo == null) envelopeTo = new Address[envelopeToHeader.size()];
- envelopeToHeader.copyInto(envelopeTo);
// FIXME what if all are null?
- this.to = headers.get("To") == null ? envelopeTo[0] : new Address((String)headers.get("To"));
+ this.to = headers.get("To") == null ? envelopeTo : new Address((String)headers.get("To"));
this.from = headers.get("From") == null ? envelopeFrom : new Address((String)headers.get("From"));
- this.envelopeFrom = envelopeFrom == null ? this.from : envelopeFrom;
- this.envelopeTo = envelopeTo == null ? new Address[] { this.to } : envelopeTo;
+ this.envelopeFrom = envelopeFrom == null ? this.from : envelopeFrom;
+ this.envelopeTo = envelopeTo == null ? this.to : envelopeTo;
this.date = new Date(); // FIXME (Date)headers.get("Date");
this.replyto = headers.get("Reply-To") == null ? null : new Address((String)headers.get("Reply-To"));
this.subject = (String)headers.get("Subject");
this.messageid = (String)headers.get("Message-Id");
if (headers.get("Cc") != null) {
+ // FIXME: tokenize better
StringTokenizer st = new StringTokenizer((String)headers.get("Cc"));
this.cc = new Address[st.countTokens()];
for(int i=0; i<this.cc.length; i++) this.cc[i] = new Address(st.nextToken());
traces.copyInto(this.traces = new Trace[traces.size()]);
allHeaders = all.toString();
StringBuffer body = new StringBuffer();
- int lines = 0;
- for(String s = rs.readLine();; s = rs.readLine()) { if (s == null) break; lines++; body.append(s + "\r\n"); }
+ for(String s = rs.readLine();; s = rs.readLine()) {
+ if (s == null) break;
+ lines++;
+ body.append(s); // FIXME: we're assuming all mail messages fit in memory
+ body.append("\r\n");
+ }
this.lines = lines;
this.body = body.toString();
} catch (IOException e) { throw new MailException.IOException(e); }
// use null-sender for error messages (don't send errors to the null addr)
public Message bounce(String reason) { throw new RuntimeException("bounce not implemented"); } // FIXME!
-
- private static class CaseInsensitiveHash extends Hashtable {
- public Object get(Object o) { return (o instanceof String) ? super.get(((String)o).toLowerCase()) : super.get(o); }
- public Object put(Object k, Object v) { throw new Error("you cannot write to a CaseInsensitiveHash"); }
- void add(Object k, Object v) { if (k instanceof String) super.put(((String)k).toLowerCase(), v); else super.put(k, v); }
+
+ public static class CaseInsensitiveHash extends org.ibex.js.JSReflection {
+ private Hashtable stuff = new Hashtable();
+ public Object get(Object o) { return stuff.get(((String)o).toLowerCase()); }
+ void add(Object k, Object v) { if (k instanceof String) stuff.put(((String)k).toLowerCase(), v); else stuff.put(k, v); }
}
}
projects / org.ibex.mail.git / blobdiff