X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fmail%2FMessage.java;h=b1c8e0a7877ed1b18d50a388a03ab8457de1ae2c;hb=36f116445938fea33e79f121712c1d258e6d0f8a;hp=63ef363ca624530b32ac8851458aa0368f479950;hpb=a1ebce864e9a305eaa75188f6e1c03f2e7245a86;p=org.ibex.mail.git diff --git a/src/org/ibex/mail/Message.java b/src/org/ibex/mail/Message.java index 63ef363..b1c8e0a 100644 --- a/src/org/ibex/mail/Message.java +++ b/src/org/ibex/mail/Message.java @@ -6,24 +6,16 @@ package org.ibex.mail; 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: 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 +// 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] /** * [immutable] This class encapsulates a message "floating in the @@ -46,39 +38,57 @@ public class Message extends MIME.Part { 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"); - } - return newMessage(new Stream(sb.toString())); + 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) + }); } - 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 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) + }); + } + */ + 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, 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; + 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"); + String messageid = headers.get("Message-Id"); + this.cc = Address.list(headers.get("Cc")); + this.bcc = Address.list(headers.get("Bcc")); + 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? + + if (messageid == null) { + SHA1 sha1 = new SHA1(); + Stream s = this.getStream(); + s.setInputDigest(sha1); + s.transcribe(new Stream(new NullOutputStream())); + byte[] end = new byte[sha1.getDigestSize()]; + sha1.doFinal(end, 0); + messageid = ""; + Log.info(this, "synthesized messageid " + messageid); + } + this.messageid = messageid; } @@ -87,38 +97,98 @@ public class Message extends MIME.Part { // http://www.jwz.org/doc/mid.html private static final Random random = new Random(); public static String generateFreshMessageId() { + 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('<'); - ret.append(Base36.encode(System.currentTimeMillis())); - ret.append('.'); - ret.append(Base36.encode(random.nextLong())); - ret.append('.'); + ret.append(seed); + ret.append('@'); try { ret.append(InetAddress.getLocalHost().getHostName()); } catch (UnknownHostException e) { /* DELIBERATE */ } ret.append('>'); return ret.toString(); } - public static Date parseDate(String s) { return null; } // FIXME!!! - - // use null-sender for error messages (don't send errors to the null addr) + // 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) { - 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(); + 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(), + "Return-Path", "<>", + "From", "MAILER-DAEMON <>", + "To", envelopeFrom.toString(), + "Subject", "failure notice" + }); + + String error = + "\r\n"+ + "Hi. This is the Ibex Mail Server. I'm afraid I wasn't able to deliver\r\n"+ + "your message to the following addresses. This is a permanent error;\r\n"+ + "I've given up. Sorry it didn't work out\r\n."+ + "\r\n"+ + "<"+envelopeTo.toString()+">:\r\n"+ + reason+"\r\n"+ + "\r\n"+ + "--- Below this line is a copy of the message.\r\n"+ + "\r\n"; + + try { + return newMessage(Fountain.Util.concat(h, Fountain.Util.create(error), getBody())); + } catch (Message.Malformed e) { + Log.error(this, "caught Message.Malformed in Message.bounce(); this should never happen"); + Log.error(this, e); + return null; + } } - public int size() { return headers.raw.length() + 2 /* CRLF */ + body.length(); } - public String toString() { return headers.raw + "\r\n" + body; } + public String toString() { throw new RuntimeException("Message.toString() called"); } + public final String summary() { return "[" + envelopeFrom + " -> " + envelopeTo + "] " + subject; } - public static class Malformed extends Exception { public Malformed(String s) { super(s); } } + public static class Malformed extends MailException { public Malformed(String s) { super(s); } } + + /** reads an SMTP-style dot-escaped message */ + static Message readDotEncodedMessage(Stream conn) { + StringBuffer buf = new StringBuffer(); + while(true) { + String s = conn.readln(); + if (s == null) throw new RuntimeException("connection closed"); + if (s.equals(".")) break; + if (s.startsWith(".")) s = s.substring(1); + buf.append(s); + buf.append("\r\n"); + } + return Message.newMessage(new Fountain.StringFountain(buf.toString())); + } }