Skip to content

Fixed asynchronous hanging w/truncated SPF record #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dswitzer wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixed asynchronous hanging w/truncated SPF record #25

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
634710c
Fixed asynchronous hanging w/truncated SPF record
dswitzer Sep 10, 2024
f3284fa
Refactored AsynchronousSPFExecutorIntegrationTest to allow specifying…
dswitzer Sep 10, 2024
919be67
Removed unneeded imports
dswitzer Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion resolver/src/main/java/org/apache/james/jspf/executor/AsynchronousSPFExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xbill.DNS.lookup.NoSuchRRSetException;
import org.xbill.DNS.WireParseException;

/**
* Synchronous implementation of SPFExecuter. All queries will get executed synchronously
Expand Down Expand Up @@ -90,7 +91,16 @@ private void handleCont(SPFSession session, FutureSPFResult result, DNSLookupCon
if (e instanceof IOException && e.getMessage().startsWith("Timed out ")) {
e = new TimeoutException(e.getMessage());
}
if (e instanceof NoSuchRRSetException) {

/**
* When exceptions occur trying to resolve the DNS response, we must do some clean
* up handling or the request will end up hanging.
*
* NOTE — The org.xbill.DNS.WireParseException gets triggered if the SPF record is truncated
* due to too many lookups. There might be other types of DNS exceptions that need
* to be caught as well.
*/
if ((e instanceof NoSuchRRSetException) || (e instanceof WireParseException)) {
try {
DNSLookupContinuation dnsLookupContinuation = cont.getListener().onDNSResponse(new DNSResponse(new ArrayList<>()), session);
handleCont(session, result, dnsLookupContinuation, checker);
Expand Down
12 changes: 12 additions & 0 deletions resolver/src/test/java/org/apache/james/jspf/AsynchronousSPFExecutorIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,16 @@ public void test() {
assertEquals("Received-SPF: pass (spfCheck: domain of linagora.com designates 109.197.176.25 as permitted sender) client-ip=109.197.176.25; envelope-from=nico@linagora.com; helo=linagora.com;",
result.getHeader());
}

@Test
public void shouldParseWireParseExceptionRecordTruncated() {
SPF spf = new DefaultSPF();
SPFResult result = spf.checkSPF("170.146.224.15", "HelpDesk@arcofmc.org", "arcofmc.org");
System.out.println(result.getResult());
System.out.println(result.getExplanation());
System.out.println(result.getHeader());
assertEquals("permerror", result.getResult());
assertEquals("Received-SPF: permerror (spfCheck: Error in processing SPF Record) client-ip=170.146.224.15; envelope-from=HelpDesk@arcofmc.org; helo=arcofmc.org;",
result.getHeader());
}
}