Skip to content

Add 'http://' to http(s)_proxy if there is no protocol #2663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
fhammerl merged 5 commits into from
Jun 20, 2023
Merged

Add 'http://' to http(s)_proxy if there is no protocol #2663

fhammerl merged 5 commits into from
Jun 20, 2023

Conversation

@fhammerl
Copy link
Contributor

@fhammerl fhammerl commented Jun 19, 2023 •
edited
Loading

Part of an effort to synchronize http_proxy behaviour across ARC, actions/toolkit and actions/runner

The consensus was to follow golang default behaviour in case of a missing protocol in the value of http(s)_proxy.

  • golang: prepend http:// if missing - e.g https_proxy=localhost:1234 is the same as https://localhost:1234
  • actions/toolkit: throw if protocol is missing from proxy url
  • actions/runner: ignore and don’t use proxy if protocol is missing from proxy url

@fhammerl
Add 'http://' to http(s)_proxy if there is no protocol
b0e49e2 
Before this commit, these URIs used to be ignored (nullproxy).

The new behaviour aligns with go style http(s)_proxy
@fhammerl fhammerl requested a review from a team as a code owner June 19, 2023 13:50
nikola-jokic
nikola-jokic reviewed Jun 19, 2023
View reviewed changes
nikola-jokic
nikola-jokic reviewed Jun 19, 2023
View reviewed changes
nikola-jokic
nikola-jokic previously approved these changes Jun 19, 2023
View reviewed changes
Copy link
Contributor

@nikola-jokic nikola-jokic left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fhammerl fhammerl merged commit 5f1c6f4 into main Jun 20, 2023
@fhammerl fhammerl deleted the fhammerl/align-with-go-style-http-s-proxy branch June 20, 2023 13:53
ashb pushed a commit to ashb/runner that referenced this pull request Jun 23, 2023
@fhammerl @nikola-jokic @ashb
Add 'http://' to http(s)_proxy if there is no protocol (actions#2663)
c93b194 
* Add 'http://' to http(s)_proxy if there is no protocol

Before this commit, these URIs used to be ignored (nullproxy).

The new behaviour aligns with go style http(s)_proxy

* Update src/Runner.Sdk/RunnerWebProxy.cs

Co-authored-by: Nikola Jokic <[email protected]>

* Assert that original protocol is preserved

* Use startsWith for testing protocol

* Only modify proxy if useful

---------

Co-authored-by: Nikola Jokic <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@nikola-jokic nikola-jokic nikola-jokic approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@fhammerl @nikola-jokic