Fix: Prevent unintended use of proxy authorization when no command is provided #4217
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
Signed-off-by: Fabio Graetz <[email protected]>
3 tasks
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #4217 +/- ##
===========================================
+ Coverage 59.04% 78.41% +19.36%
===========================================
Files 621 18 -603
Lines 53091 1297 -51794
===========================================
- Hits 31348 1017 -30331
+ Misses 19244 217 -19027
+ Partials 2499 63 -2436
Flags with carried forward coverage won't be shown. Click here to find out more.
☔ View full report in Codecov by Sentry. |
| @@ -109,7 +109,7 @@ func setHTTPClientContext(ctx context.Context, cfg *Config, proxyCredentialsFutu | |||
| transport.Proxy = http.ProxyURL(&cfg.HTTPProxyURL.URL) | |||
| } | |||
|
|
|||
| if cfg.ProxyCommand != nil { | |||
| if len(cfg.ProxyCommand) > 0 { | |||
There was a problem hiding this comment.
Suggested change
| if len(cfg.ProxyCommand) > 0 { | |
| if cfg.ProxyCommand != nil && len(cfg.ProxyCommand) > 0 { |
Signed-off-by: Fabio Graetz <[email protected]>
wild-endeavor
approved these changes
Oct 13, 2023
andrewwdye
approved these changes
Oct 13, 2023
Thanks for verifying! |
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.
Describe your changes
@andrewwdye noticed that the newly introduced proxy authorization in the admin client breaks propeller, see #4216 (comment).
I ran flytepropeller locally in a debugger (with the flyte-core helm chart deployed in the cluster and flyteadmin and datacatalog port-forwarded).
With the debugger, I confirmed that this if statement which adds proxy authorization is hit even if no proxy command is provided in the platform config.
The reason is that I check for
cfg.ProxyCommand != nilbut the default value of proxy command is empty string slice so it is nevernil.With flytepropeller running locally in my IDE, I confirmed that:
Check all the applicable boxes