Use quoted printable strings in outgoing email

If we are sending non-ASCII strings in the headers of an email
message we should protect them using quoted printable encoding
with a UTF-8 character set.

Bug: issue 387
Change-Id: I19038f7568124e2ca5900222c77110e688158437
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2010-01-14 11:22:47 -08:00
parent 6c2b677980
commit 0cb56577c3
3 changed files with 65 additions and 6 deletions

View File

@@ -15,6 +15,7 @@
package com.google.gerrit.server.mail;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -40,10 +41,48 @@ abstract class EmailHeader {
@Override
void write(Writer w) throws IOException {
w.write(value);
if (needsQuotedPrintable(value)) {
w.write(quotedPrintable(value));
} else {
w.write(value);
}
}
}
static boolean needsQuotedPrintable(java.lang.String value) {
for (int i = 0; i < value.length(); i++) {
if (value.charAt(i) < ' ' || '~' < value.charAt(i)) {
return true;
}
}
return false;
}
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 (int i = 0; i < encoded.length; i++) {
byte b = encoded[i];
if (b == ' ') {
r.append('_');
} else if (b == '=' || b == '"' || b == '_' || b < ' ' || '~' <= b) {
r.append('=');
r.append(Integer.toHexString((b >>> 4) & 0x0f).toUpperCase());
r.append(Integer.toHexString(b & 0x0f).toUpperCase());
} else {
r.append((char) b);
}
}
r.append("?=");
return r.toString();
}
static class Date extends EmailHeader {
private java.util.Date value;