mirror/monocles_chat_clean
1
0
Fork 1
Code Activity

Try DNSSEC 3 times

Browse source 
Since sometimes there are transient failures, so if DNSSEC is present
and not validating try again before giving up

(cherry picked from commit 7f813e77c26da0c820a155014cf9e70d5c9d440f)
This commit is contained in:
Stephen Paul Weber 2024-10-30 10:46:19 -05:00 committed by Arne
parent b07df293c7
commit d3d3dbd946
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/main/java/eu/siacs/conversations/utils/Resolver.java
View file

@ -490,16 +490,20 @@ public class Resolver {
() -> {
final Question question = new Question(dnsName, Record.TYPE.getType(type));
if (!DNSSECLESS_TLDS.contains(dnsName.getLabels()[0].toString())) {
try {
ResolverResult<D> result = DnssecResolverApi.INSTANCE.resolve(question);
if (result.wasSuccessful() && !result.isAuthenticData()) {
Log.d(Config.LOGTAG, "DNSSEC validation failed for " + type.getSimpleName() + " : " + result.getUnverifiedReasons());
for (int i = 0; i < 3; i++) {
try {
ResolverResult<D> result = DnssecResolverApi.INSTANCE.resolve(question);
if (result.wasSuccessful() && !result.isAuthenticData()) {
Log.d(Config.LOGTAG, "DNSSEC validation failed for " + type.getSimpleName() + " : " + result.getUnverifiedReasons());
}
return result;
} catch (DnssecValidationFailedException e) {
Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + ": error resolving " + type.getSimpleName() + " with DNSSEC. Trying DNS instead.", e);
// Try again, may be transient DNSSEC failure https://github.com/MiniDNS/minidns/issues/132
} catch (Throwable throwable) {
Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + ": error resolving " + type.getSimpleName() + " with DNSSEC. Trying DNS instead.", throwable);
break;
}
return result;
} catch (DnssecValidationFailedException e) {
Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + ": error resolving " + type.getSimpleName() + " with DNSSEC. Trying DNS instead.", e);
} catch (Throwable throwable) {
Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + ": error resolving " + type.getSimpleName() + " with DNSSEC. Trying DNS instead.", throwable);
}
}
return ResolverApi.INSTANCE.resolve(question);