Skip to content
This repository has been archived by the owner on Feb 12, 2022. It is now read-only.

Commit

Permalink
Use separate SSLContext for identified/unidentified requests
Browse files Browse the repository at this point in the history
  • Loading branch information
@moxie-signal
moxie-signal committed Nov 14, 2018
1 parent cd934a7 commit 0674df1
Showing 1 changed file with 56 additions and 32 deletions.
88 changes: 56 additions & 32 deletions java/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java
View file
Expand Up @@ -61,7 +61,6 @@
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.Arrays;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
Expand All @@ -74,7 +73,6 @@
import javax.net.ssl.X509TrustManager;

import okhttp3.Call;
import okhttp3.ConnectionPool;
import okhttp3.ConnectionSpec;
import okhttp3.Credentials;
import okhttp3.MediaType;
Expand Down Expand Up @@ -124,12 +122,9 @@ public class PushServiceSocket {
private long soTimeoutMillis = TimeUnit.SECONDS.toMillis(30);
private final Set<Call> connections = new HashSet<>();

private final ConnectionHolder[] serviceClients;
private final ConnectionHolder[] cdnClients;
private final ConnectionHolder[] contactDiscoveryClients;

private final ConnectionPool identifiedServiceConnectionPool;
private final ConnectionPool unidentifiedServiceConnectionPool;
private final ServiceConnectionHolder[] serviceClients;
private final ConnectionHolder[] cdnClients;
private final ConnectionHolder[] contactDiscoveryClients;

private final CredentialsProvider credentialsProvider;
private final String userAgent;
Expand All @@ -138,11 +133,9 @@ public class PushServiceSocket {
public PushServiceSocket(SignalServiceConfiguration signalServiceConfiguration, CredentialsProvider credentialsProvider, String userAgent) {
this.credentialsProvider = credentialsProvider;
this.userAgent = userAgent;
this.serviceClients = createConnectionHolders(signalServiceConfiguration.getSignalServiceUrls());
this.serviceClients = createServiceConnectionHolders(signalServiceConfiguration.getSignalServiceUrls());
this.cdnClients = createConnectionHolders(signalServiceConfiguration.getSignalCdnUrls());
this.contactDiscoveryClients = createConnectionHolders(signalServiceConfiguration.getSignalContactDiscoveryUrls());
this.identifiedServiceConnectionPool = new ConnectionPool();
this.unidentifiedServiceConnectionPool = new ConnectionPool();
this.random = new SecureRandom();
}

Expand Down Expand Up @@ -854,12 +847,12 @@ private Response getServiceConnection(String urlFragment, String method, String
throws PushNetworkException
{
try {
ConnectionHolder connectionHolder = getRandom(serviceClients, random);
OkHttpClient okHttpClient = connectionHolder.getClient().newBuilder()
.connectTimeout(soTimeoutMillis, TimeUnit.MILLISECONDS)
.readTimeout(soTimeoutMillis, TimeUnit.MILLISECONDS)
.connectionPool(unidentifiedAccess.isPresent() ? unidentifiedServiceConnectionPool : identifiedServiceConnectionPool)
.build();
ServiceConnectionHolder connectionHolder = (ServiceConnectionHolder) getRandom(serviceClients, random);
OkHttpClient baseClient = unidentifiedAccess.isPresent() ? connectionHolder.getUnidentifiedClient() : connectionHolder.getClient();
OkHttpClient okHttpClient = baseClient.newBuilder()
.connectTimeout(soTimeoutMillis, TimeUnit.MILLISECONDS)
.readTimeout(soTimeoutMillis, TimeUnit.MILLISECONDS)
.build();

Log.w(TAG, "Push service URL: " + connectionHolder.getUrl());
Log.w(TAG, "Opening URL: " + String.format("%s%s", connectionHolder.getUrl(), urlFragment));
Expand Down Expand Up @@ -960,25 +953,39 @@ private Response makeContactDiscoveryRequest(String authorization, List<String>
throw new NonSuccessfulResponseCodeException("Response: " + response);
}

private ServiceConnectionHolder[] createServiceConnectionHolders(SignalUrl[] urls) {
List<ServiceConnectionHolder> serviceConnectionHolders = new LinkedList<>();

for (SignalUrl url : urls) {
serviceConnectionHolders.add(new ServiceConnectionHolder(createConnectionClient(url),
createConnectionClient(url),
url.getUrl(), url.getHostHeader()));
}

return serviceConnectionHolders.toArray(new ServiceConnectionHolder[0]);
}

private ConnectionHolder[] createConnectionHolders(SignalUrl[] urls) {
try {
List<ConnectionHolder> connectionHolders = new LinkedList<>();
List<ConnectionHolder> connectionHolders = new LinkedList<>();

for (SignalUrl url : urls) {
TrustManager[] trustManagers = BlacklistingTrustManager.createFor(url.getTrustStore());
for (SignalUrl url : urls) {
connectionHolders.add(new ConnectionHolder(createConnectionClient(url), url.getUrl(), url.getHostHeader()));
}

SSLContext context = SSLContext.getInstance("TLS");
context.init(null, trustManagers, null);
return connectionHolders.toArray(new ConnectionHolder[0]);
}

OkHttpClient client = new OkHttpClient.Builder()
.sslSocketFactory(context.getSocketFactory(), (X509TrustManager)trustManagers[0])
.connectionSpecs(url.getConnectionSpecs().or(Util.immutableList(ConnectionSpec.MODERN_TLS, ConnectionSpec.COMPATIBLE_TLS)))
.build();
private OkHttpClient createConnectionClient(SignalUrl url) {
try {
TrustManager[] trustManagers = BlacklistingTrustManager.createFor(url.getTrustStore());

connectionHolders.add(new ConnectionHolder(client, url.getUrl(), url.getHostHeader()));
}
SSLContext context = SSLContext.getInstance("TLS");
context.init(null, trustManagers, null);

return connectionHolders.toArray(new ConnectionHolder[0]);
return new OkHttpClient.Builder()
.sslSocketFactory(context.getSocketFactory(), (X509TrustManager)trustManagers[0])
.connectionSpecs(url.getConnectionSpecs().or(Util.immutableList(ConnectionSpec.MODERN_TLS, ConnectionSpec.COMPATIBLE_TLS)))
.build();
} catch (NoSuchAlgorithmException | KeyManagementException e) {
throw new AssertionError(e);
}
Expand Down Expand Up @@ -1047,7 +1054,9 @@ public String getLocation() {
}
}


private static class ConnectionHolder {

private final OkHttpClient client;
private final String url;
private final Optional<String> hostHeader;
Expand All @@ -1058,16 +1067,31 @@ private ConnectionHolder(OkHttpClient client, String url, Optional<String> hostH
this.hostHeader = hostHeader;
}

public OkHttpClient getClient() {
OkHttpClient getClient() {
return client;
}

public String getUrl() {
return url;
}

public Optional<String> getHostHeader() {
Optional<String> getHostHeader() {
return hostHeader;
}
}

private static class ServiceConnectionHolder extends ConnectionHolder {

private final OkHttpClient unidentifiedClient;

private ServiceConnectionHolder(OkHttpClient identifiedClient, OkHttpClient unidentifiedClient, String url, Optional<String> hostHeader) {
super(identifiedClient, url, hostHeader);
this.unidentifiedClient = unidentifiedClient;
}

OkHttpClient getUnidentifiedClient() {
return unidentifiedClient;
}
}

}

0 comments on commit 0674df1

Please sign in to comment.