Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-01 22:56:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

TLS local

Browse Source
This commit is contained in:
M66B
2022-01-08 19:43:26 +01:00
parent 33cfc3b316
commit 9b3449f033
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/faircode/email/ConnectionHelper.java
View File

@@ -509,7 +509,9 @@ public class ConnectionHelper {
static boolean isLocalAddress(String host) {
try {
InetAddress addr = ConnectionHelper.from6to4(InetAddress.getByName(host));
return (addr.isSiteLocalAddress() || addr.isLinkLocalAddress());
return (addr.isLoopbackAddress() ||
addr.isSiteLocalAddress() ||
addr.isLinkLocalAddress());
} catch (UnknownHostException ex) {
Log.e(ex);
return false;

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

@@ -2202,18 +2202,26 @@ public class MessageHelper {
private static boolean isLocal(String value) {
if (value.contains("localhost") ||
value.contains("[127.0.0.1]") ||
value.contains("127.0.0.1") ||
value.contains("[::1]"))
return true;
int s = value.indexOf('[');
int e = value.indexOf(']', s + 1);
if (s >= 0 && e > 0) {
String ip = value.substring(s + 1, e);
if (ConnectionHelper.isNumericAddress(ip) &&
ConnectionHelper.isLocalAddress(ip))
return true;
}
int f = value.indexOf(' ');
String host = (f < 0 ? value : value.substring(0, f));
if (ConnectionHelper.isNumericAddress(host)) {
if (ConnectionHelper.isLocalAddress(host))
return true;
} else {
if (!PatternsCompat.DOMAIN_NAME.matcher(host).matches())
return true;
}
return false;
}