[HttpClient] Replace escapeshellarg to prevent overpassing ARG_MAX
#52429
+21
−50
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
stof
requested changes
Nov 2, 2023
src/Symfony/Component/HttpClient/DataCollector/HttpClientDataCollector.php
Show resolved
Hide resolved
alexandre-daubois
force-pushed
the
httpclientdatadecorator-argmax
branch
3 times, most recently
from
88259df to
d8be8f5
Compare
|
@nicolas-grekas I really like your idea of leveraging Process. I updated the code to use it first if it exists. |
nicolas-grekas
approved these changes
Nov 3, 2023
| { | ||
| return \strlen($payload) < ('\\' === \DIRECTORY_SEPARATOR ? 8100 : 256000); | ||
| if (class_exists(Process::class)) { |
There was a problem hiding this comment.
Suggested change
| if (class_exists(Process::class)) { | |
| static $useProcess; | |
| if ($useProcess ??= class_exists(Process::class)) { |
There was a problem hiding this comment.
I addressed your comments, thanks 🙂
| return null; | ||
| } | ||
| $dataArg[] = '--data '.escapeshellarg($payload); | ||
| $dataArg[] = '--data-raw '.$this->sanitizeArg(self::jsonEncode($json)); |
There was a problem hiding this comment.
we don't sanitize, we escape
| return (new Process([$payload]))->getCommandLine(); | ||
| } | ||
|
|
||
| if (\DIRECTORY_SEPARATOR === '\\') { |
There was a problem hiding this comment.
Suggested change
| if (\DIRECTORY_SEPARATOR === '\\') { | |
| if ('\\' === \DIRECTORY_SEPARATOR) { |
alexandre-daubois
force-pushed
the
httpclientdatadecorator-argmax
branch
from
d8be8f5 to
3b0bb11
Compare
fabpot
approved these changes
Nov 3, 2023
|
Thank you @alexandre-daubois. |
nicolas-grekas
added a commit
that referenced
this pull request
Nov 6, 2023
…nd when files are uploaded (MatTheCat) This PR was merged into the 6.3 branch. Discussion ---------- [HttpClient][WebProfilerBundle] Do not generate cURL command when files are uploaded | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #51366 | License | MIT I also removed ``@requires` extension openssl` annotations since that does not seem to be the case since #45729. Failures in AppVeyor occur because double quotes are missing around `--data-raw` values. Possibly related to #52429. Commits ------- 4503f94 [HttpClient][WebProfilerBundle] Do not generate cURL command when files are uploaded
This was referenced Nov 10, 2023
Merged
Merged
Merged
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.
I'm not 100% sure if it is a bugfix or a feature.
I used Nicolas' suggestion in the issue to sanitize the input and used
--data-rawto avoid any automatic formatting.Removing the use of
escapeshellarg()also allows to removeHttpClientDataCollectorTest::testItDoesNotGeneratesCurlCommandsForNotEncodableBody(). Indeed, the body can now be encoded and will result on the following cURL command: