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

Skip IP fallback if harden enabled

Browse Source
pull/194/merge
M66B 4 years ago
parent f939072fca
commit 157f5a5c19
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File

39
app/src/main/java/eu/faircode/email/EmailService.java
Unescape View File

@ -1019,27 +1019,28 @@ public class EmailService implements AutoCloseable {
return; return;
// Fallback: check server/certificate IP address // Fallback: check server/certificate IP address
try { if (!harden)
InetAddress ip = InetAddress.getByName(server); try {
for (String name : names) { InetAddress ip = InetAddress.getByName(server);
if (name.startsWith("*.")) for (String name : names) {
name = name.substring(2); if (name.startsWith("*."))
name = name.substring(2);
try {
for (InetAddress addr : InetAddress.getAllByName(name)) try {
if (Arrays.equals(ip.getAddress(), addr.getAddress())) { for (InetAddress addr : InetAddress.getAllByName(name))
Log.i("Accepted " + name + " for " + server); if (Arrays.equals(ip.getAddress(), addr.getAddress())) {
return; Log.i("Accepted " + name + " for " + server);
} return;
} catch (UnknownHostException ex) { }
Log.w(ex); } catch (UnknownHostException ex) {
Log.w(ex);
}
} }
} catch (UnknownHostException ex) {
Log.w(ex);
} catch (Throwable ex) {
Log.e(ex);
} }
} catch (UnknownHostException ex) {
Log.w(ex);
} catch (Throwable ex) {
Log.e(ex);
}
String error = server + " not in certificate: " + TextUtils.join(",", names); String error = server + " not in certificate: " + TextUtils.join(",", names);
Log.i(error); Log.i(error);

Write Preview
Loading…
Cancel
Save