X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fmail%2FMessage.java;h=73ab0f89e876684bfd915278828910c31f84894b;hb=866504299bfc44999e6cbb6c518a431d59908e65;hp=882ca9fe699e9b8530569832122bf8aabd324f8f;hpb=440e9bee20802bfbf97061b01f950448d3baf8f5;p=org.ibex.mail.git diff --git a/src/org/ibex/mail/Message.java b/src/org/ibex/mail/Message.java index 882ca9f..73ab0f8 100644 --- a/src/org/ibex/mail/Message.java +++ b/src/org/ibex/mail/Message.java @@ -13,12 +13,9 @@ import java.util.*; import java.net.*; import java.io.*; -// 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: threading as in http://www.jwz.org/doc/threading.html +// 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 @@ -41,66 +38,57 @@ 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 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 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) + }); } - - // 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 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); - 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"); + String 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? + 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; } @@ -109,30 +97,53 @@ 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) { - // 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.Original(headers.getStream()); - h = h.set(new String[] { + Headers h = new Headers(headers, new String[] { "Envelope-To", envelopeFrom.toString(), "Return-Path", "<>", "From", "MAILER-DAEMON <>", @@ -141,6 +152,7 @@ public class Message extends MIME.Part { }); 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."+ @@ -152,7 +164,7 @@ public class Message extends MIME.Part { "\r\n"; try { - return newMessage(new Fountain.Concatenate(new Fountain.StringFountain(h.getString()+"\r\n"+error), getBody())); + 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); @@ -160,8 +172,8 @@ public class Message extends MIME.Part { } } - public String toString() { throw new RuntimeException("Message.toString() called"); } - public String summary() { return "[" + envelopeFrom + " -> " + envelopeTo + "] " + subject; } + 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); } } }