+ 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()));
+ }
+
+ 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"));
+
+ // 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?