+// Copyright 2000-2005 the Contributors, as shown in the revision logs.
+// Licensed under the Apache Public Source License 2.0 ("the License").
+// You may not use this file except in compliance with the License.
+
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 java.util.*;
import java.net.*;
import java.io.*;
+// 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
-// folded headers: can insert CRLF anywhere that whitespace appears (before the whitespace)
// date/time parsing: see spec, 3.3
-// FEATURE: MIME RFC2045, 2046, 2049
+// 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)
// FEATURE: threading as in http://www.jwz.org/doc/threading.html
+// FEATURE: lazy body
+// FIXME RFC822 1,000-char limit per line
-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 String body; // entire 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 String subject;
- public final String messageid;
- public final Address[] cc;
- public final Address[] bcc;
- public final Hashtable[] resent;
- public final Trace[] traces;
-
- public final Address envelopeFrom;
- public final Address[] envelopeTo;
-
- public final Date arrival; // when the message first arrived at this machine
-
- public void dump(OutputStream os) throws IOException {
- Writer w = new OutputStreamWriter(os);
- w.write(allHeaders);
- w.write("\r\n");
- w.write(body);
- w.flush();
- }
+/**
+ * [immutable] This class encapsulates a message "floating in the
+ * ether": RFC2822 data but no storage-specific flags or other
+ * metadata.
+ */
+public class Message extends MIME.Part {
- /*
- public static class StoredMessage extends Message {
- public int uid;
- public boolean deleted = false;
- public boolean read = false;
- public boolean answered = false;
- public StoredMessage(LineReader rs) throws IOException, MailException.Malformed { super(rs); }
- }
- */
-
- public class Trace {
- final String returnPath;
- final Element[] elements;
- public Trace(LineReader lr) throws Trace.Malformed, IOException {
- String retPath = lr.readLine();
- 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();
- if (s == null) break;
- if (!s.startsWith("Received:")) { lr.pushback(s); break; }
- s = s.substring(9).trim();
- el.addElement(new Element(s));
- }
- elements = new Element[el.size()];
- el.copyInto(elements);
- }
- public class Element {
- String fromDomain;
- String fromIP;
- String toDomain;
- String forWhom;
- Date date;
- public Element(String fromDomain, String fromIP, String toDomain, String forWhom, Date date) {
- this.fromDomain=fromDomain; this.fromIP=fromIP; this.toDomain=toDomain; this.forWhom=forWhom; this.date=date; }
- public Element(String s) throws Trace.Malformed {
- StringTokenizer st = new StringTokenizer(s);
- if (!st.nextToken().equals("FROM")) throw new Trace.Malformed("trace did note have a FROM element: " + s);
- fromDomain = st.nextToken();
- if (!st.nextToken().equals("BY")) throw new Trace.Malformed("trace did note have a BY element: " + s);
- toDomain = st.nextToken();
- // FIXME not done yet
+ // Parsed Headers //////////////////////////////////////////////////////////////////////////////
+
+ public final Address to;
+ public final Address from; // if multiple From entries, this is sender
+ public final Address envelopeFrom;
+ public final Address envelopeTo;
+ public final Date date;
+ public final Date arrival;
+ 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 Address[] bcc;
+
+ public static Message newMessage(Stream stream) throws Malformed { return newMessage(stream, null, null); }
+ public static Message newMessage(Stream stream, Address from, Address to) throws Malformed {
+ if (from == null && to == null) return new Message(stream);
+ StringBuffer sb = new StringBuffer();
+ boolean inheaders = true;
+ if (from != null) sb.append("Return-Path: " + from.toString(true) + "\r\n");
+ while(true) {
+ String s = stream.readln();
+ if (s == null) break;
+ if (inheaders && to != null && s.toLowerCase().startsWith("envelope-to:")) continue;
+ if (inheaders && from != null && s.toLowerCase().startsWith("return-path:")) continue;
+ if (s.length() == 0 && inheaders) {
+ inheaders = false;
+ if (to != null) sb.append("Envelope-To: " + to.toString(true) + "\r\n");
}
+ sb.append(s);
+ sb.append("\r\n");
}
- public class Malformed extends Message.Malformed { public Malformed(String s) { super(s); } }
+ return newMessage(new Stream(sb.toString()));
+ }
+ private Message(Stream stream) throws Malformed {
+ super(stream, null, false);
+ this.envelopeTo = headers.gets("Envelope-To") != null ? Address.parse(headers.gets("Envelope-To")) : null;
+ this.envelopeFrom = headers.gets("Return-Path") != null ? Address.parse(headers.gets("Return-Path")) : null;
+ this.to = headers.gets("To") != null ? Address.parse(headers.gets("To")) : this.envelopeTo;
+ this.from = headers.gets("From") != null ? Address.parse(headers.gets("From")) : this.envelopeFrom;
+ this.replyto = headers.gets("Reply-To") == null ? null : Address.parse(headers.gets("Reply-To"));
+ this.subject = headers.gets("Subject");
+ this.messageid = headers.gets("Message-Id");
+ this.cc = Address.list(headers.gets("Cc"));
+ this.bcc = Address.list(headers.gets("BCc"));
+ this.date = parseDate(headers.gets("Date")) == null ? new Date() : parseDate(headers.gets("Date"));
+ this.arrival = this.date; // FIXME wrong
}
- public static class Malformed extends MailException.Malformed { public Malformed(String s) { super(s); } }
- public Message(Address envelopeFrom, Address[] envelopeTo, LineReader rs) throws IOException, MailException.Malformed {
- this.envelopeFrom = envelopeFrom;
- this.envelopeTo = envelopeTo;
- this.arrival = new Date();
- this.headers = new Hashtable();
- 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");
- headers.put(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<s.length(); i++)
- if (s.charAt(i) < 33 || s.charAt(i) > 126)
- throw new Malformed("Header key contains invalid character \"" + s.charAt(i) + "\"");
- String val = s.substring(0, s.indexOf(':'));
- 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;
- headers.put(key, val);
- }
- }
- this.date = (Date)headers.get("Date");
- this.to = new Address((String)headers.get("To"));
- this.from = new Address((String)headers.get("From"));
- this.replyto = 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];
- }
- 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());
- } 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 = rs.readLine();; s = rs.readLine()) { if (s == null) break; else body.append(s + "\r\n"); }
- this.body = body.toString();
- }
+ // Helpers /////////////////////////////////////////////////////////////////////////////
// http://www.jwz.org/doc/mid.html
private static final Random random = new Random();
return ret.toString();
}
- public String summary() {
- return
- " Subject: " + subject + "\n" +
- " EnvelopeFrom: " + envelopeFrom + "\n" +
- " EnvelopeTo: " + envelopeTo + "\n" +
- " MessageId: " + messageid;
- }
-
+ public static Date parseDate(String s) { return null; } // FIXME!!!
+
+ // use null-sender for error messages (don't send errors to the null addr)
public Message bounce(String reason) {
- // use null-sender for error messages (don't send errors to the null addr)
- // FIXME
- throw new RuntimeException("bounce not implemented");
+ Log.warn(Message.class, "bounce not implemented");
+ return null;
+ } // FIXME!
+
+ public String summary() { return "[" + envelopeFrom + " -> " + envelopeTo + "] " + subject; }
+
+ public void dump(Stream s) {
+ s.setNewline("\r\n");
+ s.println(headers.raw);
+ s.println("");
+ s.println(body);
+ s.flush();
}
+
+ public int size() { return headers.raw.length() + 2 /* CRLF */ + body.length(); }
+ public String toString() { return headers.raw + "\r\n" + body; }
+
+ public static class Malformed extends Exception { public Malformed(String s) { super(s); } }
}
+
projects / org.ibex.mail.git / blobdiff