8000 ext/curl: Refactor cURL to only use FCC by Girgias · Pull Request #13291 · php/php-src · GitHub
[go: up one dir, main page]
Skip to content

ext/curl: Refactor cURL to only use FCC #13291

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

Merged
merged 15 commits into from
May 1, 2024
Merged

ext/curl: Refactor cURL to only use FCC #13291

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8aa8c07
ext/curl: Convert handlers.progress to just be a FCC
Girgias Jan 31, 2024
854257f
ext/curl: Convert handlers.sshhostkey to just be a FCC
Girgias Jan 31, 2024
85d1820
ext/curl: Convert handlers.xferinfo to just be a FCC
Girgias Jan 31, 2024
d3fb21c
ext/curl: Convert handlers.fnmatch to just be a FCC
Girgias Jan 31, 2024
1dfce9d
ext/curl: Convert handlers.server_push to just be a FCC
Girgias Jan 31, 2024
cf9228f
ext/curl: Convert php_curl_write to just use FCC without a function n…
Girgias Jan 31, 2024
c3f60a2
ext/curl: Convert php_curl_read to just use FCC without a function na…
Girgias Jan 31, 2024
51c8e21
ext/curl: Remove workaround for old libcurl
Girgias Jan 31, 2024
fd4fafd
ext/curl: Create macros to codegen the handling of callable options
Girgias Feb 1, 2024
b9731c8
Fix test due to unavailable SSH_HOSTKEY option
Girgias Feb 6, 2024
0994ee2
Add trampoline tests
Girgias Feb 6, 2024
617b186
Remove XFAIL
Girgias Apr 16, 2024
e8391d4
Address review comments
Girgias Apr 23, 2024
4b7230b
Address review comments about missing empty FCC assignment
Girgias Apr 30, 2024
431d24a
Remove unnecessary set to NULL/empty FCC
Girgias Apr 30, 2024
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
Prev Previous commit
Next Next commit
ext/curl: Convert handlers.sshhostkey to just be a FCC
  • Loading branch information
@Girgias
Girgias committed Apr 30, 2024
commit 854257fd77e1394972ef6eb282a80bb20db9b2d0
2 changes: 1 addition & 1 deletion ext/curl/curl_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ typedef struct {
php_curl_callback *xferinfo;
php_curl_callback *fnmatch;
#if LIBCURL_VERSION_NUM >= 0x075400 /* Available since 7.84.0 */
php_curl_callback *sshhostkey;
zend_fcall_info_cache sshhostkey;
#endif
} php_curl_handlers;

Expand Down
69 changes: 29 additions & 40 deletions ext/curl/interface.c
View file
Open in desktop
8000
Original file line number Diff line number Diff line change
Expand Up @@ -501,8 +501,8 @@ static HashTable *curl_get_gc(zend_object *object, zval **table, int *n)
}

