jnd/beszel-ipv6
1
0
Fork 0
mirror of https://github.com/henrygd/beszel.git synced 2026-04-15 01:11:50 +02:00
Code Issues Packages Projects Releases 2 Wiki Activity

agent: make sure prefixed ALL_PROXY env var works (#1919)

Browse Source
This commit is contained in:
henrygd
2026-04-14 14:43:19 -04:00
committed by hank
parent f5576759de
commit 981c788d6f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
agent/client.go
View File

@@ -20,7 +20,7 @@ import (
"github.com/fxamacker/cbor/v2" "github.com/fxamacker/cbor/v2"
"github.com/lxzan/gws" "github.com/lxzan/gws"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
"golang.org/x/net/proxy" "golang.org/x/net/proxy"
) )
const ( const (
@@ -105,6 +105,11 @@ func (client *WebSocketClient) getOptions() *gws.ClientOption {
} }
client.hubURL.Path = path.Join(client.hubURL.Path, "api/beszel/agent-connect") client.hubURL.Path = path.Join(client.hubURL.Path, "api/beszel/agent-connect")
// make sure BESZEL_AGENT_ALL_PROXY works (GWS only checks ALL_PROXY)
if val := os.Getenv("BESZEL_AGENT_ALL_PROXY"); val != "" {
os.Setenv("ALL_PROXY", val)
}
client.options = &gws.ClientOption{ client.options = &gws.ClientOption{
Addr: client.hubURL.String(), Addr: client.hubURL.String(),
TlsConfig: &tls.Config{InsecureSkipVerify: true}, TlsConfig: &tls.Config{InsecureSkipVerify: true},
@@ -113,7 +118,7 @@ func (client *WebSocketClient) getOptions() *gws.ClientOption {
"X-Token": []string{client.token}, "X-Token": []string{client.token},
"X-Beszel": []string{beszel.Version}, "X-Beszel": []string{beszel.Version},
}, },
NewDialer: func() (gws.Dialer, error) { NewDialer: func() (gws.Dialer, error) {
return proxy.FromEnvironment(), nil return proxy.FromEnvironment(), nil
}, },
} }