signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

For now, don't pass system proxy settings to libsignal

Browse Source
This commit is contained in:
Jordan Rose 2025-02-24 13:19:18 -08:00
parent 62bfc6e440
commit 1f6fea1a77
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
SignalServiceKit/Network/API/NetworkManager.swift
View File

@ -51,18 +51,28 @@ public class NetworkManager {
private static func resetLibsignalNetProxySettings(_ libsignalNet: Net) {
if let systemProxy = ProxyConfig.fromCFNetwork() {
Logger.info("System '\(systemProxy.scheme)' proxy detected")
do {
try libsignalNet.setProxy(scheme: systemProxy.scheme, host: systemProxy.host, port: systemProxy.port, username: systemProxy.username, password: systemProxy.password)
} catch {
Logger.error("invalid proxy: \(error)")
// When setProxy(...) fails, it refuses to connect in case your proxy was load-bearing.
// That makes sense for in-app settings, but less so for system-level proxies, given that we are already ignoring system-level proxies we don't understand.
libsignalNet.clearProxy()
// Note: This is a workaround for libsignal's CDS implementation not supporting system proxies.
// In the short term, this check will change to directly reference a RemoteConfig controlling that;
// in the long run, everything in libsignal will support system proxies and this can go away.
if ChatConnectionManagerImpl.shouldUseLibsignalForIdentifiedWebsocket {
Logger.info("System '\(systemProxy.scheme)' proxy detected")
do {
try libsignalNet.setProxy(scheme: systemProxy.scheme, host: systemProxy.host, port: systemProxy.port, username: systemProxy.username, password: systemProxy.password)
return
} catch {
Logger.error("invalid proxy: \(error)")
// When setProxy(...) fails, it refuses to connect in case your proxy was load-bearing.
// That makes sense for in-app settings, but less so for system-level proxies, given that we are already ignoring system-level proxies we don't understand.
// Fall through to the reset call.
}
} else {
Logger.info("System '\(systemProxy.scheme)' proxy detected; not passing to libsignal for compatibility with older CDS implementation")
// Fall through to the reset call.
}
} else {
libsignalNet.clearProxy()
}
// This may be clearing a system proxy, or a previously set in-app proxy that is no longer in use.
libsignalNet.clearProxy()
}
public func asyncRequest(_ request: TSRequest, canUseWebSocket: Bool = true) async throws -> HTTPResponse {

4
SignalServiceKit/Network/ChatConnectionManager.swift
View File

@ -183,6 +183,10 @@ public class ChatConnectionManagerImpl: ChatConnectionManager {
private static var shouldUseLibsignalForIdentifiedDefaultsKey: String = "UseLibsignalForIdentifiedWebsocket"
static var shouldUseLibsignalForIdentifiedWebsocket: Bool {
CurrentAppContext().appUserDefaults().bool(forKey: shouldUseLibsignalForIdentifiedDefaultsKey)
}
/// We cache this in UserDefaults because it's used too early to access the RemoteConfig object.
///
/// It also makes it possible to override the setting in Xcode via the Scheme settings: