mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #211 from keykey7/dmarc-spf-ip-without-prefix 

allow DMARC row validation for SPF IP without prefix
This commit is contained in:
Marcel Bokhorst 2023-01-11 22:14:40 +01:00 committed by GitHub
parent 1b488aed5b 901c4394a6
commit dbac9f4f4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/ActivityDmarc.java
View File

@ -272,9 +272,11 @@ public class ActivityDmarc extends ActivityBase {
ip = ip.toLowerCase(Locale.ROOT);
if (ip.startsWith("ip4:") || ip.startsWith("ip6:")) {
String[] net = ip.substring(4).split("/");
if (net.length != 2)
if (net.length > 2)
continue;
Integer prefix = Helper.parseInt(net[1]);
Integer prefix = ip.startsWith("ip4:") ? 32 : 128;
if (net.length == 2)
prefix = Helper.parseInt(net[1]);
if (prefix == null)
continue;
if (ConnectionHelper.inSubnet(text, net[0], prefix)) {