Networkstack: easy happy eyeball
This commit is contained in:
parent
c437fb067b
commit
50456e3cac
|
|
@ -7,8 +7,17 @@ import android.util.Log;
|
|||
|
||||
import java.io.IOException;
|
||||
import java.lang.reflect.Field;
|
||||
import java.net.InetAddress;
|
||||
import java.net.InetSocketAddress;
|
||||
import java.net.Socket;
|
||||
import java.net.UnknownHostException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.concurrent.Callable;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.List;
|
||||
|
||||
import de.measite.minidns.AbstractDNSClient;
|
||||
|
|
@ -21,11 +30,15 @@ import de.measite.minidns.hla.DnssecResolverApi;
|
|||
import de.measite.minidns.hla.ResolverApi;
|
||||
import de.measite.minidns.hla.ResolverResult;
|
||||
import de.measite.minidns.iterative.ReliableDNSClient;
|
||||
import de.measite.minidns.record.A;
|
||||
import de.measite.minidns.record.AAAA;
|
||||
import de.measite.minidns.record.CNAME;
|
||||
import de.measite.minidns.record.Data;
|
||||
import de.measite.minidns.record.InternetAddressRR;
|
||||
import de.measite.minidns.record.SRV;
|
||||
import eu.siacs.conversations.Config;
|
||||
import eu.siacs.conversations.R;
|
||||
import eu.siacs.conversations.persistance.FileBackend;
|
||||
import eu.siacs.conversations.services.XmppConnectionService;
|
||||
|
||||
public class Resolver {
|
||||
|
|
@ -62,13 +75,13 @@ public class Resolver {
|
|||
}
|
||||
}
|
||||
|
||||
public static List<Result> fromHardCoded(String hostname, int port) {
|
||||
Result result = new Result();
|
||||
result.hostname = DNSName.from(hostname);
|
||||
result.port = port;
|
||||
result.directTls = useDirectTls(port);
|
||||
result.authenticated = true;
|
||||
return Collections.singletonList(result);
|
||||
public static Result fromHardCoded(String hostname, int port) {
|
||||
final Result ipResult = fromIpAddress(hostname, port);
|
||||
if (ipResult != null) {
|
||||
ipResult.connect();
|
||||
return ipResult;
|
||||
}
|
||||
return happyEyeball(resolveNoSrvRecords(DNSName.from(hostname), port, true));
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -76,10 +89,11 @@ public class Resolver {
|
|||
return port == 443 || port == 5223;
|
||||
}
|
||||
|
||||
public static List<Result> resolve(String domain) {
|
||||
final List<Result> ipResults = fromIpAddress(domain);
|
||||
if (ipResults.size() > 0) {
|
||||
return ipResults;
|
||||
public static Result resolve(String domain) {
|
||||
final Result ipResult = fromIpAddress(domain, DEFAULT_PORT_XMPP);
|
||||
if (ipResult != null) {
|
||||
ipResult.connect();
|
||||
return ipResult;
|
||||
}
|
||||
final List<Result> results = new ArrayList<>();
|
||||
final List<Result> fallbackResults = new ArrayList<>();
|
||||
|
|
@ -105,7 +119,7 @@ public class Resolver {
|
|||
}
|
||||
});
|
||||
threads[2] = new Thread(() -> {
|
||||
List<Result> list = resolveNoSrvRecords(DNSName.from(domain), true);
|
||||
List<Result> list = resolveNoSrvRecords(DNSName.from(domain), DEFAULT_PORT_XMPP, true);
|
||||
synchronized (fallbackResults) {
|
||||
fallbackResults.addAll(list);
|
||||
}
|
||||
|
|
@ -121,63 +135,106 @@ public class Resolver {
|
|||
synchronized (results) {
|
||||
Collections.sort(results);
|
||||
Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + ": " + results.toString());
|
||||
return new ArrayList<>(results);
|
||||
return happyEyeball(results);
|
||||
}
|
||||
} else {
|
||||
threads[2].join();
|
||||
synchronized (fallbackResults) {
|
||||
Collections.sort(fallbackResults);
|
||||
Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + ": " + fallbackResults.toString());
|
||||
return new ArrayList<>(fallbackResults);
|
||||
return happyEyeball(fallbackResults);
|
||||
}
|
||||
}
|
||||
} catch (InterruptedException e) {
|
||||
for (Thread thread : threads) {
|
||||
thread.interrupt();
|
||||
}
|
||||
return Collections.emptyList();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static List<Result> fromIpAddress(String domain) {
|
||||
private static Result fromIpAddress(String domain, int port) {
|
||||
if (!IP.matches(domain)) {
|
||||
return Collections.emptyList();
|
||||
return null;
|
||||
}
|
||||
try {
|
||||
Result result = new Result();
|
||||
result.ip = InetAddress.getByName(domain);
|
||||
result.port = port;
|
||||
return result;
|
||||
} catch (UnknownHostException e) {
|
||||
return null;
|
||||
}
|
||||
return Collections.singletonList(Result.createDefault(DNSName.from(domain)));
|
||||
}
|
||||
|
||||
private static List<Result> resolveSrv(String domain, final boolean directTls) throws IOException {
|
||||
DNSName dnsName = DNSName.from((directTls ? DIRECT_TLS_SERVICE : STARTTLS_SERVICE) + "._tcp." + domain);
|
||||
ResolverResult<SRV> result = resolveWithFallback(dnsName, SRV.class);
|
||||
final List<Result> results = new ArrayList<>();
|
||||
final List<Thread> threads = new ArrayList<>();
|
||||
for (SRV record : result.getAnswersOrEmptySet()) {
|
||||
if (record.name.length() == 0 && record.priority == 0) {
|
||||
continue;
|
||||
}
|
||||
Result resolverResult = Result.fromRecord(record, directTls);
|
||||
resolverResult.authenticated = result.isAuthenticData();
|
||||
results.add(resolverResult);
|
||||
threads.add(new Thread(() -> {
|
||||
final List<Result> ipv6s = resolveIp(record, AAAA.class, result.isAuthenticData(), directTls);
|
||||
synchronized (results) {
|
||||
results.addAll(ipv6s);
|
||||
}
|
||||
}));
|
||||
threads.add(new Thread(() -> {
|
||||
final List<Result> ipv4s = resolveIp(record, A.class, result.isAuthenticData(), directTls);
|
||||
synchronized (results) {
|
||||
results.addAll(ipv4s);
|
||||
}
|
||||
}));
|
||||
}
|
||||
for (Thread thread : threads) {
|
||||
thread.start();
|
||||
}
|
||||
for (Thread thread : threads) {
|
||||
try {
|
||||
thread.join();
|
||||
} catch (InterruptedException e) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
}
|
||||
|
||||
return results;
|
||||
}
|
||||
|
||||
private static List<Result> resolveNoSrvRecords(DNSName dnsName, boolean withCnames) {
|
||||
List<Result> results = new ArrayList<>();
|
||||
Boolean resolveCNAME = false;
|
||||
private static <D extends InternetAddressRR> List<Result> resolveIp(SRV srv, Class<D> type, boolean authenticated, boolean directTls) {
|
||||
List<Result> list = new ArrayList<>();
|
||||
try {
|
||||
if (withCnames) {
|
||||
ResolverResult<D> results = resolveWithFallback(srv.name, type, authenticated);
|
||||
for (D record : results.getAnswersOrEmptySet()) {
|
||||
Result resolverResult = Result.fromRecord(srv, directTls);
|
||||
resolverResult.authenticated = results.isAuthenticData() && authenticated;
|
||||
resolverResult.ip = record.getInetAddress();
|
||||
list.add(resolverResult);
|
||||
}
|
||||
} catch (Throwable t) {
|
||||
Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + ": error resolving " + type.getSimpleName() + " " + t.getMessage());
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
private static List<Result> resolveNoSrvRecords(DNSName dnsName, int port, boolean withCnames) {
|
||||
List<Result> results = new ArrayList<>();
|
||||
try {
|
||||
for (AAAA aaaa : resolveWithFallback(dnsName, AAAA.class, false).getAnswersOrEmptySet()) {
|
||||
results.add(Result.createDefault(dnsName, aaaa.getInetAddress(), port));
|
||||
}
|
||||
for (A a : resolveWithFallback(dnsName, A.class, false).getAnswersOrEmptySet()) {
|
||||
results.add(Result.createDefault(dnsName, a.getInetAddress(), port));
|
||||
}
|
||||
if (results.size() == 0 && withCnames) {
|
||||
for (CNAME cname : resolveWithFallback(dnsName, CNAME.class, false).getAnswersOrEmptySet()) {
|
||||
results.addAll(resolveNoSrvRecords(cname.name, false));
|
||||
resolveCNAME = true;
|
||||
results.addAll(resolveNoSrvRecords(cname.name, port, false));
|
||||
}
|
||||
}
|
||||
} catch (Throwable throwable) {
|
||||
Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + "error resolving fallback records", throwable);
|
||||
}
|
||||
if(!resolveCNAME) {
|
||||
results.add(Result.createDefault(dnsName));
|
||||
}
|
||||
return results;
|
||||
}
|
||||
|
||||
|
|
@ -202,22 +259,64 @@ public class Resolver {
|
|||
return ResolverApi.INSTANCE.resolve(question);
|
||||
}
|
||||
|
||||
private static Result happyEyeball(List<Result> r) {
|
||||
if (r.size() == 0) return null;
|
||||
|
||||
Result result;
|
||||
if (r.size() == 1) {
|
||||
result = r.get(0);
|
||||
result.connect();
|
||||
return result;
|
||||
}
|
||||
|
||||
ExecutorService executor = (ExecutorService) Executors.newFixedThreadPool(4);
|
||||
|
||||
try {
|
||||
result = executor.invokeAny(r);
|
||||
executor.shutdown();
|
||||
Thread disconnector = new Thread(() -> {
|
||||
while (true) {
|
||||
try {
|
||||
if (executor.awaitTermination(5, TimeUnit.SECONDS)) break;
|
||||
Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + ": happy eyeball wait for cleanup ...");
|
||||
} catch (InterruptedException e) {}
|
||||
}
|
||||
Log.i(Config.LOGTAG, Resolver.class.getSimpleName() + ": happy eyeball cleanup");
|
||||
for (Result re : r) {
|
||||
if(!re.equals(result)) re.disconnect();
|
||||
}
|
||||
});
|
||||
disconnector.start();
|
||||
Log.i(Config.LOGTAG, Resolver.class.getSimpleName() + ": happy eyeball used: " + result.toString());
|
||||
return result;
|
||||
} catch (InterruptedException e) {
|
||||
Log.e(Config.LOGTAG, Resolver.class.getSimpleName() + ": happy eyeball failed: ", e);
|
||||
return null;
|
||||
} catch (ExecutionException e) {
|
||||
Log.e(Config.LOGTAG, Resolver.class.getSimpleName() + ": happy eyeball failed: ", e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean validateHostname() {
|
||||
return SERVICE != null && SERVICE.getBooleanPreference("validate_hostname", R.bool.validate_hostname);
|
||||
}
|
||||
|
||||
public static class Result implements Comparable<Result> {
|
||||
public static final String DOMAIN = "domain";
|
||||
public static class Result implements Comparable<Result>, Callable<Result> {
|
||||
public static final String IP = "ip";
|
||||
public static final String HOSTNAME = "hostname";
|
||||
public static final String PORT = "port";
|
||||
public static final String PRIORITY = "priority";
|
||||
public static final String DIRECT_TLS = "directTls";
|
||||
public static final String AUTHENTICATED = "authenticated";
|
||||
|
||||
private InetAddress ip;
|
||||
private DNSName hostname;
|
||||
private int port = DEFAULT_PORT_XMPP;
|
||||
private boolean directTls = false;
|
||||
private boolean authenticated = false;
|
||||
private int priority;
|
||||
private Socket socket;
|
||||
|
||||
static Result fromRecord(SRV srv, boolean directTls) {
|
||||
Result result = new Result();
|
||||
|
|
@ -227,22 +326,12 @@ public class Resolver {
|
|||
result.priority = srv.priority;
|
||||
return result;
|
||||
}
|
||||
|
||||
static Result createDefault(DNSName hostname) {
|
||||
|
||||
static Result createDefault(DNSName hostname, InetAddress ip, int port) {
|
||||
Result result = new Result();
|
||||
result.port = DEFAULT_PORT_XMPP;
|
||||
result.port = port;
|
||||
result.hostname = hostname;
|
||||
return result;
|
||||
}
|
||||
|
||||
public static Result fromCursor(Cursor cursor) {
|
||||
final Result result = new Result();
|
||||
final String hostname = cursor.getString(cursor.getColumnIndex(HOSTNAME));
|
||||
result.hostname = hostname == null ? null : DNSName.from(hostname);
|
||||
result.port = cursor.getInt(cursor.getColumnIndex(PORT));
|
||||
result.priority = cursor.getInt(cursor.getColumnIndex(PRIORITY));
|
||||
result.authenticated = cursor.getInt(cursor.getColumnIndex(AUTHENTICATED)) > 0;
|
||||
result.directTls = cursor.getInt(cursor.getColumnIndex(DIRECT_TLS)) > 0;
|
||||
result.ip = ip;
|
||||
return result;
|
||||
}
|
||||
|
||||
|
|
@ -257,12 +346,14 @@ public class Resolver {
|
|||
if (directTls != result.directTls) return false;
|
||||
if (authenticated != result.authenticated) return false;
|
||||
if (priority != result.priority) return false;
|
||||
if (ip != null ? !ip.equals(result.ip) : result.ip != null) return false;
|
||||
return hostname != null ? hostname.equals(result.hostname) : result.hostname == null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
int result = hostname != null ? hostname.hashCode() : 0;
|
||||
int result = ip != null ? ip.hashCode() : 0;
|
||||
result = 31 * result + (hostname != null ? hostname.hashCode() : 0);
|
||||
result = 31 * result + port;
|
||||
result = 31 * result + (directTls ? 1 : 0);
|
||||
result = 31 * result + (authenticated ? 1 : 0);
|
||||
|
|
@ -270,10 +361,6 @@ public class Resolver {
|
|||
return result;
|
||||
}
|
||||
|
||||
public int getPort() {
|
||||
return port;
|
||||
}
|
||||
|
||||
public DNSName getHostname() {
|
||||
return hostname;
|
||||
}
|
||||
|
|
@ -286,9 +373,14 @@ public class Resolver {
|
|||
return authenticated;
|
||||
}
|
||||
|
||||
public Socket getSocket() {
|
||||
return socket;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "Result{" +
|
||||
"ip='" + (ip == null ? null : ip.getHostAddress()) + '\'' +
|
||||
", hostame='" + hostname.toString() + '\'' +
|
||||
", port=" + port +
|
||||
", directTls=" + directTls +
|
||||
|
|
@ -297,11 +389,35 @@ public class Resolver {
|
|||
'}';
|
||||
}
|
||||
|
||||
public void connect() {
|
||||
if (this.socket != null) {
|
||||
this.disconnect();
|
||||
}
|
||||
final InetSocketAddress addr = new InetSocketAddress(this.ip, this.port);
|
||||
this.socket = new Socket();
|
||||
try {
|
||||
long time = System.currentTimeMillis();
|
||||
this.socket.connect(addr, Config.SOCKET_TIMEOUT * 1000);
|
||||
time = System.currentTimeMillis() - time;
|
||||
Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + ": Result connect: " + toString() + " after: " + time + " ms");
|
||||
} catch (IOException e) {
|
||||
this.disconnect();
|
||||
}
|
||||
}
|
||||
|
||||
public void disconnect() {
|
||||
if (this.socket != null ) {
|
||||
FileBackend.close(this.socket);
|
||||
this.socket = null;
|
||||
Log.d(Config.LOGTAG, Resolver.class.getSimpleName() + ": Result disconnect: " + toString());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int compareTo(@NonNull Result result) {
|
||||
if (result.priority == priority) {
|
||||
if (directTls == result.directTls) {
|
||||
return 0;
|
||||
return 0;
|
||||
} else {
|
||||
return directTls ? -1 : 1;
|
||||
}
|
||||
|
|
@ -309,9 +425,15 @@ public class Resolver {
|
|||
return priority - result.priority;
|
||||
}
|
||||
}
|
||||
@Override
|
||||
public Result call() throws Exception {
|
||||
this.connect();
|
||||
return this.socket.isConnected() ? this : null;
|
||||
}
|
||||
|
||||
public ContentValues toContentValues() {
|
||||
final ContentValues contentValues = new ContentValues();
|
||||
contentValues.put(IP, ip == null ? null : ip.getAddress());
|
||||
contentValues.put(HOSTNAME, hostname == null ? null : hostname.toString());
|
||||
contentValues.put(PORT, port);
|
||||
contentValues.put(PRIORITY, priority);
|
||||
|
|
|
|||
|
|
@ -290,65 +290,50 @@ public class XmppConnection implements Runnable {
|
|||
}
|
||||
} else {
|
||||
final String domain = account.getJid().getDomain();
|
||||
final List<Resolver.Result> results;
|
||||
final Resolver.Result result;
|
||||
final boolean hardcoded = extended && !account.getHostname().isEmpty();
|
||||
if (hardcoded) {
|
||||
results = Resolver.fromHardCoded(account.getHostname(), account.getPort());
|
||||
result = Resolver.fromHardCoded(account.getHostname(), account.getPort());
|
||||
} else {
|
||||
results = Resolver.resolve(domain);
|
||||
result = Resolver.resolve(domain);
|
||||
}
|
||||
if (result == null) {
|
||||
throw new UnknownHostException();
|
||||
}
|
||||
if (Thread.currentThread().isInterrupted()) {
|
||||
Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": Thread was interrupted");
|
||||
return;
|
||||
}
|
||||
if (results.size() == 0) {
|
||||
Log.e(Config.LOGTAG,account.getJid().asBareJid()+": Resolver results were empty");
|
||||
try {
|
||||
// if tls is true, encryption is implied and must not be started
|
||||
features.encryptionEnabled = result.isDirectTls();
|
||||
verifiedHostname = result.isAuthenticated() ? result.getHostname().toString() : null;
|
||||
Log.d(Config.LOGTAG,"verified hostname " + verifiedHostname);
|
||||
Log.d(Config.LOGTAG, account.getJid().asBareJid().toString()
|
||||
+ ": using values from resolver " + result.toString());
|
||||
|
||||
localSocket = result.getSocket();
|
||||
|
||||
if (features.encryptionEnabled) {
|
||||
localSocket = upgradeSocketToTls(localSocket);
|
||||
}
|
||||
|
||||
localSocket.setSoTimeout(Config.SOCKET_TIMEOUT * 1000);
|
||||
if (startXmpp(localSocket)) {
|
||||
localSocket.setSoTimeout(0); //reset to 0; once the connection is established we don’t want this
|
||||
// successfully connected to server that speaks xmpp
|
||||
} else {
|
||||
FileBackend.close(localSocket);
|
||||
throw new StateChangingException(Account.State.STREAM_OPENING_ERROR);
|
||||
}
|
||||
} catch (final StateChangingException e) {
|
||||
throw e;
|
||||
} catch (InterruptedException e) {
|
||||
Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": thread was interrupted before beginning stream");
|
||||
return;
|
||||
}
|
||||
for (Iterator<Resolver.Result> iterator = results.iterator(); iterator.hasNext(); ) {
|
||||
final Resolver.Result result = iterator.next();
|
||||
if (Thread.currentThread().isInterrupted()) {
|
||||
Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": Thread was interrupted");
|
||||
return;
|
||||
}
|
||||
try {
|
||||
// if tls is true, encryption is implied and must not be started
|
||||
features.encryptionEnabled = result.isDirectTls();
|
||||
verifiedHostname = result.isAuthenticated() ? result.getHostname().toString() : null;
|
||||
Log.d(Config.LOGTAG,"verified hostname "+verifiedHostname);
|
||||
final InetSocketAddress addr = new InetSocketAddress(IDN.toASCII(result.getHostname().toString()), result.getPort());
|
||||
Log.d(Config.LOGTAG, account.getJid().asBareJid().toString()
|
||||
+ ": using values from resolver "
|
||||
+ result.getHostname().toString() + ":" + result.getPort() + " tls: " + features.encryptionEnabled);
|
||||
|
||||
localSocket = new Socket();
|
||||
localSocket.connect(addr, Config.SOCKET_TIMEOUT * 1000);
|
||||
|
||||
if (features.encryptionEnabled) {
|
||||
localSocket = upgradeSocketToTls(localSocket);
|
||||
}
|
||||
|
||||
localSocket.setSoTimeout(Config.SOCKET_TIMEOUT * 1000);
|
||||
if (startXmpp(localSocket)) {
|
||||
localSocket.setSoTimeout(0); //reset to 0; once the connection is established we don’t want this
|
||||
break; // successfully connected to server that speaks xmpp
|
||||
} else {
|
||||
FileBackend.close(localSocket);
|
||||
throw new StateChangingException(Account.State.STREAM_OPENING_ERROR);
|
||||
}
|
||||
} catch (final StateChangingException e) {
|
||||
if (!iterator.hasNext()) {
|
||||
throw e;
|
||||
}
|
||||
} catch (InterruptedException e) {
|
||||
Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": thread was interrupted before beginning stream");
|
||||
return;
|
||||
} catch (final Throwable e) {
|
||||
Log.d(Config.LOGTAG, account.getJid().asBareJid().toString() + ": " + e.getMessage() + "(" + e.getClass().getName() + ")");
|
||||
if (!iterator.hasNext()) {
|
||||
throw new UnknownHostException();
|
||||
}
|
||||
}
|
||||
} catch (final Throwable e) {
|
||||
Log.d(Config.LOGTAG, account.getJid().asBareJid().toString() + ": " + e.getMessage() + "(" + e.getClass().getName() + ")");
|
||||
throw new UnknownHostException();
|
||||
}
|
||||
}
|
||||
processStream();
|
||||
|
|
@ -362,8 +347,12 @@ public class XmppConnection implements Runnable {
|
|||
this.changeStatus(Account.State.SERVER_NOT_FOUND);
|
||||
} catch (final SocksSocketFactory.SocksProxyNotFoundException e) {
|
||||
this.changeStatus(Account.State.TOR_NOT_AVAILABLE);
|
||||
} catch (final IOException | XmlPullParserException e) {
|
||||
Log.d(Config.LOGTAG, account.getJid().asBareJid().toString() + ": " + e.getMessage());
|
||||
} catch (final IOException e) {
|
||||
Log.d(Config.LOGTAG, account.getJid().asBareJid().toString() + ": socket io :" + e.getMessage());
|
||||
this.changeStatus(Account.State.OFFLINE);
|
||||
this.attempt = Math.max(0, this.attempt - 1);
|
||||
} catch (final XmlPullParserException e) {
|
||||
Log.d(Config.LOGTAG, account.getJid().asBareJid().toString() + ": xml parser :" + e.getMessage());
|
||||
this.changeStatus(Account.State.OFFLINE);
|
||||
this.attempt = Math.max(0, this.attempt - 1);
|
||||
} finally {
|
||||
|
|
|
|||
Loading…
Reference in New Issue