package org.ibex.mail;
import org.ibex.crypto.*;
-import org.ibex.js.*;
import org.ibex.util.*;
import org.ibex.mail.protocol.*;
+import org.ibex.io.*;
+import org.ibex.net.*;
import java.util.*;
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)
* ether": RFC2822 data but no storage-specific flags or other
* metadata.
*/
-public class Message extends JSReflection {
+public class Message extends org.ibex.js.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(allHeaders);
- w.write("X-IbexMail-EnvelopeFrom: " + envelopeFrom + "\r\n");
- w.write("X-IbexMail-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 int size() { return allHeaders.length() + 2 /* CRLF */ + body.length(); }
+ public String toString() { return allHeaders + "\r\n" + body; }
+
+ public void dump(Stream s) {
+ s.setNewline("\r\n");
+ s.println("X-org.ibex.mail.headers.envelope.From: " + envelopeFrom);
+ s.println("X-org.ibex.mail.headers.envelope.To: " + envelopeTo);
+ s.println(allHeaders);
+ s.println();
+ s.println(body);
+ s.flush();
}
public class Trace {
final String returnPath;
final Element[] elements;
- public Trace(LineReader lr) throws Trace.Malformed, IOException {
- String retPath = lr.readLine();
+ public Trace(Stream stream) throws Trace.Malformed {
+ String retPath = stream.readln();
if (!retPath.startsWith("Return-Path:")) throw new Trace.Malformed("trace did not start with Return-Path header");
returnPath = retPath.substring(12).trim();
Vec el = new Vec();
while(true) {
- String s = lr.readLine();
+ String s = stream.readln();
if (s == null) break;
- if (!s.startsWith("Received:")) { lr.pushback(s); break; }
+ if (!s.startsWith("Received:")) { stream.unread(s); break; }
s = s.substring(9).trim();
el.addElement(new Element(s));
}
public class Malformed extends Message.Malformed { public Malformed(String s) { super(s); } }
}
- public static class Malformed extends MailException.Malformed { public Malformed(String s) { super(s); } }
- public Message(Address envelopeFrom, Address[] envelopeTo, LineReader rs) {
- try {
- this.arrival = new Date();
- this.headers = new CaseInsensitiveHash();
- String key = null;
- StringBuffer all = new StringBuffer();
- Date date = null;
- 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();
- for(String s = rs.readLine(); s != null && !s.equals(""); s = rs.readLine()) {
- all.append(s);
- 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");
- ((CaseInsensitiveHash)headers).add(key, headers.get(key) + s);
- continue;
- }
- if (s.indexOf(':') == -1) throw new Malformed("Header line does not contain colon: " + s);
- key = s.substring(0, s.indexOf(':'));
- for(int i=0; i<key.length(); i++)
- if (key.charAt(i) < 33 || key.charAt(i) > 126)
- throw new Malformed("Header key \""+key+"\" contains invalid character \"" + key.charAt(i) + "\"");
- String val = s.substring(s.indexOf(':') + 1).trim();
- while(Character.isSpace(val.charAt(0))) val = val.substring(1);
- if (key.startsWith("Resent-")) {
- if (key.startsWith("Resent-From")) resent.addElement(new Hashtable());
- ((Hashtable)resent.lastElement()).put(key.substring(7), val);
- } else if (key.startsWith("Return-Path:")) {
- rs.pushback(s); traces.addElement(new Trace(rs));
- } 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);
- }
- }
-
- // FIXME what if all are null?
- this.to = headers.get("To") == null ? envelopeTo[0] : 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.date = (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) {
- 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());
- } else {
- this.cc = new Address[0];
+ public static class Malformed extends Exception { public Malformed(String s) { super(s); } }
+
+ public Message(Address from, Address to, String s, Date arrival) throws Malformed {this(from,to,new Stream(s), arrival); }
+ public Message(Address from, Address to, Stream in) throws Malformed { this(from, to, in, new Date()); }
+ public Message(Address envelopeFrom, Address envelopeTo, Stream stream, Date arrival) throws Malformed {
+ this.arrival = arrival;
+ this.headers = new CaseInsensitiveHash();
+ Vec envelopeToHeader = new Vec();
+ String key = null;
+ StringBuffer all = new StringBuffer();
+ Date date = null;
+ 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 = stream.readln(); s != null && !s.equals(""); s = stream.readln()) {
+ 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");
+ ((CaseInsensitiveHash)headers).add(key, headers.get(key) + s);
+ continue;
}
- if (headers.get("Bcc") != null) {
- StringTokenizer st = new StringTokenizer((String)headers.get("Bcc"));
- this.bcc = new Address[st.countTokens()];
- for(int i=0; i<this.bcc.length; i++) this.bcc[i] = new Address(st.nextToken());
+ if (s.indexOf(':') == -1) throw new Malformed("Header line does not contain colon: " + s);
+ key = s.substring(0, s.indexOf(':'));
+ for(int i=0; i<key.length(); i++)
+ if (key.charAt(i) < 33 || key.charAt(i) > 126)
+ throw new Malformed("Header key \""+key+"\" contains invalid character \"" + key.charAt(i) + "\"");
+ String val = s.substring(s.indexOf(':') + 1).trim();
+ while(val.length() > 0 && Character.isSpace(val.charAt(0))) val = val.substring(1);
+ if (key.startsWith("Resent-")) {
+ if (resent.size() == 0 || key.startsWith("Resent-From")) resent.addElement(new Hashtable());
+ ((Hashtable)resent.lastElement()).put(key.substring(7), val);
+ } else if (key.startsWith("Return-Path")) {
+ stream.unread(s); traces.addElement(new Trace(stream));
+ } else if (key.equals("X-org.ibex.mail.headers.envelope.From")) {
+ try { if (envelopeFrom == null) envelopeFrom = new Address(val);
+ } catch (Address.Malformed a) { Log.warn(this, a); }
+ } else if (key.equals("X-org.ibex.mail.headers.envelope.To")) {
+ try {if (envelopeTo == null) envelopeTo = new Address(val);
+ } catch (Address.Malformed a) { Log.warn(this, a); }
} else {
- this.bcc = new Address[0];
- }
- resent.copyInto(this.resent = new Hashtable[resent.size()]);
- 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"); }
- this.lines = lines;
- this.body = body.toString();
- } catch (IOException e) { throw new MailException.IOException(e); }
+ // 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);
+ }
+ }
+
+ // FIXME what if all are null?
+ this.to = headers.get("To") == null ? envelopeTo : Address.parse((String)headers.get("To"));
+ this.from = headers.get("From") == null ? envelopeFrom : Address.parse((String)headers.get("From"));
+ 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 : Address.parse((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] = Address.parse(st.nextToken());
+ } else {
+ this.cc = new Address[0];
+ }
+ if (headers.get("Bcc") != null) {
+ StringTokenizer st = new StringTokenizer((String)headers.get("Bcc"));
+ this.bcc = new Address[st.countTokens()];
+ for(int i=0; i<this.bcc.length; i++) this.bcc[i] = Address.parse(st.nextToken());
+ } else {
+ this.bcc = new Address[0];
+ }
+ resent.copyInto(this.resent = new Hashtable[resent.size()]);
+ traces.copyInto(this.traces = new Trace[traces.size()]);
+ allHeaders = all.toString();
+ StringBuffer body = new StringBuffer();
+ for(String s = stream.readln();; s = stream.readln()) {
+ 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();
}
-
+
// http://www.jwz.org/doc/mid.html
private static final Random random = new Random();
public static String generateFreshMessageId() {
return ret.toString();
}
- public int rfc822size() { return allHeaders.length() + 2 /* CRLF */ + body.length(); } // FIXME: double check this
+ // 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!
+
+ 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); }
+ }
public String summary() {
return
" EnvelopeTo: " + envelopeTo + "\n" +
" MessageId: " + messageid;
}
-
- // 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); }
- }
-
}
projects / org.ibex.mail.git / blobdiff