proxy: Add fallback to x509.NewCertPool() on Windows #2771
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pkg/crc/network/proxy.go
Outdated
| @@ -210,7 +210,8 @@ func (p *ProxyConfig) tlsConfig() (*tls.Config, error) { | |||
| } | |||
| caCertPool, err := x509.SystemCertPool() | |||
| if err != nil { | |||
| return nil, err | |||
| logging.Warnf("Could not load system CA pool") | |||
There was a problem hiding this comment.
logging.Warnf("Could not load system CA pool: %v", err)
On Windows, x509.SystemCertPool returns an error: golang/go#16736 This commit reverts to the behaviour before commit b50dc99 when catching such an error. This means https_proxy=https://... will be broken for non-mitm https proxies. Such proxies were not usable before the PR adding b50dc99, so this should not have much impact for our existing users. These CAs are used: - when accessing telemetry - when checking for a new crc version - when downloading binaries (only happens with git builds) This fixes crc-org#2770
praveenkumar
approved these changes
Sep 28, 2021
| @@ -210,7 +210,8 @@ func (p *ProxyConfig) tlsConfig() (*tls.Config, error) { | |||
| } | |||
| caCertPool, err := x509.SystemCertPool() | |||
| if err != nil { | |||
| return nil, err | |||
| logging.Warnf("Could not load system CA pool: %v", err) | |||
| caCertPool = x509.NewCertPool() | |||
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cfergeau, praveenkumar The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/retest |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
On Windows, x509.SystemCertPool returns an error:
golang/go#16736
This commit reverts to the behaviour before commit b50dc99 when catching
such an error. This means https_proxy=https://... will be broken for
non-mitm https proxies. Such proxies were not usable before the PR
adding b50dc99, so this should not have much impact for our existing
users.
These CAs are used:
Fixes: #2770