X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fmail%2FMessage.java;h=6738dc81b98bc88b17616377ded9d5610ccb80b0;hb=d09dce5d1445a002fc5a91c51d4d042f7e986d4a;hp=2aa933138bfff0482ea4479a347a15efffc93209;hpb=061ffff05bec1bda946025bd87097ecafec4fbe9;p=org.ibex.mail.git diff --git a/src/org/ibex/mail/Message.java b/src/org/ibex/mail/Message.java index 2aa9331..6738dc8 100644 --- a/src/org/ibex/mail/Message.java +++ b/src/org/ibex/mail/Message.java @@ -1,181 +1,115 @@ +// 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.js.*; +import org.ibex.io.*; +import org.ibex.io.Fountain; import java.util.*; import java.net.*; import java.io.*; -// 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 - // 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: mailing list header parsing (?) // FEATURE: threading as in http://www.jwz.org/doc/threading.html -// FEATURE: lazy body /** * [immutable] This class encapsulates a message "floating in the * ether": RFC2822 data but no storage-specific flags or other * metadata. */ -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 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 void dump(OutputStream os) throws IOException { - Writer w = new OutputStreamWriter(os); - w.write("X-org.ibex.mail-envelopeFrom: " + envelopeFrom + "\r\n"); - w.write("X-org.ibex.mail-envelopeTo: " + envelopeTo + "\r\n"); - w.write(allHeaders); - w.write("\r\n"); - w.write(body); - w.flush(); +public class Message extends MIME.Part { + + // 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); } + + 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; + 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; + */ + // FIXME + return null; } - 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)); + // 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; } - elements = new Element[el.size()]; - el.copyInto(elements); + if (to != null && s.toLowerCase().startsWith("envelope-to:")) continue; + if (s.toLowerCase().startsWith("return-path:")) continue; + sb.append(s); + sb.append("\r\n"); } - 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 - } + for(String s = stream.readln(); s != null; s = stream.readln()) { + sb.append(s); + sb.append("\r\n"); } - public class Malformed extends Message.Malformed { public Malformed(String s) { super(s); } } + return new Message(new Fountain.StringFountain(sb.toString())); } - public static class Malformed extends MailException.Malformed { public Malformed(String s) { super(s); } } + 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")); + + // RFC2822 requires a "Date" field, so we synthesize one if missing + if (headers.get("Date") == null) + headers.set("Date", this.date.toString()); // FIXME: formatting + + this.arrival = this.date; // FIXME wrong; grab this from traces? + } - public Message(Address envelopeFrom, Address envelopeTo, String s, Date arrival) - { this(envelopeFrom, envelopeTo, new LineReader(new StringReader(s)), arrival); } - public Message(Address envelopeFrom, Address envelopeTo, LineReader rs) { this(envelopeFrom, envelopeTo, rs, null); } - public Message(Address envelopeFrom, Address envelopeTo, LineReader rs, Date arrival) { - try { - this.arrival = arrival == null ? new Date() : 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(); - 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"); - ((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 (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 if (key.equals("X-org.ibex.mail.headers.envelopeFrom")) { - if (envelopeFrom == null) envelopeFrom = new Address(val); - } else if (key.equals("X-org.ibex.mail.headers.envelopeTo")) { - 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) { - StringTokenizer st = new StringTokenizer((String)headers.get("Cc")); - this.cc = new Address[st.countTokens()]; - for(int i=0; i", + "From", "MAILER-DAEMON <>", + "To", envelopeFrom.toString(), + "Subject", "failure notice" + }); + + String error = + "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"; - private static class CaseInsensitiveHash extends Hashtable { - public Object get(Object o) { return (o instanceof String) ? super.get(((String)o).toLowerCase()) : super.get(o); } - public Object put(Object k, Object v) { throw new Error("you cannot write to a CaseInsensitiveHash"); } - void add(Object k, Object v) { if (k instanceof String) super.put(((String)k).toLowerCase(), v); else super.put(k, v); } + try { + return newMessage(new Fountain.Concatenate(new Fountain.StringFountain(h.getString()+"\r\n"+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); } } } +