Default to https scheme for --proxy argument in tctl auth sign
#10844
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
Fixes https://github.com/gravitational/cloud/issues/1358. Before this PR, if `--proxy` was set, it would be passed as it to the kubeconfig file. Due to this, if the `--proxy` URL did not have a scheme, it would default to `http, leading to the issue reported in https://github.com/gravitational/cloud/issues/1358. With this PR, we now try to parse the `--proxy` URL and set its scheme to `https` in case it's not set.
knisbet
approved these changes
Mar 4, 2022
| @@ -107,14 +107,24 @@ func TestAuthSignKubeconfig(t *testing.T) { | |||
| wantError string | |||
| }{ | |||
| { | |||
| desc: "--proxy specified", | |||
| desc: "--proxy specified with URL scheme", | |||
There was a problem hiding this comment.
nit: add tests as well for invalid cases. IE you get the expected error when using an invalid proxy address.
rosstimothy
reviewed
Mar 4, 2022
tool/tctl/common/auth_command.go
Outdated
Comment on lines
745
to
748
| if u.Scheme == "" { | ||
| u.Scheme = "https" | ||
| } | ||
| a.proxyAddr = u.String() |
There was a problem hiding this comment.
Probably minimal gain but you could avoid the call to u.String() in the event the scheme is present. Since we are now parsing the user input should we also limit the provided scheme to only be https or http?
There was a problem hiding this comment.
Thanks for the review @rosstimothy. Tried to do this in 5bf4fdc.
hatched
approved these changes
Mar 4, 2022
rosstimothy
approved these changes
Mar 4, 2022
vitorenesduarte
pushed a commit
that referenced
this pull request
Mar 7, 2022
…10844) Before this commit, if `--proxy` was set, it would be passed as it to the kubeconfig file. Due to this, if the `--proxy` URL did not have a scheme, it would default to `http`, leading to the issue reported in https://github.com/gravitational/cloud/issues/1358. With this commit, we now try to parse the `--proxy` URL and set its scheme to `https` in case it's not set. In case it's set, we only allow `--proxy` URLs with the `http` and `https` schemes.
vitorenesduarte
pushed a commit
that referenced
this pull request
Mar 7, 2022
…10844) Before this commit, if `--proxy` was set, it would be passed as it to the kubeconfig file. Due to this, if the `--proxy` URL did not have a scheme, it would default to `http`, leading to the issue reported in https://github.com/gravitational/cloud/issues/1358. With this commit, we now try to parse the `--proxy` URL and set its scheme to `https` in case it's not set. In case it's set, we only allow `--proxy` URLs with the `http` and `https` schemes.
This was referenced Mar 7, 2022
vitorenesduarte
pushed a commit
that referenced
this pull request
Mar 8, 2022
…10844) (#10911) Before this commit, if `--proxy` was set, it would be passed as it to the kubeconfig file. Due to this, if the `--proxy` URL did not have a scheme, it would default to `http`, leading to the issue reported in https://github.com/gravitational/cloud/issues/1358. With this commit, we now try to parse the `--proxy` URL and set its scheme to `https` in case it's not set. In case it's set, we only allow `--proxy` URLs with the `http` and `https` schemes.
vitorenesduarte
pushed a commit
that referenced
this pull request
Mar 8, 2022
…10844) (#10910) Before this commit, if `--proxy` was set, it would be passed as it to the kubeconfig file. Due to this, if the `--proxy` URL did not have a scheme, it would default to `http`, leading to the issue reported in https://github.com/gravitational/cloud/issues/1358. With this commit, we now try to parse the `--proxy` URL and set its scheme to `https` in case it's not set. In case it's set, we only allow `--proxy` URLs with the `http` and `https` schemes.
Closed
Closed
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.
Fixes https://github.com/gravitational/cloud/issues/1358.
Before this PR, if
--proxywas set, it would be passed as it to the kubeconfig file. Due to this, if the--proxyURL did not have a scheme, it would default tohttp, leading to the issue reported in https://github.com/gravitational/cloud/issues/1358.With this PR, we now try to parse the
--proxyURL and set its scheme tohttpsin case it's not set.In case it's set, we only allow
--proxyURLs with thehttpandhttpsschemes.