add finally to dump connection log in IMAP

[org.ibex.mail.git] / src / org / ibex / mail / Message.java

diff --git a/src/org/ibex/mail/Message.java b/src/org/ibex/mail/Message.java
index 6738dc8..bc8cfdf 100644 (file)
--- a/src/org/ibex/mail/Message.java
+++ b/src/org/ibex/mail/Message.java
@@ -90,6 +90,7 @@ public class Message extends MIME.Part {
 
     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;
@@ -101,25 +102,50 @@ public class Message extends MIME.Part {
         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
+        // reenable this once whitelisting is moved out of javascript
+        //if (this.messageid==null)
+        //throw new RuntimeException("every RFC2822 message must have a Message-ID: header");
+
+        /*
+        // synthesize a message-id if not provided
+        this.messageid    = headers.get("Message-Id") == null ? generateFreshMessageId(sha1(in.getStream())) : headers.get("Message-Id");
+        if (headers.get("Message-Id") == null) {
+            headers = headers.set("Message-Id", this.messageid);
+            Log.warn(Message.class, "synthesizing message-id for " + summary());
+        }
+        */
 
         this.arrival      = this.date; // FIXME wrong; grab this from traces?
     }
 
+    /*
+    private static String sha1(Stream stream) {
+        SHA1 sha1 = new SHA1();
+        byte[] b = new byte[1024];
+        while(true) {
+            int numread = stream.read(b, 0, b.length);
+            if (numread == -1) break;
+            sha1.update(b, 0, numread);
+        }
+        byte[] results = new byte[sha1.getDigestSize()];
+        sha1.doFinal(results, 0);
+        return new String(Encode.toBase64(results));
+    }
+    */
 
     // 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()));
+    }
+    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();