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

Enabled Spamhaus/DBL

This commit is contained in:
M66B 2021-07-18 21:05:00 +02:00
parent b78c47315f
commit fda5e0da5f
2 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/eu/faircode/email/Core.java
View File

@ -3392,8 +3392,17 @@ class Core {
!EntityFolder.JUNK.equals(folder.type) &&
!Arrays.asList(message.keywords).contains(MessageHelper.FLAG_NOT_JUNK))
try {
message.blocklist = DnsBlockList.isJunk(
context, imessage.getHeader("Received"));
message.blocklist = DnsBlockList.isJunk(context,
imessage.getHeader("Received"));
if (message.blocklist == null || !message.blocklist) {
List<Address> senders = new ArrayList<>();
if (message.reply != null)
senders.addAll(Arrays.asList(message.reply));
if (message.from != null)
senders.addAll(Arrays.asList(message.from));
message.blocklist = DnsBlockList.isJunk(context, senders);
}
} catch (Throwable ex) {
Log.w(folder.name, ex);
}

35
app/src/main/java/eu/faircode/email/DnsBlockList.java
View File

@ -39,6 +39,8 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import javax.mail.Address;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeUtility;
public class DnsBlockList {
@ -55,7 +57,7 @@ public class DnsBlockList {
}),
// https://www.spamhaus.org/dbl/
new BlockList(null, "Spamhaus/DBL", "dbl.spamhaus.org", false, new String[]{
new BlockList(true, "Spamhaus/DBL", "dbl.spamhaus.org", false, new String[]{
// https://www.spamhaus.org/faq/section/Spamhaus%20DBL#291
"127.0.1.2", // spam domain
"127.0.1.4", // phish domain
@ -137,10 +139,28 @@ public class DnsBlockList {
return null;
String host = getFromHost(MimeUtility.unfold(received[received.length - 1]));
return (host == null ? null : isJunk(context, host, BLOCK_LISTS));
if (host == null)
return null;
boolean numeric = host.startsWith("[") && host.endsWith("]");
if (numeric)
host = host.substring(1, host.length() - 1);
return isJunk(context, host, true, BLOCK_LISTS);
}
private static boolean isJunk(Context context, String host, List<BlockList> blocklists) {
static Boolean isJunk(Context context, List<Address> addresses) {
for (Address address : addresses) {
String email = ((InternetAddress) address).getAddress();
String domain = UriHelper.getEmailDomain(email);
if (domain == null)
continue;
if (isJunk(context, domain, false, BLOCK_LISTS))
return true;
}
return false;
}
private static boolean isJunk(Context context, String host, boolean numeric, List<BlockList> blocklists) {
synchronized (cache) {
CacheEntry entry = cache.get(host);
if (entry != null && !entry.isExpired())
@ -149,7 +169,9 @@ public class DnsBlockList {
boolean blocked = false;
for (BlockList blocklist : blocklists)
if (isEnabled(context, blocklist) && isJunk(host, blocklist)) {
if (isEnabled(context, blocklist) &&
blocklist.numeric == numeric &&
isJunk(host, blocklist)) {
blocked = true;
break;
}
@ -162,9 +184,6 @@ public class DnsBlockList {
}
private static boolean isJunk(String host, BlockList blocklist) {
boolean numeric = host.startsWith("[") && host.endsWith("]");
if (numeric)
host = host.substring(1, host.length() - 1);
try {
if (blocklist.numeric) {
long start = new Date().getTime();
@ -202,7 +221,7 @@ public class DnsBlockList {
Log.w(ex);
}
}
} else if (!numeric) {
} else {
long start = new Date().getTime();
String lookup = host + "." + blocklist.address;
boolean junk = isJunk(lookup, blocklist.responses);