signalapp/Signal-Android
signalapp/Signal-Android
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 16 Wiki Activity

Improve proxy configuration.

Browse Source
This commit is contained in:
Greyson Parrelli 2026-06-08 16:17:22 +00:00 committed by Cody Henthorne
parent f1accae295
commit 6210d1b397
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/TlsProxySocketFactory.kt
View File

@ -45,7 +45,7 @@ class TlsProxySocketFactory(
}
}
return ProxySocket(system.createSocket(proxyHost, proxyPort))
return ProxySocket(system.createSocket(proxyHost, proxyPort).enableHostnameVerification())
}
@Throws(IOException::class, UnknownHostException::class)
@ -58,27 +58,35 @@ class TlsProxySocketFactory(
}
}
return ProxySocket(system.createSocket(proxyHost, proxyPort, localHost, localPort))
return ProxySocket(system.createSocket(proxyHost, proxyPort, localHost, localPort).enableHostnameVerification())
}
@Throws(IOException::class)
override fun createSocket(host: InetAddress, port: Int): Socket {
return ProxySocket(system.createSocket(proxyHost, proxyPort))
return ProxySocket(system.createSocket(proxyHost, proxyPort).enableHostnameVerification())
}
@Throws(IOException::class)
override fun createSocket(address: InetAddress, port: Int, localAddress: InetAddress, localPort: Int): Socket {
return ProxySocket(system.createSocket(proxyHost, proxyPort, localAddress, localPort))
return ProxySocket(system.createSocket(proxyHost, proxyPort, localAddress, localPort).enableHostnameVerification())
}
@Throws(IOException::class)
override fun createSocket(): Socket {
val socket = system.createSocket(proxyHost, proxyPort) as SSLSocket
val socket = system.createSocket(proxyHost, proxyPort).enableHostnameVerification()
socket.startHandshake()
return ProxySocket(socket)
}
private fun Socket.enableHostnameVerification(): SSLSocket {
val sslSocket = this as SSLSocket
sslSocket.sslParameters = sslSocket.sslParameters.apply {
endpointIdentificationAlgorithm = "HTTPS"
}
return sslSocket
}
private class ProxySocket(private val delegate: Socket) : Socket() {
@Throws(IOException::class)
override fun connect(endpoint: SocketAddress) {