Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-20 02:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Patch bug rendering PAC file users unable to connect.

Browse Source
This commit is contained in:
andrew-signal
2025-11-21 15:40:42 -05:00
committed by jeffrey-signal
parent 87e56bf4bf
commit acd82353b1
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.kt
View File

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.push
import android.content.Context import android.content.Context
import android.net.ConnectivityManager import android.net.ConnectivityManager
import android.net.Uri
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import com.google.i18n.phonenumbers.PhoneNumberUtil import com.google.i18n.phonenumbers.PhoneNumberUtil
import okhttp3.CipherSuite import okhttp3.CipherSuite
@@ -146,6 +147,16 @@ class SignalServiceNetworkAccess(context: Context) {
.activeNetwork .activeNetwork
?.let { connectivityManager.getLinkProperties(it)?.httpProxy } ?.let { connectivityManager.getLinkProperties(it)?.httpProxy }
?.takeIf { !it.exclusionList.contains(BuildConfig.SIGNAL_URL.stripProtocol()) } ?.takeIf { !it.exclusionList.contains(BuildConfig.SIGNAL_URL.stripProtocol()) }
// NB: Edit carefully, dear reader, as the line below is written from hard won experience.
// It turns out, that despite being documented *nowhere*, if a PAC file is set
// as the system proxy, proxyInfo.host will return "localhost" and proxyInfo.port
// will return -1.
// I learnt this by reading the AOSP source code for ProxyInfo:
// https://android.googlesource.com/platform/frameworks/base/+/4696ee4/core/java/android/net/ProxyInfo.java#107
// So, if we do not explicitly check that a PAC file is not set, the proxy
// we pass to libsignal may be syntactically invalid, and the user may be
// rendered unable to connect.
?.takeIf { proxyInfo -> proxyInfo.pacFileUrl.equals(Uri.EMPTY) }
?.let { proxy -> HttpProxy(proxy.host, proxy.port) } ?.let { proxy -> HttpProxy(proxy.host, proxy.port) }
} }
} }