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

Link sanitize: try base64 last path segment

Browse Source
This commit is contained in:
M66B
2022-11-26 08:40:32 +01:00
parent 0f5e53040d
commit 89e42a245d
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/eu/faircode/email/UriHelper.java
View File

@@ -330,18 +330,6 @@ public class UriHelper {
Uri result = (s > 0 ? Uri.parse(path.substring(s + 1)) : null);
changed = (result != null);
url = (result == null ? uri : result);
} else if ("go.dhlparcel.nl".equals(uri.getHost())) {
try {
String path = uri.getPath();
int s = path.lastIndexOf('/');
String b = (s > 0 ? new String(Base64.decode(path.substring(s + 1), Base64.URL_SAFE)) : null);
Uri result = (b == null ? null : Uri.parse(b));
changed = (result != null);
url = (result == null ? uri : result);
} catch (Throwable ex) {
Log.i(ex);
url = uri;
}
} else if (uri.getQueryParameterNames().size() == 1) {
// Sophos Email Appliance
Uri result = null;
@@ -372,8 +360,21 @@ public class UriHelper {
Log.i(ex);
url = uri;
}
} else
url = uri;
} else {
// Try base64 last path segment
// go.dhlparcel.nl and others
try {
String path = uri.getPath();
int s = path.lastIndexOf('/');
String b = (s > 0 ? new String(Base64.decode(path.substring(s + 1), Base64.URL_SAFE)) : null);
Uri result = (b == null ? null : Uri.parse(b));
changed = (result != null && result.getScheme() != null);
url = (result == null ? uri : result);
} catch (Throwable ex) {
Log.i(ex);
url = uri;
}
}
if (url.isOpaque() || !isHyperLink(url))
return uri;