Skip to content
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.

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

[HttpClient] fix proxied redirects in curl client #50004

Merged
merged 1 commit into from
Apr 14, 2023

Conversation

matthi4s
Copy link
Contributor

Q A
Branch? 5.4
Bug fix? yes
New feature? no
Deprecations? no
Tickets -
License MIT
Doc PR -

When using the CurlHttpClient with a proxy defined using the options array, the proxy isn't used after the first request on redirects. The CURLOPT_PROXY option is overwritten in the redirect resolver, but the $options variable isn't present in that case which causes it to be overwritten with environment variables or nothing, which disables the proxy.

I don't know why the proxy option gets rewritten with every redirect, since the same curl handle is used, it should not be necessary to set it again. It also wasn't set before the original commit which introduced this bug (9e5305e). I've removed that part, but I can also change it to pass on the reference to the $options variable, which also fixes the issue. In that case, I would suggest moving the validation of the environment variable to a separate function to avoid duplicating that part.

I've also added a test case that fails for the curl client without the fix but succeeds for the other clients and the curl client with both possible fixes.

@carsonbot
Copy link

Hey!

I see that this is your first PR. That is great! Welcome!

Symfony has a contribution guide which I suggest you to read.

In short:

  • Always add tests
  • Keep backward compatibility (see https://symfony.com/bc).
  • Bug fixes must be submitted against the lowest maintained branch where they apply (see https://symfony.com/releases)
  • Features and deprecations must be submitted against the 6.3 branch.

Review the GitHub status checks of your pull request and try to solve the reported issues. If some tests are failing, try to see if they are failing because of this change.

When two Symfony core team members approve this change, it will be merged and you will become an official Symfony contributor!
If this PR is merged in a lower version branch, it will be merged up to all maintained branches within a few days.

I am going to sit back now and wait for the reviews.

Cheers!

Carsonbot

Copy link
Member

@nicolas-grekas nicolas-grekas left a comment

Choose a reason for hiding this comment

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

LGTM thanks. Here are some nitpicking. Failures are false positives.

src/Symfony/Component/HttpClient/CurlHttpClient.php Outdated Show resolved Hide resolved
src/Symfony/Component/HttpClient/CurlHttpClient.php Outdated Show resolved Hide resolved
src/Symfony/Component/HttpClient/CurlHttpClient.php Outdated Show resolved Hide resolved
src/Symfony/Component/HttpClient/HttpClientTrait.php Outdated Show resolved Hide resolved
src/Symfony/Component/HttpClient/HttpClientTrait.php Outdated Show resolved Hide resolved
@fabpot
Copy link
Member

fabpot commented Apr 14, 2023

Thank you @matthi4s.

@fabpot fabpot merged commit 547e876 into symfony:5.4 Apr 14, 2023
8 of 9 checks passed
@matthi4s matthi4s deleted the hc-proxy-redirect branch April 14, 2023 10:19
This was referenced Apr 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants