cogentleman/xmpp_client
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed fallback to normal DNS query after DNSSEC failed

Browse Source
This commit is contained in:
Daniel Gultsch 2017-07-09 18:03:26 +02:00
parent ae0ba3bbc1
commit 67bc032ccc
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/eu/siacs/conversations/utils/Resolver.java
View File

@ -93,16 +93,22 @@ public class Resolver {
private static <D extends Data> ResolverResult<D> resolveWithFallback(DNSName dnsName, Class<D> type) throws IOException { private static <D extends Data> ResolverResult<D> resolveWithFallback(DNSName dnsName, Class<D> type) throws IOException {
try { try {
return DnssecResolverApi.INSTANCE.resolveDnssecReliable(dnsName, type); final ResolverResult<D> r = DnssecResolverApi.INSTANCE.resolveDnssecReliable(dnsName, type);
if (r.wasSuccessful()) {
if (r.getAnswers().isEmpty() && type.equals(SRV.class)) {
Log.d(Config.LOGTAG,Resolver.class.getSimpleName()+": resolving SRV records of "+dnsName.toString()+" with DNSSEC yielded empty result");
}
return r;
}
Log.d(Config.LOGTAG,Resolver.class.getSimpleName()+": error resolving "+type.getSimpleName()+" with DNSSEC. Trying DNS instead.",r.getResolutionUnsuccessfulException());
} catch (DNSSECResultNotAuthenticException e) { } catch (DNSSECResultNotAuthenticException e) {
Log.d(Config.LOGTAG,Resolver.class.getSimpleName()+": error resolving "+type.getSimpleName()+" with DNSSEC. Trying DNS instead.",e); Log.d(Config.LOGTAG,Resolver.class.getSimpleName()+": error resolving "+type.getSimpleName()+" with DNSSEC. Trying DNS instead.",e);
return ResolverApi.INSTANCE.resolve(dnsName, type);
} catch (IOException e) { } catch (IOException e) {
throw e; throw e;
} catch (Throwable throwable) { } catch (Throwable throwable) {
Log.d(Config.LOGTAG,Resolver.class.getSimpleName()+": error resolving "+type.getSimpleName()+" with DNSSEC. Trying DNS instead.",throwable); Log.d(Config.LOGTAG,Resolver.class.getSimpleName()+": error resolving "+type.getSimpleName()+" with DNSSEC. Trying DNS instead.",throwable);
return ResolverApi.INSTANCE.resolve(dnsName, type);
} }
return ResolverApi.INSTANCE.resolve(dnsName, type);
} }
public static class Result implements Comparable<Result> { public static class Result implements Comparable<Result> {