From a1a677a3e253412b7b91eeeaaa24d09f76afc8da Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Tue, 30 Aug 2022 14:40:38 -0400 Subject: [PATCH] Apply network interceptors to CDSv2 websocket client. --- .../signalservice/api/services/CdsiSocket.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/CdsiSocket.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/CdsiSocket.java index f8cd04feac..38393d4dac 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/CdsiSocket.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/CdsiSocket.java @@ -33,6 +33,7 @@ import javax.net.ssl.X509TrustManager; import io.reactivex.rxjava3.core.Observable; import okhttp3.ConnectionSpec; +import okhttp3.Interceptor; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; @@ -58,12 +59,17 @@ final class CdsiSocket { Pair socketFactory = createTlsSocketFactory(configuration.getSignalCdsiUrls()[0].getTrustStore()); - this.okhttp = new OkHttpClient.Builder().sslSocketFactory(new Tls12SocketFactory(socketFactory.first()), - socketFactory.second()) - .connectionSpecs(Util.immutableList(ConnectionSpec.RESTRICTED_TLS)) - .readTimeout(30, TimeUnit.SECONDS) - .connectTimeout(30, TimeUnit.SECONDS) - .build(); + OkHttpClient.Builder builder = new OkHttpClient.Builder() + .sslSocketFactory(new Tls12SocketFactory(socketFactory.first()), socketFactory.second()) + .connectionSpecs(Util.immutableList(ConnectionSpec.RESTRICTED_TLS)) + .readTimeout(30, TimeUnit.SECONDS) + .connectTimeout(30, TimeUnit.SECONDS); + + for (Interceptor interceptor : configuration.getNetworkInterceptors()) { + builder.addInterceptor(interceptor); + } + + this.okhttp = builder.build(); } Observable connect(String username, String password, ClientRequest clientRequest, Consumer tokenSaver) {