msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Refactoring

Browse Source
pull/212/head
M66B 2 years ago
parent 3d6876d51f
commit cb9102b9ed
1 changed files with 170 additions and 163 deletions
Show Stats Download Patch File Download Diff File

333
app/src/main/java/eu/faircode/email/MessageHelper.java
Unescape View File

@ -2013,195 +2013,202 @@ public class MessageHelper {
return signers; return signers;
for (String header : headers) { for (String header : headers) {
Map<String, String> kv = getKeyValues(MimeUtility.unfold(header)); String signer = verifySignatureHeader(context, header, DKIM_SIGNATURE, amessage);
if (signer != null && !signers.contains(signer))
String a = kv.get("a"); signers.add(signer);
String halgo; }
String salgo;
if ("rsa-sha1".equals(a)) {
halgo = "SHA-1";
salgo = "SHA1withRSA";
} else if ("rsa-sha256".equals(a)) {
halgo = "SHA-256";
salgo = "SHA256withRSA";
} else {
// TODO: Ed25519
Log.i("DKIM a=" + a);
continue;
}
try { Log.i("DKIM signers=" + TextUtils.join(",", signers));
String signer = kv.get("d"); } catch (Throwable ex) {
String dns = kv.get("s") + "._domainkey." + signer; Log.e("DKIM", ex);
Log.i("DKIM lookup " + dns); }
DnsHelper.DnsRecord[] records = DnsHelper.lookup(context, dns, "txt");
if (records.length == 0) return signers;
continue; }
private String verifySignatureHeader(Context context, String header, String name, MimeMessage amessage) {
Map<String, String> kv = getKeyValues(MimeUtility.unfold(header));
String a = kv.get("a");
String halgo;
String salgo;
if ("rsa-sha1".equals(a)) {
halgo = "SHA-1";
salgo = "SHA1withRSA";
} else if ("rsa-sha256".equals(a)) {
halgo = "SHA-256";
salgo = "SHA256withRSA";
} else {
// TODO: Ed25519
Log.i("DKIM a=" + a);
return null;
}
Log.i("DKIM got " + records[0].name); try {
Map<String, String> dk = getKeyValues(records[0].name); String signer = kv.get("d");
String dns = kv.get("s") + "._domainkey." + signer;
Log.i("DKIM lookup " + dns);
DnsHelper.DnsRecord[] records = DnsHelper.lookup(context, dns, "txt");
if (records.length == 0)
return null;
String canonic = kv.get("c"); Log.i("DKIM got " + records[0].name);
Log.i("DKIM canonicalization=" + canonic); Map<String, String> dk = getKeyValues(records[0].name);
if (canonic == null)
canonic = "simple/simple";
String[] c = canonic.split("/");
StringBuilder head = new StringBuilder(); String canonic = kv.get("c");
Log.i("DKIM canonicalization=" + canonic);
if (canonic == null)
canonic = "simple/simple";
String[] c = canonic.split("/");
String hs = kv.get("h"); StringBuilder head = new StringBuilder();
Log.i("DKIM headers=" + hs);
boolean from = false; String hs = kv.get("h");
List<String> keys = new ArrayList<>(); Log.i("DKIM headers=" + hs);
if (hs != null)
for (String key : hs.split(":")) {
keys.add(key.trim());
from = (from || "from".equalsIgnoreCase(key.trim()));
}
if (!from)
throw new IllegalArgumentException("from missing: " + hs);
keys.add(DKIM_SIGNATURE);
Map<String, Integer> index = new Hashtable<>();
for (String key : keys) {
// https://datatracker.ietf.org/doc/html/rfc6376/#section-5.4.2
String _key = key.toLowerCase(Locale.ROOT);
Integer idx = index.get(_key);
idx = (idx == null ? 1 : idx + 1);
index.put(_key, idx);
String[] values = (DKIM_SIGNATURE.equals(key)
? new String[]{header}
: amessage.getHeader(key));
if (values == null || idx > values.length) {
// https://datatracker.ietf.org/doc/html/rfc6376/#section-5.4
Log.i("DKIM missing header=" +
key + "[" + idx + "/" + (values == null ? null : values.length) + "]");
continue;
}
String value = values[values.length - idx]; boolean from = false;
if (DKIM_SIGNATURE.equals(key)) { List<String> keys = new ArrayList<>();
int b = value.lastIndexOf("b="); if (hs != null)
int s = value.indexOf(";", b + 2); for (String key : hs.split(":")) {
value = value.substring(0, b + 2) + (s < 0 ? "" : value.substring(s)); keys.add(key.trim());
} else from = (from || "from".equalsIgnoreCase(key.trim()));
Log.i("DKIM " + key + "=" + value.replaceAll("\\r?\\n", "|")); }
if (!from)
if ("simple".equals(c[0])) { throw new IllegalArgumentException("from missing: " + hs);
if (DKIM_SIGNATURE.equals(key))
head.append(key).append(": ").append(value); keys.add(name);
else {
// Find original header/name (case sensitive) Map<String, Integer> index = new Hashtable<>();
int _idx = values.length - idx; for (String key : keys) {
Enumeration<Header> oheaders = amessage.getAllHeaders(); // https://datatracker.ietf.org/doc/html/rfc6376/#section-5.4.2
while (oheaders.hasMoreElements()) { String _key = key.toLowerCase(Locale.ROOT);
Header oheader = oheaders.nextElement(); Integer idx = index.get(_key);
if (key.equalsIgnoreCase(oheader.getName())) { idx = (idx == null ? 1 : idx + 1);
if (_idx-- == 0) { index.put(_key, idx);
head.append(oheader.getName()).append(": ")
.append(oheader.getValue()); String[] values = (name.equals(key)
break; ? new String[]{header}
} : amessage.getHeader(key));
} if (values == null || idx > values.length) {
// https://datatracker.ietf.org/doc/html/rfc6376/#section-5.4
Log.i("DKIM missing header=" +
key + "[" + idx + "/" + (values == null ? null : values.length) + "]");
continue;
}
String value = values[values.length - idx];
if (name.equals(key)) {
int b = value.lastIndexOf("b=");
int s = value.indexOf(";", b + 2);
value = value.substring(0, b + 2) + (s < 0 ? "" : value.substring(s));
} else
Log.i("DKIM " + key + "=" + value.replaceAll("\\r?\\n", "|"));
if ("simple".equals(c[0])) {
if (name.equals(key))
head.append(key).append(": ").append(value);
else {
// Find original header/name (case sensitive)
int _idx = values.length - idx;
Enumeration<Header> oheaders = amessage.getAllHeaders();
while (oheaders.hasMoreElements()) {
Header oheader = oheaders.nextElement();
if (key.equalsIgnoreCase(oheader.getName())) {
if (_idx-- == 0) {
head.append(oheader.getName()).append(": ")
.append(oheader.getValue());
break;
} }
} }
} else if ("relaxed".equals(c[0])) {
value = MimeUtility.unfold(value);
head.append(_key).append(':')
.append(value.replaceAll("\\s+", " ").trim());
} else
throw new IllegalArgumentException(c[0]);
if (!DKIM_SIGNATURE.equals(key))
head.append("\r\n");
}
Log.i("DKIM head=" + head.toString().replace("\r\n", "|"));
ByteArrayOutputStream bos = new ByteArrayOutputStream();
Helper.copy(amessage.getRawInputStream(), bos);
String body = bos.toString(); // TODO: charset?
if ("simple".equals(c[c.length > 1 ? 1 : 0])) {
if (TextUtils.isEmpty(body))
body = "\r\n";
else if (!body.endsWith("\r\n"))
body += "\r\n";
else {
while (body.endsWith("\r\n\r\n"))
body = body.substring(0, body.length() - 2);
}
} else if ("relaxed".equals(c[c.length > 1 ? 1 : 0])) {
if (TextUtils.isEmpty(body))
body = "";
else {
body = body.replaceAll("[ \\t]+\r\n", "\r\n");
body = body.replaceAll("[ \\t]+", " ");
while (body.endsWith("\r\n\r\n"))
body = body.substring(0, body.length() - 2);
if ("\r\n".equals(body))
body = "";
} }
} else
throw new IllegalArgumentException(c[1]);
String length = kv.get("l");
if (!TextUtils.isEmpty(length) && TextUtils.isDigitsOnly(length)) {
int l = Integer.parseInt(length);
if (l < DKIM_MIN_TEXT)
throw new IllegalArgumentException("Body length " + l + " < " + DKIM_MIN_TEXT);
if (l < body.length())
body = body.substring(0, l);
} }
} else if ("relaxed".equals(c[0])) {
value = MimeUtility.unfold(value);
head.append(_key).append(':')
.append(value.replaceAll("\\s+", " ").trim());
} else
throw new IllegalArgumentException(c[0]);
Log.i("DKIM body=" + body.replace("\r\n", "|")); if (!name.equals(key))
head.append("\r\n");
}
Log.i("DKIM head=" + head.toString().replace("\r\n", "|"));
byte[] bh = MessageDigest.getInstance(halgo).digest(body.getBytes()); // TODO: charset? ByteArrayOutputStream bos = new ByteArrayOutputStream();
Log.i("DKIM bh=" + Base64.encodeToString(bh, Base64.NO_WRAP) + "/" + kv.get("bh")); Helper.copy(amessage.getRawInputStream(), bos);
String body = bos.toString(); // TODO: charset?
if ("simple".equals(c[c.length > 1 ? 1 : 0])) {
if (TextUtils.isEmpty(body))
body = "\r\n";
else if (!body.endsWith("\r\n"))
body += "\r\n";
else {
while (body.endsWith("\r\n\r\n"))
body = body.substring(0, body.length() - 2);
}
} else if ("relaxed".equals(c[c.length > 1 ? 1 : 0])) {
if (TextUtils.isEmpty(body))
body = "";
else {
body = body.replaceAll("[ \\t]+\r\n", "\r\n");
body = body.replaceAll("[ \\t]+", " ");
while (body.endsWith("\r\n\r\n"))
body = body.substring(0, body.length() - 2);
if ("\r\n".equals(body))
body = "";
}
} else
throw new IllegalArgumentException(c[1]);
String length = kv.get("l");
if (!TextUtils.isEmpty(length) && TextUtils.isDigitsOnly(length)) {
int l = Integer.parseInt(length);
if (l < DKIM_MIN_TEXT)
throw new IllegalArgumentException("Body length " + l + " < " + DKIM_MIN_TEXT);
if (l < body.length())
body = body.substring(0, l);
}
String pubkey = dk.get("p"); Log.i("DKIM body=" + body.replace("\r\n", "|"));
if (pubkey == null)
continue;
String p = pubkey.replaceAll("\\s+", ""); byte[] bh = MessageDigest.getInstance(halgo).digest(body.getBytes()); // TODO: charset?
Log.i("DKIM pubkey=" + p); Log.i("DKIM bh=" + Base64.encodeToString(bh, Base64.NO_WRAP) + "/" + kv.get("bh"));
X509EncodedKeySpec pubKeySpec = new X509EncodedKeySpec(Base64.decode(p, Base64.DEFAULT)); String pubkey = dk.get("p");
KeyFactory keyFactory = KeyFactory.getInstance("RSA"); if (pubkey == null)
PublicKey pubKey = keyFactory.generatePublic(pubKeySpec); return null;
Signature sig = Signature.getInstance(salgo); // a=
String hash = kv.get("b"); String p = pubkey.replaceAll("\\s+", "");
if (hash == null) Log.i("DKIM pubkey=" + p);
continue;
String s = hash.replaceAll("\\s+", ""); X509EncodedKeySpec pubKeySpec = new X509EncodedKeySpec(Base64.decode(p, Base64.DEFAULT));
Log.i("DKIM signature=" + s); KeyFactory keyFactory = KeyFactory.getInstance("RSA");
PublicKey pubKey = keyFactory.generatePublic(pubKeySpec);
Signature sig = Signature.getInstance(salgo); // a=
byte[] signature = Base64.decode(s, Base64.DEFAULT); String hash = kv.get("b");
if (hash == null)
return null;
String s = hash.replaceAll("\\s+", "");
Log.i("DKIM signature=" + s);
sig.initVerify(pubKey); byte[] signature = Base64.decode(s, Base64.DEFAULT);
sig.update(head.toString().getBytes());
boolean verified = sig.verify(signature); sig.initVerify(pubKey);
Log.i("DKIM valid=" + verified + sig.update(head.toString().getBytes());
" dns=" + dns +
" from=" + formatAddresses(getFrom()));
if (verified && boolean verified = sig.verify(signature);
!signers.contains(signer)) Log.i("DKIM valid=" + verified +
signers.add(signer); " dns=" + dns +
} catch (Throwable ex) { " from=" + formatAddresses(getFrom()));
Log.e("DKIM", ex);
}
}
Log.i("DKIM signers=" + TextUtils.join(",", signers)); if (verified)
return signer;
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e("DKIM", ex); Log.e("DKIM", ex);
} }
return signers; return null;
} }
Address[] getMailFrom(String[] headers) { Address[] getMailFrom(String[] headers) {

Write Preview
Loading…
Cancel
Save