X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fmail%2FMessage.java;h=6d160d52684562f3b54e7c65144e8960b79428f4;hb=18304db7ddfb63f25cd83ee06781d924f7a6b496;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..6d160d5 100644
--- a/src/org/ibex/mail/Message.java
+++ b/src/org/ibex/mail/Message.java
@@ -1,191 +1,92 @@
+// 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: this is important: folded headers: can insert CRLF anywhere that whitespace appears (before the whitespace)
 // 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: 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 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 {
+
+    // 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 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));
+    public static Message newMessage(Fountain in) throws Malformed { return new Message(in); }
+
+    // FIXME
+    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 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<key.length(); i++)
-                if (key.charAt(i) < 33 || key.charAt(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<this.cc.length; i++) this.cc[i] = new Address(st.nextToken());
-        } else {
-            this.cc = new Address[0];
-        }
-        if (headers.get("Bcc") != null) {
-            StringTokenizer st = new StringTokenizer((String)headers.get("Bcc"));
-            this.bcc = new Address[st.countTokens()];
-            for(int i=0; i<this.bcc.length; i++) this.bcc[i] = new Address(st.nextToken());
-        } else {
-            this.bcc = new Address[0];
-        }
-        resent.copyInto(this.resent = new Hashtable[resent.size()]);
-        traces.copyInto(this.traces = new Trace[traces.size()]);
-        allHeaders = all.toString();
-        StringBuffer body = new StringBuffer();
-        for(String s = stream.in.readln();; s = stream.in.readln()) {
-            if (s == null) break;
-            lines++;
-            body.append(s);       // FIXME: we're assuming all mail messages fit in memory
-            body.append("\r\n");
-        }
-        this.lines = lines;
-        this.body = body.toString();
+    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"));
+        this.arrival      = this.date; // FIXME wrong; grab this from traces?
     }
-    
+
+
+    // Helpers /////////////////////////////////////////////////////////////////////////////
+
     // http://www.jwz.org/doc/mid.html
     private static final Random random = new Random();
     public static String generateFreshMessageId() {
@@ -200,20 +101,46 @@ public class Message extends org.ibex.js.JSReflection {
         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); }
+    public static Date parseDate(String s) {
+        // FIXME!!! this must be robust
+        // date/time parsing: see spec, 3.3
+        return null;
     }
 
-    public String summary() {
-        return
-            "          Subject: " + subject + "\n" +
-            "     EnvelopeFrom: " + envelopeFrom + "\n" +
-            "       EnvelopeTo: " + envelopeTo + "\n" +
-            "        MessageId: " + messageid;
+    // 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;
+
+        Headers h = new Headers(headers.getStream());
+        h.put("Envelope-To", envelopeFrom.toString());
+        h.put("Return-Path", "<>");
+        h.put("From",        "MAILER-DAEMON <>");
+        h.put("To",          envelopeFrom.toString());
+        h.put("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";
+
+        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 String summary() { return "[" + envelopeFrom + " -> " + envelopeTo + "] " + subject; }
+
+    public static class Malformed extends MailException { public Malformed(String s) { super(s); } }
 }
+