X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fibex%2Fmail%2FMessage.java;h=bc8cfdf0a3e56681b1072c13f5279bb5a390ed37;hb=8a4fb7b7043f096c7901f147295e5a539fbd71a6;hp=b4db07e5dbcabb933edebf738f825df52ba3c474;hpb=73aabb0888eea91734fc408f8fbaf1e88a52fe13;p=org.ibex.mail.git

diff --git a/src/org/ibex/mail/Message.java b/src/org/ibex/mail/Message.java
index b4db07e..bc8cfdf 100644
--- 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,8 +102,9 @@ 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"));
 
-        if (this.messageid==null)
-            throw new RuntimeException("every RFC2822 message must have a Message-ID: header");
+        // 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
@@ -136,12 +138,14 @@ 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()));
+    }
+    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();