Handle more cases of newlines in addresses - bug 7529

Author: bshannon

mail/src/main/java/javax/mail/internet/MimeMessage.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -393,7 +393,7 @@ public void setFrom(Address address) throws MessagingException {
 	if (address == null)
 	    removeHeader("From");
 	else
-	    setHeader("From", address.toString());
+	    setHeader("From", MimeUtility.fold(6, address.toString()));
     }
 
     /**
@@ -497,7 +497,7 @@ public void setSender(Address address) throws MessagingException {
 	if (address == null)
 	    removeHeader("Sender");
 	else
-	    setHeader("Sender", address.toString());
+	    setHeader("Sender", MimeUtility.fold(8, address.toString()));
     }
 
     /**

mail/src/main/java/javax/mail/internet/NewsAddress.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 1997-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -81,7 +81,9 @@ public NewsAddress(String newsgroup) {
      * @param host	the host
      */
     public NewsAddress(String newsgroup, String host) {
-	this.newsgroup = newsgroup;
+	// XXX - this method should throw an exception so we can report
+	// illegal addresses, but for now just remove whitespace
+	this.newsgroup = newsgroup.replaceAll("\\s+", "");
 	this.host = host;
     }
 
@@ -182,14 +184,24 @@ public static String toString(Address[] addresses) {
 
 	StringBuffer s = 
 		new StringBuffer(((NewsAddress)addresses[0]).toString());
-	for (int i = 1; i < addresses.length; i++)
-	    s.append(",").append(((NewsAddress)addresses[i]).toString());
+	int used = s.length();
+	for (int i = 1; i < addresses.length; i++) {
+	    s.append(",");
+	    used++;
+	    String ng = ((NewsAddress)addresses[i]).toString();
+	    if (used + ng.length() > 76) {
+		s.append("\r\n\t");
+		used = 8;
+	    }
+	    s.append(ng);
+	    used += ng.length();
+	}
 
 	return s.toString();
     }
 
     /**
-     * Parse the given comma separated sequence of newsgroup into
+     * Parse the given comma separated sequence of newsgroups into
      * NewsAddress objects.
      *
      * @param newsgroups	comma separated newsgroup string

mail/src/test/java/javax/mail/internet/MimeMessageTest.java

@@ -50,6 +50,7 @@
 
 import javax.mail.*;
 import static javax.mail.Message.RecipientType.*;
+import static javax.mail.internet.MimeMessage.RecipientType.*;
 
 import org.junit.*;
 import static org.junit.Assert.assertArrayEquals;
@@ -95,6 +96,72 @@ public void testSetRecipientStringNull() throws Exception {
 	assertArrayEquals("To: is removed", null, m.getRecipients(TO));
     }
 
+    /**
+     * Test that setFrom with an address containing a newline is folded
+     * properly.
+     * (Bug 7529)
+     */
+    @Test
+    public void testSetFromFold() throws Exception {
+	InternetAddress addr = new InternetAddress("[email protected]", "Joe\r\nBad");
+	MimeMessage m = new MimeMessage(s);
+	m.setFrom(addr);
+	assertEquals("Joe\r\n Bad <[email protected]>", m.getHeader("From", null));
+    }
+
+    /**
+     * Test that setSender with an address containing a newline is folded
+     * properly.
+     * (Bug 7529)
+     */
+    @Test
+    public void testSetSenderFold() throws Exception {
+	InternetAddress addr = new InternetAddress("[email protected]", "Joe\r\nBad");
+	MimeMessage m = new MimeMessage(s);
+	m.setSender(addr);
+	assertEquals("Joe\r\n Bad <[email protected]>", m.getHeader("Sender", null));
+    }
+
+    /**
+     * Test that setRecipient with a newsgroup address containing a newline is
+     * handled properly.
+     * (Bug 7529)
+     */
+    @Test
+    public void testSetNewsgroupWhitespace() throws Exception {
+	NewsAddress addr = new NewsAddress("alt.\r\nbad");
+	MimeMessage m = new MimeMessage(s);
+	m.setRecipient(NEWSGROUPS, addr);
+	assertEquals("alt.bad", m.getHeader("Newsgroups", null));
+    }
+
+    /**
+     * Test that setRecipients with many newsgroup addresses is folded properly.
+     * (Bug 7529)
+     */
+    @Test
+    public void testSetNewsgroupFold() throws Exception {
+	NewsAddress[] longng = NewsAddress.parse(
+	    "alt.loooooooooooooooooooooooooooooooooooooooooooooooooong," +
+	    "alt.verylongggggggggggggggggggggggggggggggggggggggggggggg");
+	MimeMessage m = new MimeMessage(s);
+	m.setRecipients(NEWSGROUPS, longng);
+	assertTrue(m.getHeader("Newsgroups", null).indexOf("\r\n\t") > 0);
+    }
+
+    /**
+     * Test that newsgroups can be set and read back (even if folded).
+     */
+    @Test
+    public void testSetGetNewsgroups() throws Exception {
+	NewsAddress[] longng = NewsAddress.parse(
+	    "alt.loooooooooooooooooooooooooooooooooooooooooooooooooong," +
+	    "alt.verylongggggggggggggggggggggggggggggggggggggggggggggg");
+	MimeMessage m = new MimeMessage(s);
+	m.setRecipients(NEWSGROUPS, longng);
+	assertArrayEquals(longng, m.getRecipients(NEWSGROUPS));
+    }
+
     /**
      * Test that copying a DataHandler from one message to another
      * has the desired effect.