import org.ibex.crypto.*;
import org.ibex.util.*;
import org.ibex.mail.protocol.*;
+import org.ibex.js.*;
import org.ibex.io.*;
+import org.ibex.io.Fountain;
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
-// date/time parsing: see spec, 3.3
-
+// FIXME: this is important: folded headers: can insert CRLF anywhere that whitespace appears (before the whitespace)
// FIXME: messages must NEVER contain 8-bit binary data; this is a violation of IMAP
+// FIXME: RFC822 1,000-char limit per line [soft line limit (suggested): 78 chars / hard line limit: 998 chars]
// 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
/**
* [immutable] This class encapsulates a message "floating in the
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);
+ public static Message newMessage(Fountain in) throws Malformed { return new Message(in); }
+
+ // FIXME
+ public static Message newMessage(Fountain in, Address from, Address to) throws Malformed {
StringBuffer sb = new StringBuffer();
- boolean inheaders = true;
if (from != null) sb.append("Return-Path: " + from.toString(true) + "\r\n");
+ Stream stream = in.getStream();
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 && s.toLowerCase().startsWith("envelope-to:")) continue;
+ if (from != null && s.toLowerCase().startsWith("return-path:")) continue;
+ if (s.length() == 0) {
if (to != null) sb.append("Envelope-To: " + to.toString(true) + "\r\n");
+ sb.append("\r\n");
+ break;
}
sb.append(s);
sb.append("\r\n");
}
- return newMessage(new Stream(sb.toString()));
+ for(String s = stream.readln(); s != null; s = stream.readln()) {
+ sb.append(s);
+ sb.append("\r\n");
+ }
+ return new Message(new Fountain.StringFountain(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
+
+ private Message(Fountain in) throws Malformed {
+ super(in);
+ this.envelopeTo = headers.get("Envelope-To") != null ? Address.parse(headers.get("Envelope-To")) : null;
+ this.envelopeFrom = headers.get("Return-Path") != null ? Address.parse(headers.get("Return-Path")) : null;
+ this.to = headers.get("To") != null ? Address.parse(headers.get("To")) : this.envelopeTo;
+ this.from = headers.get("From") != null ? Address.parse(headers.get("From")) : this.envelopeFrom;
+ this.replyto = headers.get("Reply-To") == null ? null : Address.parse(headers.get("Reply-To"));
+ this.subject = headers.get("Subject");
+ this.messageid = headers.get("Message-Id");
+ this.cc = Address.list(headers.get("Cc"));
+ this.bcc = Address.list(headers.get("Bcc"));
+ this.date = parseDate(headers.get("Date")) == null ? new Date() : parseDate(headers.get("Date"));
+ this.arrival = this.date; // FIXME wrong; grab this from traces?
}
return ret.toString();
}
- public static Date parseDate(String s) { return null; } // FIXME!!!
+ public static Date parseDate(String s) {
+ // FIXME!!! this must be robust
+ // date/time parsing: see spec, 3.3
+ return null;
+ }
// use null-sender for error messages (don't send errors to the null addr)
public Message bounce(String reason) {
return null;
} // FIXME!
+ public String toString() { throw new RuntimeException("Message.toString() called"); }
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 String coerceToString() { return toString(); }
-
public static class Malformed extends Exception { public Malformed(String s) { super(s); } }
}
projects / org.ibex.mail.git / blobdiff