Skip to content
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions src/HttpClient/HttpClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,44 @@ class HttpClient implements HttpClientInterface
*/
protected $sdkVersion;

/**
* Either a persistent share handle or a regular share handle, or null if no share handle can be obtained.
*
* @var object|resource|null
*/
private $shareHandle;

public function __construct(string $sdkIdentifier, string $sdkVersion)
{
$this->sdkIdentifier = $sdkIdentifier;
$this->sdkVersion = $sdkVersion;
if (\function_exists('curl_share_init_persistent')) {
$shareOptions = [\CURL_LOCK_DATA_DNS, \CURL_LOCK_DATA_CONNECT];

This comment was marked as outdated.

if (\defined('CURL_LOCK_DATA_SSL_SESSION')) {
$shareOptions[] = \CURL_LOCK_DATA_SSL_SESSION;
}
try {
$this->shareHandle = curl_share_init_persistent($shareOptions);
} catch (\Throwable $throwable) {
// don't crash if the share handle cannot be created
}
}

// If the persistent share handle cannot be created or doesn't exist
if ($this->shareHandle === null) {
try {
$this->shareHandle = curl_share_init();
Copy link

Choose a reason for hiding this comment

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

Missing check for false return from curl_share_init

Medium Severity

When curl_share_init() returns false (possible in PHP 7.x on failure), $this->shareHandle is set to false. The check if ($this->shareHandle !== null) passes since false !== null is true, causing curl_setopt() to be called with false as the share handle. The PR discussion explicitly noted this concern ("an extra check doesn't hurt") but the check wasn't added. This could cause warnings and prevent proper fallback behavior when share handle initialization fails.

Additional Locations (1)

Fix in Cursor Fix in Web

curl_share_setopt($this->shareHandle, \CURLOPT_SHARE, \CURL_LOCK_DATA_DNS);
if (\defined('CURL_LOCK_DATA_CONNECT')) {
curl_share_setopt($this->shareHandle, \CURLOPT_SHARE, \CURL_LOCK_DATA_CONNECT);
}
if (\defined('CURL_LOCK_DATA_SSL_SESSION')) {
curl_share_setopt($this->shareHandle, \CURLOPT_SHARE, \CURL_LOCK_DATA_SSL_SESSION);

This comment was marked as outdated.

}
} catch (\Throwable $throwable) {
// don't crash if the share handle cannot be created
}
}
}

public function sendRequest(Request $request, Options $options): Response
Expand Down Expand Up @@ -72,6 +106,9 @@ public function sendRequest(Request $request, Options $options): Response
curl_setopt($curlHandle, \CURLOPT_RETURNTRANSFER, true);
curl_setopt($curlHandle, \CURLOPT_HEADERFUNCTION, $responseHeaderCallback);
curl_setopt($curlHandle, \CURLOPT_HTTP_VERSION, \CURL_HTTP_VERSION_1_1);
if ($this->shareHandle !== null) {
curl_setopt($curlHandle, \CURLOPT_SHARE, $this->shareHandle);
}
Comment on lines +112 to +114

This comment was marked as outdated.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The documentation doesn't mention that curl_share_init can return false, in contrast to curl_init.


$httpSslVerifyPeer = $options->getHttpSslVerifyPeer();
if (!$httpSslVerifyPeer) {
Expand Down