X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fmail%2FMessage.java;h=cb430396946b654ecff4602762e10716bc704681;hb=842351b4a6b67ebe088bf56347b919e24f447391;hp=9d91a18304ee32fae234e3f434fb147bf4619229;hpb=31f6bfd3b57924e8c3d506592132e91e73145462;p=org.ibex.mail.git diff --git a/src/org/ibex/mail/Message.java b/src/org/ibex/mail/Message.java index 9d91a18..cb43039 100644 --- a/src/org/ibex/mail/Message.java +++ b/src/org/ibex/mail/Message.java @@ -13,14 +13,10 @@ import java.util.*; import java.net.*; import java.io.*; -// FIXME: body constraints (how to enforce?) +// FEATURE: body constraints (how to enforce without reading stream, though?) // - messages must NEVER contain 8-bit binary data; this is a violation of IMAP // - 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: threading as in http://www.jwz.org/doc/threading.html - /** * [immutable] This class encapsulates a message "floating in the * ether": RFC2822 data but no storage-specific flags or other @@ -42,54 +38,32 @@ public class Message extends MIME.Part { public final Address[] cc; public final Address[] bcc; - public static Message newMessage(Fountain in) throws Malformed { return new Message(in); } - + public static Message newMessage(Fountain in) throws Malformed { return new Message(in, null); } + public static Message newMessageFromHeadersAndBody(Headers head, Fountain body, Address from, Address to) throws Malformed { + return new Message(Fountain.Util.concat(head, Fountain.Util.create("\r\n"), body), + new String[] { + "Return-Path", from==null ? "<>" : from.toString(true), + "Envelope-To", to.toString(true) + }); + } /* - public Message reply(Fountain in, Address from, boolean includeReInSubject) throws Malformed { - Address to = null; - if (to==null) to = Address.parse(headers.get("reply-to")); - if (to==null) to = Address.parse(headers.get("from")); - if (to==null) to = envelopeFrom; - if (to==null) throw new Malformed("cannot reply to a message without a return address"); - Message ret = newMessage(in, from, to); - ret.headers.put("In-Reply-To", messageid); - String references = headers.get("references"); - ret.headers.put("References", messageid + (references==null?"":(" "+references))); - if (includeReInSubject && subject!=null && !subject.toLowerCase().trim().startsWith("re:")) - headers.put("subject", "Re: "+subject); - return ret; + public static Message newMessageWithEnvelope(Fountain in, Address from, Address to) throws Malformed { + return new Message(in, + new String[] { + "Return-Path", from==null ? "<>" : from.toString(true), + "Envelope-To", to.toString(true) + }); } */ - - // FIXME - //public static Message newMessage(Headers headers, Fountain body, Address from, Address to) throws Malformed { - //} - - public static Message newMessage(Fountain in, Address from, Address to) throws Malformed { - StringBuffer sb = new StringBuffer(); - 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 || s.length() == 0) { - if (to != null) sb.append("Envelope-To: " + to.toString(true) + "\r\n"); - sb.append("\r\n"); - break; - } - if (to != null && s.toLowerCase().startsWith("envelope-to:")) continue; - if (s.toLowerCase().startsWith("return-path:")) continue; - sb.append(s); - sb.append("\r\n"); - } - 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())); + public Message withEnvelope(Address from, Address to) { + return new Message(this, + new String[] { + "Return-Path", from==null ? "<>" : from.toString(true), + "Envelope-To", to.toString(true) + }); } - - private Message(Fountain in) throws Malformed { - super(in); + private Message(Fountain in, String[] keyval) throws Malformed { + super(in, keyval); 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; @@ -100,39 +74,14 @@ public class Message extends MIME.Part { 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")); - - // reenable this once whitelisting is moved out of javascript - //if (this.messageid==null) - //throw new RuntimeException("every RFC2822 message must have a Message-ID: header"); - - /* - // synthesize a message-id if not provided - this.messageid = headers.get("Message-Id") == null ? generateFreshMessageId(sha1(in.getStream())) : headers.get("Message-Id"); - if (headers.get("Message-Id") == null) { - headers = headers.set("Message-Id", this.messageid); - Log.warn(Message.class, "synthesizing message-id for " + summary()); - } - */ + Date date = RobustDateParser.parseDate(headers.get("Date")); + this.date = date==null ? new Date() : date; + this.arrival = this.date; // FIXME wrong: should grab this from traces, I think? - this.arrival = this.date; // FIXME wrong; grab this from traces? + if (this.messageid == null) + throw new RuntimeException("every RFC2822 message must have a Message-ID: header"); } - /* - private static String sha1(Stream stream) { - SHA1 sha1 = new SHA1(); - byte[] b = new byte[1024]; - while(true) { - int numread = stream.read(b, 0, b.length); - if (numread == -1) break; - sha1.update(b, 0, numread); - } - byte[] results = new byte[sha1.getDigestSize()]; - sha1.doFinal(results, 0); - return new String(Encode.toBase64(results)); - } - */ - // Helpers ///////////////////////////////////////////////////////////////////////////// @@ -142,6 +91,7 @@ public class Message extends MIME.Part { return generateFreshMessageId(Base36.encode(System.currentTimeMillis())+'.'+ Base36.encode(random.nextLong())); } + // FEATURE: sha1-based deterministic messageids? probably only useful for some virtual Mailbox impls though public static String generateFreshMessageId(String seed) { StringBuffer ret = new StringBuffer(); ret.append('<'); @@ -152,16 +102,37 @@ public class Message extends MIME.Part { return ret.toString(); } - public static Date parseDate(String s) { - // FIXME!!! this must be robust - // date/time parsing: see spec, 3.3 - return null; + // FIXME: untested. Do we really want to duplicate all the old headers??? + public Message reply(Fountain body, Address from, boolean includeReInSubject) throws Malformed { + return reply(new String[0], body, from, includeReInSubject); + } + public Message reply(String[] keyval, Fountain body, Address envelopeFrom, boolean includeReInSubject) throws Malformed { + Address to = null; + if (to==null) to = Address.parse(headers.get("reply-to")); + if (to==null) to = Address.parse(headers.get("from")); + if (to==null) to = this.envelopeFrom; + if (to==null) throw new Malformed("cannot reply to a message without a return address"); + String references = headers.get("references"); + String subject = this.subject; + if (includeReInSubject && subject!=null && !subject.toLowerCase().trim().startsWith("re:")) + subject = "Re: "+subject; + Headers h = new Headers(new Headers(new String[] { + "To", to.toString(true), + "Message-Id", generateFreshMessageId(), + "Date", new Date()+"" /*FIXME!!!*/, + "Subject", subject, + "In-Reply-To", messageid, + "References", messageid + (references==null?"":(" "+references)) + }), keyval); + return newMessageFromHeadersAndBody(h, body, from, to); } // this is belived to be compliant with QSBMF (http://cr.yp.to/proto/qsbmf.txt) public Message bounce(String reason) { if (envelopeFrom==null || envelopeFrom.toString().equals("")) return null; + // FIXME: limit bounce body size + // FIXME: include headers from bounced message Log.warn(Message.class, "bouncing message due to: " + reason); Headers h = new Headers(headers, new String[] { "Envelope-To", envelopeFrom.toString(),