Skip to content

Commit 8c39f61

Browse files
authored
Merge pull request github#19598 from github/mbg/go/handle-empty-strings-in-proxy-vars
Go: Explicitly check whether proxy env vars are empty
2 parents e826b83 + c236084 commit 8c39f61

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

go/extractor/util/registryproxy.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,16 @@ func parseRegistryConfigs(str string) ([]RegistryConfig, error) {
5050
func getEnvVars() []string {
5151
var result []string
5252

53-
if proxy_host, proxy_host_set := os.LookupEnv(PROXY_HOST); proxy_host_set {
54-
if proxy_port, proxy_port_set := os.LookupEnv(PROXY_PORT); proxy_port_set {
53+
if proxy_host, proxy_host_set := os.LookupEnv(PROXY_HOST); proxy_host_set && proxy_host != "" {
54+
if proxy_port, proxy_port_set := os.LookupEnv(PROXY_PORT); proxy_port_set && proxy_port != "" {
5555
proxy_address = fmt.Sprintf("http://%s:%s", proxy_host, proxy_port)
5656
result = append(result, fmt.Sprintf("HTTP_PROXY=%s", proxy_address), fmt.Sprintf("HTTPS_PROXY=%s", proxy_address))
5757

5858
slog.Info("Found private registry proxy", slog.String("proxy_address", proxy_address))
5959
}
6060
}
6161

62-
if proxy_cert, proxy_cert_set := os.LookupEnv(PROXY_CA_CERTIFICATE); proxy_cert_set {
62+
if proxy_cert, proxy_cert_set := os.LookupEnv(PROXY_CA_CERTIFICATE); proxy_cert_set && proxy_cert != "" {
6363
// Write the certificate to a temporary file
6464
slog.Info("Found certificate")
6565

@@ -82,7 +82,7 @@ func getEnvVars() []string {
8282
}
8383
}
8484

85-
if proxy_urls, proxy_urls_set := os.LookupEnv(PROXY_URLS); proxy_urls_set {
85+
if proxy_urls, proxy_urls_set := os.LookupEnv(PROXY_URLS); proxy_urls_set && proxy_urls != "" {
8686
val, err := parseRegistryConfigs(proxy_urls)
8787
if err != nil {
8888
slog.Error("Unable to parse proxy configurations", slog.String("error", err.Error()))

0 commit comments

Comments
 (0)