#if LIBCURL_VERSION_NUM >= 0x075400 /* Available since 7.84.0 */
if (curl->handlers.sshhostkey) {
zend_get_gc_buffer_add_zval(gc_buffer, &curl->handlers.sshhostkey->func_name);
if (ZEND_FCC_INITIALIZED(curl->handlers.sshhostkey)) {
zend_get_gc_buffer_add_fcc(gc_buffer, &curl->handlers.sshhostkey);
}
#endif

Expand Down Expand Up @@ -751,39 +751,27 @@ static size_t curl_xferinfo(void *clientp, curl_off_t dltotal, curl_off_t dlnow,
static int curl_ssh_hostkeyfunction(void *clientp, int keytype, const char *key, size_t keylen)
{
php_curl *ch = (php_curl *)clientp;
php_curl_callback *t = ch->handlers.sshhostkey;
int rval = CURLKHMATCH_MISMATCH; /* cancel connection in case of an exception */

#if PHP_CURL_DEBUG
fprintf(stderr, "curl_ssh_hostkeyfunction() called\n");
fprintf(stderr, "clientp = %x, keytype = %d, key = %s, keylen = %zu\n", clientp, keytype, key, keylen);
#endif

zval argv[4];
zval args[4];
zval retval;
zend_result error;
zend_fcall_info fci;

GC_ADDREF(&ch->std);
ZVAL_OBJ(&argv[0], &ch->std);
ZVAL_LONG(&argv[1], keytype);
ZVAL_STRINGL(&argv[2], key, keylen);
ZVAL_LONG(&argv[3], keylen);
ZVAL_OBJ(&args[0], &ch->std);
ZVAL_LONG(&args[1], keytype);
ZVAL_STRINGL(&args[2], key, keylen);
ZVAL_LONG(&args[3], keylen);

fci.size = sizeof(fci);
ZVAL_COPY_VALUE(&fci.function_name, &t->func_name);
fci.object = NULL;
fci.retval = &retval;
fci.param_count = 4;
fci.params = argv;
fci.named_params = NULL;
ch->in_callback = true;
zend_call_known_fcc(&ch->handlers.sshhostkey, &retval, /* param_count */ 4, args, /* named_params */ NULL);
ch->in_callback = false;

ch->in_callback = 1;
error = zend_call_function(&fci, &t->fci_cache);
ch->in_callback = 0;
if (error == FAILURE) {
php_error_docref(NULL, E_WARNING, "Cannot call the CURLOPT_SSH_HOSTKEYFUNCTION");
} else if (!Z_ISUNDEF(retval)) {
if (!Z_ISUNDEF(retval)) {
_php_curl_verify_handlers(ch, /* reporterror */ true);
if (Z_TYPE(retval) == IS_LONG) {
zend_long retval_long = Z_LVAL(retval);
Expand All @@ -796,8 +784,9 @@ static int curl_ssh_hostkeyfunction(void *clientp, int keytype, const char *key,
zend_throw_error(NULL, "The CURLOPT_SSH_HOSTKEYFUNCTION callback must return either CURLKHMATCH_OK or CURLKHMATCH_MISMATCH");
}
}
zval_ptr_dtor(&argv[0]);
zval_ptr_dtor(&argv[2]);

zval_ptr_dtor(&args[0]);
zval_ptr_dtor(&args[2]);
return rval;
}
#endif
Expand Down Expand Up @@ -1111,7 +1100,7 @@ void init_curl_handle(php_curl *ch)
ch->handlers.xferinfo = NULL;
ch->handlers.fnmatch = NULL;
#if LIBCURL_VERSION_NUM >= 0x075400 /* Available since 7.84.0 */
ch->handlers.sshhostkey = NULL;
ch->handlers.sshhostkey = empty_fcall_info_cache;
#endif
ch->clone = emalloc(sizeof(uint32_t));
*ch->clone = 1;
Expand Down Expand Up @@ -1295,7 +1284,7 @@ void _php_setup_easy_copy_handlers(php_curl *ch, php_curl *source)
_php_copy_callback(ch, &ch->handlers.xferinfo, source->handlers.xferinfo, CURLOPT_XFERINFODATA);
_php_copy_callback(ch, &ch->handlers.fnmatch, source->handlers.fnmatch, CURLOPT_FNMATCH_DATA);
#if LIBCURL_VERSION_NUM >= 0x075400 /* Available since 7.84.0 */
_php_copy_callback(ch, &ch->handlers.sshhostkey, source->handlers.sshhostkey, CURLOPT_SSH_HOSTKEYDATA);
php_curl_copy_fcc_with_option(ch, CURLOPT_SSH_HOSTKEYDATA, &ch->handlers.sshhostkey, &source->handlers.sshhostkey);
#endif

ZVAL_COPY(&ch->private_data, &source->private_data);
Expand Down Expand Up @@ -2172,17 +2161,17 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
}

#if LIBCURL_VERSION_NUM >= 0x075400 /* Available since 7.84.0 */
case CURLOPT_SSH_HOSTKEYFUNCTION:
case CURLOPT_SSH_HOSTKEYFUNCTION: {
/* Check value is actually a callable and set it */
const char option_name[] = "CURLOPT_SSH_HOSTKEYFUNCTION";
bool result = php_curl_set_callable_handler(&ch->handlers.sshhostkey, zvalue, is_array_config, option_name);
if (!result) {
return FAILURE;
}
curl_easy_setopt(ch->cp, CURLOPT_SSH_HOSTKEYFUNCTION, curl_ssh_hostkeyfunction);
curl_easy_setopt(ch->cp, CURLOPT_SSH_HOSTKEYDATA, ch);
if (ch->handlers.sshhostkey == NULL) {
ch->handlers.sshhostkey = ecalloc(1, sizeof(php_curl_callback));
} else if (!Z_ISUNDEF(ch->handlers.sshhostkey->func_name)) {
zval_ptr_dtor(&ch->handlers.sshhostkey->func_name);
ch->handlers.sshhostkey->fci_cache = empty_fcall_info_cache;
}
ZVAL_COPY(&ch->handlers.sshhostkey->func_name, zvalue);
break;
}
#endif

case CURLOPT_READFUNCTION:
Expand Down Expand Up @@ -2866,7 +2855,9 @@ static void curl_free_obj(zend_object *object)
_php_curl_free_callback(ch->handlers.xferinfo);
_php_curl_free_callback(ch->handlers.fnmatch);
#if LIBCURL_VERSION_NUM >= 0x075400 /* Available since 7.84.0 */
_php_curl_free_callback(ch->handlers.sshhostkey);
if (ZEND_FCC_INITIALIZED(ch->handlers.sshhostkey)) {
zend_fcc_dtor(&ch->handlers.sshhostkey);
}
#endif

zval_ptr_dtor(&ch->postfields);
Expand Down Expand Up @@ -2947,10 +2938,8 @@ static void _php_curl_reset_handlers(php_curl *ch)
}

#if LIBCURL_VERSION_NUM >= 0x075400 /* Available since 7.84.0 */
if (ch->handlers.sshhostkey) {
zval_ptr_dtor(&ch->handlers.sshhostkey->func_name);
efree(ch->handlers.sshhostkey);
ch->handlers.sshhostkey = NULL;
if (ZEND_FCC_INITIALIZED(ch->handlers.sshhostkey)) {
zend_fcc_dtor(&ch->handlers.sshhostkey);
}
#endif
}
Expand Down
3 changes: 3 additions & 0 deletions ext/curl/tests/curl_setopt_callables.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,11 @@ function testOption(CurlHandle $handle, int $option) {
$url = "{$host}/get.inc";
$ch = curl_init($url);
testOption($ch, CURLOPT_PROGRESSFUNCTION);
testOption($ch, CURLOPT_SSH_HOSTKEYFUNCTION);

?>
--EXPECT--
TypeError: curl_setopt(): Argument #3 ($value) must be a valid callback for option CURLOPT_PROGRESSFUNCTION, function "undefined" not found or invalid function name
TypeError: curl_setopt_array(): Argument #2 ($options) must be a valid callback for option CURLOPT_PROGRESSFUNCTION, function "undefined" not found or invalid function name
TypeError: curl_setopt(): Argument #3 ($value) must be a valid callback for option CURLOPT_SSH_HOSTKEYFUNCTION, function "undefined" not found or invalid function name
TypeError: curl_setopt_array(): Argument #2 ($options) must be a valid callback for option CURLOPT_SSH_HOSTKEYFUNCTION, function "undefined" not found or invalid function name
0