From a31da7616dee6f9f7122a35a660f1754c6d135dc Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Thu, 23 Jan 2020 11:28:17 -0500 Subject: [PATCH] Rename 'userAgent' to 'signalAgent'. This wasn't actually being used in the User-Agent header. Instead, it was used as the value for an X-Signal-Agent header. To avoid confusion, I'm renaming this. --- app/build.gradle | 2 +- .../ApplicationDependencyProvider.java | 6 +++--- .../securesms/push/AccountManagerFactory.java | 4 ++-- .../api/SignalServiceAccountManager.java | 12 ++++++------ .../api/SignalServiceMessageReceiver.java | 16 ++++++++-------- .../api/SignalServiceMessageSender.java | 8 ++++---- .../internal/push/PushServiceSocket.java | 10 +++++----- .../internal/websocket/WebSocketConnection.java | 10 +++++----- 8 files changed, 34 insertions(+), 34 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index cbe680972..faae9e098 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -227,7 +227,7 @@ android { buildConfigField "String", "SIGNAL_KEY_BACKUP_URL", "\"https://api.backup.signal.org\"" buildConfigField "String", "CONTENT_PROXY_HOST", "\"contentproxy.signal.org\"" buildConfigField "int", "CONTENT_PROXY_PORT", "443" - buildConfigField "String", "USER_AGENT", "\"OWA\"" + buildConfigField "String", "SIGNAL_AGENT", "\"OWA\"" buildConfigField "boolean", "DEV_BUILD", "false" buildConfigField "String", "MRENCLAVE", "\"cd6cfc342937b23b1bdd3bbf9721aa5615ac9ff50a75c5527d441cd3276826c9\"" buildConfigField "String", "KEY_BACKUP_ENCLAVE_NAME", "\"\"" diff --git a/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider.java b/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider.java index 3cdbf68d2..6926c1376 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider.java +++ b/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider.java @@ -57,7 +57,7 @@ public class ApplicationDependencyProvider implements ApplicationDependencies.Pr public @NonNull SignalServiceAccountManager provideSignalServiceAccountManager() { return new SignalServiceAccountManager(networkAccess.getConfiguration(context), new DynamicCredentialsProvider(context), - BuildConfig.USER_AGENT); + BuildConfig.SIGNAL_AGENT); } @Override @@ -65,7 +65,7 @@ public class ApplicationDependencyProvider implements ApplicationDependencies.Pr return new SignalServiceMessageSender(networkAccess.getConfiguration(context), new DynamicCredentialsProvider(context), new SignalProtocolStoreImpl(context), - BuildConfig.USER_AGENT, + BuildConfig.SIGNAL_AGENT, TextSecurePreferences.isMultiDevice(context), Optional.fromNullable(IncomingMessageObserver.getPipe()), Optional.fromNullable(IncomingMessageObserver.getUnidentifiedPipe()), @@ -78,7 +78,7 @@ public class ApplicationDependencyProvider implements ApplicationDependencies.Pr : new UptimeSleepTimer(); return new SignalServiceMessageReceiver(networkAccess.getConfiguration(context), new DynamicCredentialsProvider(context), - BuildConfig.USER_AGENT, + BuildConfig.SIGNAL_AGENT, new PipeConnectivityListener(), sleepTimer); } diff --git a/app/src/main/java/org/thoughtcrime/securesms/push/AccountManagerFactory.java b/app/src/main/java/org/thoughtcrime/securesms/push/AccountManagerFactory.java index 9953e1210..cf24beda2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/push/AccountManagerFactory.java +++ b/app/src/main/java/org/thoughtcrime/securesms/push/AccountManagerFactory.java @@ -36,7 +36,7 @@ public class AccountManagerFactory { } return new SignalServiceAccountManager(new SignalServiceNetworkAccess(context).getConfiguration(number), - uuid, number, password, BuildConfig.USER_AGENT); + uuid, number, password, BuildConfig.SIGNAL_AGENT); } /** @@ -57,7 +57,7 @@ public class AccountManagerFactory { } return new SignalServiceAccountManager(new SignalServiceNetworkAccess(context).getConfiguration(number), - null, number, password, BuildConfig.USER_AGENT); + null, number, password, BuildConfig.SIGNAL_AGENT); } } diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java index 7adc13ddf..f91433db6 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java @@ -95,22 +95,22 @@ public class SignalServiceAccountManager { * @param uuid The Signal Service UUID. * @param e164 The Signal Service phone number. * @param password A Signal Service password. - * @param userAgent A string which identifies the client software. + * @param signalAgent A string which identifies the client software. */ public SignalServiceAccountManager(SignalServiceConfiguration configuration, UUID uuid, String e164, String password, - String userAgent) + String signalAgent) { - this(configuration, new StaticCredentialsProvider(uuid, e164, password, null), userAgent); + this(configuration, new StaticCredentialsProvider(uuid, e164, password, null), signalAgent); } public SignalServiceAccountManager(SignalServiceConfiguration configuration, CredentialsProvider credentialsProvider, - String userAgent) + String signalAgent) { - this.pushServiceSocket = new PushServiceSocket(configuration, credentialsProvider, userAgent); + this.pushServiceSocket = new PushServiceSocket(configuration, credentialsProvider, signalAgent); this.credentials = credentialsProvider; - this.userAgent = userAgent; + this.userAgent = signalAgent; } public byte[] getSenderCertificate() throws IOException { diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java index e1d816250..871c53ce6 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java @@ -51,7 +51,7 @@ public class SignalServiceMessageReceiver { private final PushServiceSocket socket; private final SignalServiceConfiguration urls; private final CredentialsProvider credentialsProvider; - private final String userAgent; + private final String signalAgent; private final ConnectivityListener connectivityListener; private final SleepTimer sleepTimer; @@ -66,11 +66,11 @@ public class SignalServiceMessageReceiver { */ public SignalServiceMessageReceiver(SignalServiceConfiguration urls, UUID uuid, String e164, String password, - String signalingKey, String userAgent, + String signalingKey, String signalAgent, ConnectivityListener listener, SleepTimer timer) { - this(urls, new StaticCredentialsProvider(uuid, e164, password, signalingKey), userAgent, listener, timer); + this(urls, new StaticCredentialsProvider(uuid, e164, password, signalingKey), signalAgent, listener, timer); } /** @@ -81,14 +81,14 @@ public class SignalServiceMessageReceiver { */ public SignalServiceMessageReceiver(SignalServiceConfiguration urls, CredentialsProvider credentials, - String userAgent, + String signalAgent, ConnectivityListener listener, SleepTimer timer) { this.urls = urls; this.credentialsProvider = credentials; - this.socket = new PushServiceSocket(urls, credentials, userAgent); - this.userAgent = userAgent; + this.socket = new PushServiceSocket(urls, credentials, signalAgent); + this.signalAgent = signalAgent; this.connectivityListener = listener; this.sleepTimer = timer; } @@ -199,7 +199,7 @@ public class SignalServiceMessageReceiver { public SignalServiceMessagePipe createMessagePipe() { WebSocketConnection webSocket = new WebSocketConnection(urls.getSignalServiceUrls()[0].getUrl(), urls.getSignalServiceUrls()[0].getTrustStore(), - Optional.of(credentialsProvider), userAgent, connectivityListener, + Optional.of(credentialsProvider), signalAgent, connectivityListener, sleepTimer); return new SignalServiceMessagePipe(webSocket, Optional.of(credentialsProvider)); @@ -208,7 +208,7 @@ public class SignalServiceMessageReceiver { public SignalServiceMessagePipe createUnidentifiedMessagePipe() { WebSocketConnection webSocket = new WebSocketConnection(urls.getSignalServiceUrls()[0].getUrl(), urls.getSignalServiceUrls()[0].getTrustStore(), - Optional.absent(), userAgent, connectivityListener, + Optional.absent(), signalAgent, connectivityListener, sleepTimer); return new SignalServiceMessagePipe(webSocket, Optional.of(credentialsProvider)); diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java index 3eb4dc576..7960c2a5c 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java @@ -118,25 +118,25 @@ public class SignalServiceMessageSender { public SignalServiceMessageSender(SignalServiceConfiguration urls, UUID uuid, String e164, String password, SignalProtocolStore store, - String userAgent, + String signalAgent, boolean isMultiDevice, Optional pipe, Optional unidentifiedPipe, Optional eventListener) { - this(urls, new StaticCredentialsProvider(uuid, e164, password, null), store, userAgent, isMultiDevice, pipe, unidentifiedPipe, eventListener); + this(urls, new StaticCredentialsProvider(uuid, e164, password, null), store, signalAgent, isMultiDevice, pipe, unidentifiedPipe, eventListener); } public SignalServiceMessageSender(SignalServiceConfiguration urls, CredentialsProvider credentialsProvider, SignalProtocolStore store, - String userAgent, + String signalAgent, boolean isMultiDevice, Optional pipe, Optional unidentifiedPipe, Optional eventListener) { - this.socket = new PushServiceSocket(urls, credentialsProvider, userAgent); + this.socket = new PushServiceSocket(urls, credentialsProvider, signalAgent); this.store = store; this.localAddress = new SignalServiceAddress(credentialsProvider.getUuid(), credentialsProvider.getE164()); this.pipe = new AtomicReference<>(pipe); diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java index 806d805fc..6045f36e4 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java @@ -168,12 +168,12 @@ public class PushServiceSocket { private final OkHttpClient attachmentClient; private final CredentialsProvider credentialsProvider; - private final String userAgent; + private final String signalAgent; private final SecureRandom random; - public PushServiceSocket(SignalServiceConfiguration signalServiceConfiguration, CredentialsProvider credentialsProvider, String userAgent) { + public PushServiceSocket(SignalServiceConfiguration signalServiceConfiguration, CredentialsProvider credentialsProvider, String signalAgent) { this.credentialsProvider = credentialsProvider; - this.userAgent = userAgent; + this.signalAgent = signalAgent; this.serviceClients = createServiceConnectionHolders(signalServiceConfiguration.getSignalServiceUrls()); this.cdnClients = createConnectionHolders(signalServiceConfiguration.getSignalCdnUrls()); this.contactDiscoveryClients = createConnectionHolders(signalServiceConfiguration.getSignalContactDiscoveryUrls()); @@ -1068,8 +1068,8 @@ public class PushServiceSocket { } } - if (userAgent != null) { - request.addHeader("X-Signal-Agent", userAgent); + if (signalAgent != null) { + request.addHeader("X-Signal-Agent", signalAgent); } if (connectionHolder.getHostHeader().isPresent()) { diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.java index d3fa91301..d07eb91e0 100644 --- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.java +++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.java @@ -54,7 +54,7 @@ public class WebSocketConnection extends WebSocketListener { private final String wsUri; private final TrustStore trustStore; private final Optional credentialsProvider; - private final String userAgent; + private final String signalAgent; private final ConnectivityListener listener; private final SleepTimer sleepTimer; @@ -66,13 +66,13 @@ public class WebSocketConnection extends WebSocketListener { public WebSocketConnection(String httpUri, TrustStore trustStore, Optional credentialsProvider, - String userAgent, + String signalAgent, ConnectivityListener listener, SleepTimer timer) { this.trustStore = trustStore; this.credentialsProvider = credentialsProvider; - this.userAgent = userAgent; + this.signalAgent = signalAgent; this.listener = listener; this.sleepTimer = timer; this.attempts = 0; @@ -108,8 +108,8 @@ public class WebSocketConnection extends WebSocketListener { Request.Builder requestBuilder = new Request.Builder().url(filledUri); - if (userAgent != null) { - requestBuilder.addHeader("X-Signal-Agent", userAgent); + if (signalAgent != null) { + requestBuilder.addHeader("X-Signal-Agent", signalAgent); } if (listener != null) {