geckon01/php-curl-class
1
0
Fork 0
mirror of https://github.com/php-curl-class/php-curl-class.git synced 2026-09-16 05:16:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Curl::diagnose() to detect bit flags with negative values

Browse Source
This commit is contained in:
Zach Borboa
2023-05-20 13:18:28 -07:00
parent 2a73070caf
commit 1c270272c8
2 changed files with 54 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Curl/Curl.php
+5 -5
View File
@@ -1319,13 +1319,13 @@ class Curl extends BaseCurl
$bit_flags = [];
foreach ($curl_constants as $const_name => $const_value) {
// Skip attempting to detect bit flags in use that use constants with negative
// values (e.g. CURLAUTH_ANY, CURLAUTH_ANYSAFE, CURLPROTO_ALL, CURLSSH_AUTH_ANY,
// Attempt to detect bit flags in use that use constants with negative values (e.g.
// CURLAUTH_ANY, CURLAUTH_ANYSAFE, CURLPROTO_ALL, CURLSSH_AUTH_ANY,
// CURLSSH_AUTH_DEFAULT, etc.)
if ($value < 0) {
$bit_flags = [];
if ($value < 0 && $value === $const_value) {
$bit_flags[] = $const_name;
break;
} elseif ($const_value >= 0 && ($value & $const_value)) {
} elseif ($value >= 0 && $const_value >= 0 && ($value & $const_value)) {
$bit_flags[] = $const_name;
}
}
tests/PHPCurlClass/PHPCurlClassTest.php
+49
View File
@@ -4282,10 +4282,12 @@ class PHPCurlClassTest extends \PHPUnit\Framework\TestCase
'CURLOPT_PROTOCOLS' => [
'option' => CURLOPT_PROTOCOLS,
'bitmask' => CURLPROTO_ALL,
'expected' => 'CURLPROTO_ALL',
],
'CURLOPT_REDIR_PROTOCOLS' => [
'option' => CURLOPT_REDIR_PROTOCOLS,
'bitmask' => CURLPROTO_ALL,
'expected' => 'CURLPROTO_ALL',
],
],
[
@@ -4306,12 +4308,14 @@ class PHPCurlClassTest extends \PHPUnit\Framework\TestCase
'CURLOPT_PROXYAUTH' => [
'option' => CURLOPT_PROXYAUTH,
'bitmask' => CURLAUTH_ANY,
'expected' => 'CURLAUTH_ANY',
],
],
[
'CURLOPT_PROXYAUTH' => [
'option' => CURLOPT_PROXYAUTH,
'bitmask' => CURLAUTH_ANYSAFE,
'expected' => 'CURLAUTH_ANYSAFE',
],
],
[
@@ -4332,12 +4336,14 @@ class PHPCurlClassTest extends \PHPUnit\Framework\TestCase
'CURLOPT_HTTPAUTH' => [
'option' => CURLOPT_HTTPAUTH,
'bitmask' => CURLAUTH_ANY,
'expected' => 'CURLAUTH_ANY',
],
],
[
'CURLOPT_HTTPAUTH' => [
'option' => CURLOPT_HTTPAUTH,
'bitmask' => CURLAUTH_ANYSAFE,
'expected' => 'CURLAUTH_ANYSAFE',
],
],
[
@@ -4385,6 +4391,49 @@ class PHPCurlClassTest extends \PHPUnit\Framework\TestCase
}
}
public function testDiagnoseBitmaskOptionsNonPositive()
{
// CURLOPT_HTTPAUTH
// CURLAUTH_ANY: -17
$test_1 = new Test();
$test_1->curl->setOpt(CURLOPT_HTTPAUTH, CURLAUTH_ANY);
$test_1->server('json_response', 'GET');
$test_1_output = $test_1->curl->diagnose(true);
$this->assertStringContainsString('CURLOPT_HTTPAUTH: -17 (CURLAUTH_ANY)', $test_1_output);
// CURLOPT_HTTPAUTH
// CURLAUTH_ANYSAFE: -18
$test_2 = new Test();
$test_2->curl->setOpt(CURLOPT_HTTPAUTH, CURLAUTH_ANYSAFE);
$test_2->server('json_response', 'GET');
$test_2_output = $test_2->curl->diagnose(true);
$this->assertStringContainsString('CURLOPT_HTTPAUTH: -18 (CURLAUTH_ANYSAFE)', $test_2_output);
// CURLOPT_PROTOCOLS
// CURLPROTO_ALL: -1
$test_3 = new Test();
$test_3->curl->setOpt(CURLOPT_PROTOCOLS, CURLPROTO_ALL);
$test_3->server('json_response', 'GET');
$test_3_output = $test_3->curl->diagnose(true);
$this->assertStringContainsString('CURLOPT_PROTOCOLS: -1 (CURLPROTO_ALL)', $test_3_output);
// CURLOPT_SSH_AUTH_TYPES
// CURLSSH_AUTH_ANY: -1
$test_4 = new Test();
$test_4->curl->setOpt(CURLOPT_SSH_AUTH_TYPES, CURLSSH_AUTH_ANY);
$test_4->server('json_response', 'GET');
$test_4_output = $test_4->curl->diagnose(true);
$this->assertStringContainsString('CURLOPT_SSH_AUTH_TYPES: -1 (CURLSSH_AUTH_ANY)', $test_4_output);
// CURLOPT_SSH_AUTH_TYPES
// CURLSSH_AUTH_DEFAULT: -1
$test_5 = new Test();
$test_5->curl->setOpt(CURLOPT_SSH_AUTH_TYPES, CURLSSH_AUTH_DEFAULT);
$test_5->server('json_response', 'GET');
$test_5_output = $test_5->curl->diagnose(true);
$this->assertStringContainsString('CURLOPT_SSH_AUTH_TYPES: -1 (CURLSSH_AUTH_ANY)', $test_5_output);
}
public function testDiagnoseErrorMessage()
{
$tests = [