Merge "Fix quoted-printable encoding of e-mail addresses" into stable-2.9

2 files changed, 38 insertions, 8 deletions

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailHeader.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailHeader.java
index 6492a5e7ca..7e4f36f3be 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailHeader.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/EmailHeader.java
@@ -64,23 +64,47 @@ public abstract class EmailHeader {
     return false;
   }
 
+  static boolean needsQuotedPrintableWithinPhrase(final int cp) {
+    switch (cp) {
+      case '!':
+      case '*':
+      case '+':
+      case '-':
+      case '/':
+      case '=':
+      case '_':
+        return false;
+      default:
+        if (('a' <= cp && cp <= 'z')
+            || ('A' <= cp && cp <= 'Z')
+            || ('0' <= cp && cp <= '9')) {
+          return false;
+        } else {
+          return true;
+        }
+    }
+  }
+
   static java.lang.String quotedPrintable(java.lang.String value)
       throws UnsupportedEncodingException {
     final StringBuilder r = new StringBuilder();
-    final byte[] encoded = value.getBytes("UTF-8");
 
     r.append("=?UTF-8?Q?");
-    for (byte b : encoded) {
-      if (b == ' ') {
+    for (int i = 0; i < value.length(); i++) {
+      final int cp = value.codePointAt(i);
+      if (cp == ' ') {
         r.append('_');
 
-      } else if (b == ',' || b == '=' || b == '"' || b == '_' || b < ' ' || '~' <= b) {
-        r.append('=');
-        r.append(Integer.toHexString((b >>> 4) & 0x0f).toUpperCase());
-        r.append(Integer.toHexString(b & 0x0f).toUpperCase());
+      } else if (needsQuotedPrintableWithinPhrase(cp)) {
+        byte[] buf = new java.lang.String(Character.toChars(cp)).getBytes("UTF-8");
+        for (byte b: buf) {
+          r.append('=');
+          r.append(Integer.toHexString((b >>> 4) & 0x0f).toUpperCase());
+          r.append(Integer.toHexString(b & 0x0f).toUpperCase());
+        }
 
       } else {
-        r.append((char) b);
+        r.append(Character.toChars(cp));
       }
     }
     r.append("?=");
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/AddressTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/mail/AddressTest.java
index 02ebf51a69..625e4b6ef6 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/mail/AddressTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/mail/AddressTest.java
@@ -131,6 +131,12 @@ public class AddressTest {
   }
 
   @Test
+  public void testToHeaderString_NameEmail7() {
+    assertEquals("=?UTF-8?Q?A_=E2=82=AC_B_=28Code_Review=29?= <a@a>",
+        format("A \u20ac B (Code Review)", "a@a"));
+  }
+
+  @Test
   public void testToHeaderString_Email1() {
     assertEquals("a@a", format(null, "a@a"));
   }