Return-Path: X-Original-To: apmail-commons-dev-archive@www.apache.org Delivered-To: apmail-commons-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DF27B18891 for ; Mon, 1 Feb 2016 22:07:10 +0000 (UTC) Received: (qmail 81768 invoked by uid 500); 1 Feb 2016 22:00:21 -0000 Delivered-To: apmail-commons-dev-archive@commons.apache.org Received: (qmail 81653 invoked by uid 500); 1 Feb 2016 22:00:21 -0000 Mailing-List: contact dev-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Commons Developers List" Delivered-To: mailing list dev@commons.apache.org Received: (qmail 81642 invoked by uid 99); 1 Feb 2016 22:00:20 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Feb 2016 22:00:20 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 5BFC9C136E for ; Mon, 1 Feb 2016 22:00:20 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.801 X-Spam-Level: * X-Spam-Status: No, score=1.801 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id C2BS6rn7BWsY for ; Mon, 1 Feb 2016 22:00:05 +0000 (UTC) Received: from orange.it-room.net (antispam.it-room.net [78.142.189.74]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with ESMTP id 905C1207E1 for ; Mon, 1 Feb 2016 22:00:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by orange.it-room.net (Postfix) with ESMTP id D841F1420C6 for ; Mon, 1 Feb 2016 23:02:24 +0100 (CET) X-Virus-Scanned: amavisd-new at it-room.net Received: from orange.it-room.net ([127.0.0.1]) by localhost (orange.it-room.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IL3rani4AifK for ; Mon, 1 Feb 2016 23:02:24 +0100 (CET) Received: from orange.it-room.net (orange.it-room.net [192.168.5.14]) by orange.it-room.net (Postfix) with ESMTP id B7869142036 for ; Mon, 1 Feb 2016 23:02:24 +0100 (CET) Date: Mon, 1 Feb 2016 23:02:24 +0100 (CET) From: Siegfried =?utf-8?Q?G=C3=B6schl?= To: Commons Developers List Message-ID: <526724452.888692.1454364144630.JavaMail.root@it20one.com> In-Reply-To: Subject: Re: svn commit: r1728011 - in /commons/proper/email/trunk: ./ src/changes/ src/main/java/org/apache/commons/mail/ src/main/java/org/apache/commons/mail/util/ src/test/java/org/apache/commons/mail/ src/test/java/org/apache/commons/mail/util/ MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [192.168.5.14] X-Mailer: Zimbra 7.2.7_GA_2942 (ZimbraWebClient - SAF3 (Mac)/7.2.7_GA_2942) Hi Gary, that was fast - done (hoping this works after years without SVN) Cheers, Siegfried Goeschl ----- Urspr=C3=BCngliche Mail ----- Von: "Gary Gregory" An: "Commons Developers List" Gesendet: Montag, 1. Februar 2016 22:27:56 Betreff: Fwd: svn commit: r1728011 - in /commons/proper/email/trunk: ./ src= /changes/ src/main/java/org/apache/commons/mail/ src/main/java/org/apache/c= ommons/mail/util/ src/test/java/org/apache/commons/mail/ src/test/java/org/= apache/commons/mail/util/ It would be nice to edit the commit comment to note the switch of Java requirement. Gary ---------- Forwarded message ---------- From: Date: Mon, Feb 1, 2016 at 1:25 PM Subject: svn commit: r1728011 - in /commons/proper/email/trunk: ./ src/changes/ src/main/java/org/apache/commons/mail/ src/main/java/org/apache/commons/mail/util/ src/test/java/org/apache/commons/mail/ src/test/java/org/apache/commons/mail/util/ To: commits@commons.apache.org Author: sgoeschl Date: Mon Feb 1 21:25:23 2016 New Revision: 1728011 URL: http://svn.apache.org/viewvc?rev=3D1728011&view=3Drev Log: [EMAIL-160] Add Support for International Domain Names Added: commons/proper/email/trunk/.gitignore commons/proper/email/trunk/src/main/java/org/apache/commons/mail/util/IDNEm= ailAddressConverter.java commons/proper/email/trunk/src/test/java/org/apache/commons/mail/util/IDNEm= ailAddressConverterTest.java Modified: commons/proper/email/trunk/pom.xml commons/proper/email/trunk/src/changes/changes.xml commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.= java Added: commons/proper/email/trunk/.gitignore URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/.gitignore?rev=3D17= 28011&view=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- commons/proper/email/trunk/.gitignore (added) +++ commons/proper/email/trunk/.gitignore Mon Feb 1 21:25:23 2016 @@ -0,0 +1,10 @@ +.DS_Store +*.iml +*.iws +*.ipr +target +.swp +.idea +.classpath +.project +.settings Modified: commons/proper/email/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=3D17280= 11&r1=3D1728010&r2=3D1728011&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- commons/proper/email/trunk/pom.xml (original) +++ commons/proper/email/trunk/pom.xml Mon Feb 1 21:25:23 2016 @@ -292,8 +292,8 @@ UTF-8 UTF-8 - 1.5 - 1.5 + 1.6 + 1.6 email EMAIL 12310474 Modified: commons/proper/email/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/changes/changes= .xml?rev=3D1728011&r1=3D1728010&r2=3D1728011&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- commons/proper/email/trunk/src/changes/changes.xml (original) +++ commons/proper/email/trunk/src/changes/changes.xml Mon Feb 1 21:25:23 2016 @@ -22,7 +22,10 @@ - + + + Add Support for International Domain Names. + Add Email#getHeader(String) and Email#getHeaders() methods. Modified: commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/a= pache/commons/mail/Email.java?rev=3D1728011&r1=3D1728010&r2=3D1728011&view= =3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java (original) +++ commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java Mon Feb 1 21:25:23 2016 @@ -41,6 +41,8 @@ import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; +import org.apache.commons.mail.util.IDNEmailAddressConverter; + /** * The base class for all email messages. This class sets the * sender's email & name, receiver's email & name, subject, and th= e @@ -1913,7 +1915,7 @@ public abstract class Email try { - address =3D new InternetAddress(email); + address =3D new InternetAddress(new IDNEmailAddressConverter().toASCII(email)); // check name input if (EmailUtils.isNotEmpty(name)) Added: commons/proper/email/trunk/src/main/java/org/apache/commons/mail/util/IDNEm= ailAddressConverter.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/a= pache/commons/mail/util/IDNEmailAddressConverter.java?rev=3D1728011&view=3D= auto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- commons/proper/email/trunk/src/main/java/org/apache/commons/mail/util/IDNEm= ailAddressConverter.java (added) +++ commons/proper/email/trunk/src/main/java/org/apache/commons/mail/util/IDNEm= ailAddressConverter.java Mon Feb 1 21:25:23 2016 @@ -0,0 +1,117 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied= . + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.commons.mail.util; + +import javax.mail.internet.InternetAddress; +import java.net.IDN; +import java.util.ArrayList; +import java.util.Collection; + +/** + * Converts email addresses containing International Domain Names into an ASCII + * representation suitable for sending an email. + * + * @see https://docs.oracle.com/javase/tutorial/i18n/network/idn.html + * @see https://en.wikipedia.org/wiki/Punycode + * @see https://tools.ietf.org/html/rfc5891 + * @see https://en.wikipedia.org/wiki/Punycode + * + * @version $Id$ + * @since 1.5 + */ +public class IDNEmailAddressConverter { + + /** + * Convert an email address to its ASCII representation using "Punycode". + */ + public String toASCII(final String email) + { + final int idx =3D findAtSymbolIndex(email); + + if (idx < 0) + { + return email; + } + + return getLocalPart(email, idx) + "@" + IDN.toASCII(getDomainPart(email, idx)); + } + + /** + * Convert an "Punycode" email address to its Unicode representation. + */ + public String toUnicode(final String email) + { + final int idx =3D findAtSymbolIndex(email); + + if (idx < 0) + { + return email; + } + + return getLocalPart(email, idx) + "@" + IDN.toUnicode(getDomainPart(email, idx)); + } + + /** + * Convert the address part of an InternetAddress to its Unicode representation. + */ + public String toUnicode(final InternetAddress address) + { + return (address !=3D null ? toUnicode(address.getAddress()) : null= ); + } + + /** + * Convert the address part of a list of InternetAddress to its Unicode representation. + */ + public Collection toUnicode(Collection addresses) + { + if(addresses =3D=3D null) + { + return null; + } + + Collection result =3D new ArrayList(); + + for(InternetAddress address : addresses) + { + result.add(toUnicode(address)); + } + + return result; + } + + private String getLocalPart(final String email, final int idx) + { + + return email.substring(0, idx); + } + + private String getDomainPart(final String email, final int idx) + { + + return email.substring(idx + 1); + } + + private int findAtSymbolIndex(final String value) + { + if (value =3D=3D null) + { + return -1; + } + + return value.indexOf('@'); + } +} Modified: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.= java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/a= pache/commons/mail/EmailTest.java?rev=3D1728011&r1=3D1728010&r2=3D1728011&v= iew=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.= java (original) +++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/EmailTest.= java Mon Feb 1 21:25:23 2016 @@ -31,6 +31,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; +import javax.mail.Message; import javax.mail.Session; import javax.mail.internet.InternetAddress; import javax.mail.internet.MimeMessage; @@ -1266,4 +1267,25 @@ public class EmailTest extends AbstractE assertEquals(bounceAddress, email.getBounceAddress()); } + @Test + public void testSupportForInternationalDomainNames() throws Exception + { + email.setHostName(strTestMailServer); + email.setSmtpPort(getMailServerPort()); + email.setFrom("from@d\u00F6m\u00E4in.example"); + email.addTo("to@d\u00F6m\u00E4in.example"); + email.addCc("cc@d\u00F6m\u00E4in.example"); + email.addBcc("bcc@d\u00F6m\u00E4in.example"); + email.setSubject("test mail"); + email.setSubject("testSupportForInternationalDomainNames"); + email.setMsg("This is a test mail ... :-)"); + + email.buildMimeMessage(); + final MimeMessage msg =3D email.getMimeMessage(); + + assertEquals("from@xn--dmin-moa0i.example", msg.getFrom()[0].toString()); + assertEquals("to@xn--dmin-moa0i.example", msg.getRecipients( Message.RecipientType.TO)[0].toString()); + assertEquals("cc@xn--dmin-moa0i.example", msg.getRecipients( Message.RecipientType.CC)[0].toString()); + assertEquals("bcc@xn--dmin-moa0i.example", msg.getRecipients(Message.RecipientType.BCC)[0].toString()); + } } Added: commons/proper/email/trunk/src/test/java/org/apache/commons/mail/util/IDNEm= ailAddressConverterTest.java URL: http://svn.apache.org/viewvc/commons/proper/email/trunk/src/test/java/org/a= pache/commons/mail/util/IDNEmailAddressConverterTest.java?rev=3D1728011&vie= w=3Dauto =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- commons/proper/email/trunk/src/test/java/org/apache/commons/mail/util/IDNEm= ailAddressConverterTest.java (added) +++ commons/proper/email/trunk/src/test/java/org/apache/commons/mail/util/IDNEm= ailAddressConverterTest.java Mon Feb 1 21:25:23 2016 @@ -0,0 +1,101 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied= . + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.commons.mail.util; + +import static org.junit.Assert.assertEquals; + +import java.util.ArrayList; +import java.util.Collection; + +import javax.mail.internet.InternetAddress; + +import org.junit.Test; + +public class IDNEmailAddressConverterTest { + + private static final String AUSTRIAN_IDN_EMAIL_ADDRESS =3D "noreply@d \u00F6m\u00E4in.example"; + private static final String CZECH_IDN_EMAIL_ADDRESS =3D "noreply@ \u010Desk\u00E1republika.icom.museum"; + private static final String RUSSIAN_IDN_EMAIL_ADDRESS =3D "noreply@ \u0440\u043E\u0441\u0441\u0438\u044F.\u0438\u043A\u043E\u043C.museum"; + + private static final String GERMAN_IDN_EMAIL_NAME =3D "noreply@d \u00F6m\u00E4in.example"; + + private static final String[] IDN_EMAIL_ADDRESSES =3D { AUSTRIAN_IDN_EMAIL_ADDRESS, CZECH_IDN_EMAIL_ADDRESS, RUSSIAN_IDN_EMAIL_ADDRESS }; + + private IDNEmailAddressConverter idnEmailConverter =3D new IDNEmailAddressConverter(); + + @Test + public void testConvertInvalidEmailAddressToAscii() + { + assertEquals(null, idnEmailConverter.toASCII(null)); + assertEquals("", idnEmailConverter.toASCII("")); + assertEquals("@", idnEmailConverter.toASCII("@")); + assertEquals("@@", idnEmailConverter.toASCII("@@")); + assertEquals("foo", idnEmailConverter.toASCII("foo")); + assertEquals("foo@", idnEmailConverter.toASCII("foo@")); + assertEquals("@badhost.com", idnEmailConverter.toASCII("@ badhost.com")); + } + + @Test + public void testIDNEmailAddressToAsciiConversion() + { + assertEquals("noreply@xn--dmin-moa0i.example", idnEmailConverter.toASCII(AUSTRIAN_IDN_EMAIL_ADDRESS)); + assertEquals("noreply@xn--h1alffa9f.xn--h1aegh.museum", idnEmailConverter.toASCII(RUSSIAN_IDN_EMAIL_ADDRESS)); + } + + @Test + public void testMultipleIDNEmailAddressToAsciiConversion() + { + assertEquals("noreply@xn--dmin-moa0i.example", idnEmailConverter.toASCII(idnEmailConverter.toASCII(AUSTRIAN_IDN_EMAIL_ADDR= ESS))); + } + + @Test + public void testInternetAddressToAsciiConversion() throws Exception + { + InternetAddress address =3D new InternetAddress(idnEmailConverter.toASCII(AUSTRIAN_IDN_EMAIL_ADDRESS)); + assertEquals(AUSTRIAN_IDN_EMAIL_ADDRESS, idnEmailConverter.toUnicode(address)); + + InternetAddress addressWithPersonalName =3D new InternetAddress(idnEmailConverter.toASCII(AUSTRIAN_IDN_EMAIL_ADDRESS), GERMAN_IDN_EMAIL_NAME); + assertEquals(AUSTRIAN_IDN_EMAIL_ADDRESS, idnEmailConverter.toUnicode(addressWithPersonalName)); + } + + @Test + public void testInternetAddressCollectionToAsciiConversion() throws Exception + { + Collection addresses =3D new ArrayList(); + addresses.add(new InternetAddress(idnEmailConverter.toASCII(AUSTRIAN_IDN_EMAIL_ADDRESS))); + + Collection emails =3D idnEmailConverter.toUnicode(addresse= s); + + assertEquals(1, emails.size()); + assertEquals(AUSTRIAN_IDN_EMAIL_ADDRESS, emails.iterator().next())= ; + } + + @Test + public void testRoundTripConversionOfIDNEmailAddress() + { + for(String email : IDN_EMAIL_ADDRESSES) + { + assertEquals(email, idnEmailConverter.toUnicode(idnEmailConverter.toASCII(email))); + } + } + + @Test + public void testNonIDNEmailAddressToAsciiConversion() + { + assertEquals("me@home.com", idnEmailConverter.toASCII("me@home.com ")); + } +} --=20 E-Mail: garydgregory@gmail.com | ggregory@apache.org Java Persistence with Hibernate, Second Edition JUnit in Action, Second Edition Spring Batch in Action Blog: http://garygregory.wordpress.com Home: http://garygregory.com/ Tweet! http://twitter.com/GaryGregory --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org For additional commands, e-mail: dev-help@commons.apache.org