Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-03-02 07:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reject invalid TLS proxy configurations.

Browse Source
This commit is contained in:
andrew-signal
2025-03-21 16:06:59 -04:00
committed by Cody Henthorne
parent 9b98337e82
commit 41783368bd
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalNetworkExtensions.kt
View File

@@ -6,9 +6,13 @@
package org.whispersystems.signalservice.internal.websocket
import org.signal.core.util.logging.Log
import org.signal.core.util.orNull
import org.signal.libsignal.net.Network
import org.whispersystems.signalservice.internal.configuration.SignalServiceConfiguration
import java.io.IOException
private const val TAG = "LibSignalNetworkExtensions"
/**
* Helper method to apply settings from the SignalServiceConfiguration.
@@ -19,7 +23,12 @@ fun Network.applyConfiguration(config: SignalServiceConfiguration) {
if (proxy == null) {
this.clearProxy()
} else {
this.setProxy(proxy.host, proxy.port)
try {
this.setProxy(proxy.host, proxy.port)
} catch (e: IOException) {
Log.e(TAG, "Invalid proxy configuration set! Failing connections until changed.")
this.setInvalidProxy()
}
}
this.setCensorshipCircumventionEnabled(config.censored)