rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-06-24 06:27:22 +00:00
Code Issues Releases Wiki Activity

Unset proxy env vars when ssh bastion is configured with option ignore_proxy_env_vars

Browse Source
This commit is contained in:
Pascal Morillon 2021-05-31 16:49:01 +02:00
parent a21294e915
commit 8b9385040f
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/cluster.go
View File

@ -5,6 +5,7 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"net" "net"
"os"
"reflect" "reflect"
"strings" "strings"
"time" "time"
@ -778,6 +779,12 @@ func (c *Cluster) SetupDialers(ctx context.Context, dailersOptions hosts.Dialers
if err != nil { if err != nil {
return err return err
} }
if c.BastionHost.IgnoreProxyEnvVars {
logrus.Debug("Unset http proxy environment variables")
for _, v := range util.ProxyEnvVars {
os.Unsetenv(v)
}
}
} }
return nil return nil
} }

4
util/util.go
View File

@ -20,7 +20,7 @@ const (
WorkerThreads = 50 WorkerThreads = 50
) )
var proxyEnvVars = [3]string{"HTTP_PROXY", "HTTPS_PROXY", "NO_PROXY"} var ProxyEnvVars = [3]string{"HTTP_PROXY", "HTTPS_PROXY", "NO_PROXY"}
func StrToSemVer(version string) (*semver.Version, error) { func StrToSemVer(version string) (*semver.Version, error) {
v, err := semver.NewVersion(strings.TrimPrefix(version, "v")) v, err := semver.NewVersion(strings.TrimPrefix(version, "v"))
@ -146,7 +146,7 @@ func GetEnvVar(key string) (string, string, bool) {
func PrintProxyEnvVars() { func PrintProxyEnvVars() {
// Print proxy related environment variables // Print proxy related environment variables
for _, proxyEnvVar := range proxyEnvVars { for _, proxyEnvVar := range ProxyEnvVars {
var err error var err error
// Lookup environment variable // Lookup environment variable
if key, value, ok := GetEnvVar(proxyEnvVar); ok { if key, value, ok := GetEnvVar(proxyEnvVar); ok {