Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-10 04:36:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Other: Fix race conditions in internal/dialer

Browse Source 
Some race conditions came from the tests themselves. But we had a race
condition reading the proxyAddress; this change protects it with a
mutex.
This commit is contained in:
James Houlahan
2022-10-24 16:41:17 +02:00
parent d6260d960c
commit 350544e801
3 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/dialer/dialer_proxy.go
View File

@ -77,9 +77,11 @@ func formatAsAddress(rawURL string) string {
// DialTLSContext dials the given network/address. If it fails, it retries using a proxy.
func (d *ProxyTLSDialer) DialTLSContext(ctx context.Context, network, address string) (net.Conn, error) {
d.locker.RLock()
if address == d.directAddress {
address = d.proxyAddress
}
d.locker.RUnlock()
conn, err := d.dialer.DialTLSContext(ctx, network, address)
if err == nil || !d.allowProxy {
@ -90,6 +92,9 @@ func (d *ProxyTLSDialer) DialTLSContext(ctx context.Context, network, address st
return nil, err
}
d.locker.RLock()
defer d.locker.RUnlock()
return d.dialer.DialTLSContext(ctx, network, d.proxyAddress)
}