From 356c7bec9c2900242b16d99968cdcd78e674dee9 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Sat, 24 Jun 2017 09:52:45 +0200 Subject: upgrade minidns. refactored dns utils --- .../java/de/pixart/messenger/utils/Resolver.java | 159 +++++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 src/main/java/de/pixart/messenger/utils/Resolver.java (limited to 'src/main/java/de/pixart/messenger/utils/Resolver.java') diff --git a/src/main/java/de/pixart/messenger/utils/Resolver.java b/src/main/java/de/pixart/messenger/utils/Resolver.java new file mode 100644 index 000000000..a5bcad547 --- /dev/null +++ b/src/main/java/de/pixart/messenger/utils/Resolver.java @@ -0,0 +1,159 @@ +package de.pixart.messenger.utils; + +import android.content.Context; +import android.support.annotation.NonNull; +import android.util.Log; + +import java.io.IOException; +import java.net.InetAddress; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import de.measite.minidns.DNSClient; +import de.measite.minidns.DNSName; +import de.measite.minidns.Question; +import de.measite.minidns.Record; +import de.measite.minidns.hla.DnssecResolverApi; +import de.measite.minidns.hla.ResolverResult; +import de.measite.minidns.record.A; +import de.measite.minidns.record.AAAA; +import de.measite.minidns.record.Data; +import de.measite.minidns.record.InternetAddressRR; +import de.measite.minidns.record.SRV; +import de.pixart.messenger.Config; + +public class Resolver { + + private static final String DIRECT_TLS_SERVICE = "_xmpps-client"; + private static final String STARTTLS_SERICE = "_xmpp-client"; + + public static void registerLookupMechanism(Context context) { + DNSClient.addDnsServerLookupMechanism(new AndroidUsingLinkProperties(context)); + } + + public static List resolve(String domain) { + List results = new ArrayList<>(); + try { + results.addAll(resolveSrv(domain, true)); + } catch (IOException e) { + //ignore + } + try { + results.addAll(resolveSrv(domain, false)); + } catch (IOException e) { + //ignore + } + if (results.size() == 0) { + results.add(Result.createDefault(domain)); + } + Collections.sort(results); + return results; + } + + private static List resolveSrv(String domain, final boolean directTls) throws IOException { + Question question = new Question((directTls ? DIRECT_TLS_SERVICE : STARTTLS_SERICE) + "._tcp." + domain, Record.TYPE.SRV); + ResolverResult result = DnssecResolverApi.INSTANCE.resolve(question); + List results = new ArrayList<>(); + for (Data record : result.getAnswersOrEmptySet()) { + if (record instanceof SRV) { + SRV srvRecord = (SRV) record; + boolean added = results.addAll(resolveIp(srvRecord, A.class, result.isAuthenticData(), directTls)); + added |= results.addAll(resolveIp(srvRecord, AAAA.class, result.isAuthenticData(), directTls)); + if (!added) { + Result resolverResult = Result.fromRecord(srvRecord, directTls); + resolverResult.authenticated = resolverResult.isAuthenticated(); + results.add(resolverResult); + } + } + } + return results; + } + + private static List resolveIp(SRV srv, Class type, boolean authenticated, boolean directTls) { + List list = new ArrayList<>(); + try { + ResolverResult results = DnssecResolverApi.INSTANCE.resolve(srv.name, type); + for (D record : results.getAnswersOrEmptySet()) { + Result resolverResult = Result.fromRecord(srv, directTls); + resolverResult.authenticated = results.isAuthenticData() && authenticated; + resolverResult.ip = record.getInetAddress(); + list.add(resolverResult); + } + } catch (IOException e) { + Log.d(Config.LOGTAG, e.getMessage()); + //ignore. will add default record later + } + return list; + } + + public static class Result implements Comparable { + private InetAddress ip; + private DNSName hostname; + private int port = 5222; + private boolean directTls = false; + private boolean authenticated = false; + private int priority; + + public InetAddress getIp() { + return ip; + } + + public int getPort() { + return port; + } + + public DNSName getHostname() { + return hostname; + } + + public boolean isDirectTls() { + return directTls; + } + + public boolean isAuthenticated() { + return authenticated; + } + + @Override + public String toString() { + return "Result{" + + "ip='" + ip + '\'' + + ", hostame='" + hostname.toString() + '\'' + + ", port=" + port + + ", directTls=" + directTls + + ", authenticated=" + authenticated + + ", priority=" + priority + + '}'; + } + + @Override + public int compareTo(@NonNull Result result) { + if (result.priority == priority) { + if (directTls == result.directTls) { + return 0; + } else { + return directTls ? 1 : -1; + } + } else { + return priority - result.priority; + } + } + + public static Result fromRecord(SRV srv, boolean directTls) { + Result result = new Result(); + result.port = srv.port; + result.hostname = srv.name; + result.directTls = directTls; + result.priority = srv.priority; + return result; + } + + public static Result createDefault(String domain) { + Result result = new Result(); + result.port = 5222; + result.hostname = DNSName.from(domain); + return result; + } + } +} \ No newline at end of file -- cgit v1.2.3