X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fmail%2FMessage.java;h=b1c8e0a7877ed1b18d50a388a03ab8457de1ae2c;hb=1975b1d7755c8a92480a8847f9dd3dc476f95ff5;hp=bb9c69cb8a9fda9b47c04c380a0451ec68d2c379;hpb=1a1f247c32e53cd4e776e5fb47c3c171bfd84fac;p=org.ibex.mail.git diff --git a/src/org/ibex/mail/Message.java b/src/org/ibex/mail/Message.java index bb9c69c..b1c8e0a 100644 --- a/src/org/ibex/mail/Message.java +++ b/src/org/ibex/mail/Message.java @@ -1,219 +1,194 @@ +// 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.util.*; import org.ibex.mail.protocol.*; +import org.ibex.js.*; import org.ibex.io.*; -import org.ibex.net.*; +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 +// 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 * ether": RFC2822 data but no storage-specific flags or other * metadata. */ -public class Message extends org.ibex.js.JSReflection { - - public final String allHeaders; // pristine headers - 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 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; IMAP "internal date message attr" - - public int size() { return allHeaders.length() + 2 /* CRLF */ + body.length(); } - public String toString() { return allHeaders + "\r\n" + body; } - public void dump(Stream s) { - s.out.setNewline("\r\n"); - s.out.println("X-org.ibex.mail.headers.envelope.From: " + envelopeFrom); - s.out.println("X-org.ibex.mail.headers.envelope.To: " + envelopeTo); - s.out.println(allHeaders); - s.out.println(); - s.out.println(body); - s.out.flush(); - } +public class Message extends MIME.Part { - public class Trace { - final String returnPath; - final Element[] elements; - public Trace(Stream stream) throws Trace.Malformed { - String retPath = stream.in.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 = stream.in.readln(); - if (s == null) break; - if (!s.startsWith("Received:")) { stream.in.unread(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 - } - } - public class Malformed extends Message.Malformed { public Malformed(String s) { super(s); } } + // 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(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 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); - public static class Malformed extends RuntimeException { public Malformed(String s) { super(s); } } - - public Message(Address from, Address to, String s, Date arrival) { this(from, to, new Stream(s), arrival); } - public Message(Address from, Address to, Stream in) { this(from, to, in, new Date()); } - public Message(Address envelopeFrom, Address envelopeTo, Stream stream, Date arrival) { - 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.in.readln(); s != null && !s.equals(""); s = stream.in.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 (s.indexOf(':') == -1) throw new Malformed("Header line does not contain colon: " + s); - key = s.substring(0, s.indexOf(':')); - for(int i=0; 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.in.unread(s); traces.addElement(new Trace(stream)); - } else if (key.equals("X-org.ibex.mail.headers.envelope.From")) { - if (envelopeFrom == null) envelopeFrom = new Address(val); - } else if (key.equals("X-org.ibex.mail.headers.envelope.To")) { - if (envelopeTo == null) envelopeTo = new Address(val); - } 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 : 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 ? this.to : envelopeTo; - - this.date = new Date(); // FIXME (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) { - // FIXME: tokenize better - StringTokenizer st = new StringTokenizer((String)headers.get("Cc"), ","); - this.cc = new Address[st.countTokens()]; - for(int i=0; i"; + Log.info(this, "synthesized messageid " + messageid); } - this.lines = lines; - this.body = body.toString(); + this.messageid = messageid; } - + + + // Helpers ///////////////////////////////////////////////////////////////////////////// + // 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(); } - // 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); } + // 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(), + "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"; - public String summary() { - return - " Subject: " + subject + "\n" + - " EnvelopeFrom: " + envelopeFrom + "\n" + - " EnvelopeTo: " + envelopeTo + "\n" + - " MessageId: " + messageid; + 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 String toString() { throw new RuntimeException("Message.toString() called"); } + public final String summary() { return "[" + envelopeFrom + " -> " + envelopeTo + "] " + subject; } + + 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())); } } +