Skip to content

Commit eafa628

Browse files
committed
ext/curl: Add CURLOPT_PREREQFUNCTION
Curl >= 7.80.0 supports declaring a function for `CURLOPT_PREREQFUNCTION` option that gets called after Curl establishes a connection (including the TLS handshake for HTTPS connections), but before the actual request is made. The callable must return either `CURL_PREREQFUNC_OK` or `CURL_PREREQFUNC_ABORT` to allow or abort the request. This adds support for it to PHP with required ifdef. - libc: https://curl.se/libcurl/c/CURLOPT_PREREQFUNCTION.html
1 parent 05874d4 commit eafa628

File tree

6 files changed

+197
-1
lines changed

6 files changed

+197
-1
lines changed

UPGRADING

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,14 @@ PHP 8.4 UPGRADE NOTES
143143
2. New Features
144144
========================================
145145

146+
- Curl:
147+
. Added CURLOPT_PREREQFUNCTION option which accepts a callable that gets
148+
called after a connection is established (including TLS handshake), but
149+
before the request is made. The function is called with the CurlHandle
150+
object, primary IP, local IP, primary port, and the local port, and it
151+
must return CURL_PREREQFUNC_OK or CURL_PREREQFUNC_ABORT to allow or abort
152+
the request.
153+
146154
- Date:
147155
. Added static methods
148156
DateTime[Immutable]::createFromTimestamp(int|float $timestamp): static.
@@ -430,6 +438,11 @@ PHP 8.4 UPGRADE NOTES
430438
- Core:
431439
. PHP_OUTPUT_HANDLER_PROCESSED.
432440

441+
- Curl:
442+
. CURLOPT_PREREQFUNCTION.
443+
. CURL_PREREQFUNC_OK.
444+
. CURL_PREREQFUNC_ABORT.
445+
433446
- Intl:
434447
. The IntlDateFormatter class exposes now the new PATTERN constant
435448
reflecting udat api's UDAT_PATTERN.

ext/curl/curl.stub.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3485,6 +3485,21 @@
34853485
* @cvalue CURLOPT_SSH_HOST_PUBLIC_KEY_SHA256
34863486
*/
34873487
const CURLOPT_SSH_HOST_PUBLIC_KEY_SHA256 = UNKNOWN;
3488+
/**
3489+
* @var int
3490+
* @cvalue CURLOPT_PREREQFUNCTION
3491+
*/
3492+
const CURLOPT_PREREQFUNCTION = UNKNOWN;
3493+
/**
3494+
* @var int
3495+
* @cvalue CURL_PREREQFUNC_OK
3496+
*/
3497+
const CURL_PREREQFUNC_OK = UNKNOWN;
3498+
/**
3499+
* @var int
3500+
* @cvalue CURL_PREREQFUNC_ABORT
3501+
*/
3502+
const CURL_PREREQFUNC_ABORT = UNKNOWN;
34883503
#endif
34893504

34903505
#if LIBCURL_VERSION_NUM >= 0x075100 /* Available since 7.81.0 */

ext/curl/curl_arginfo.h

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ext/curl/curl_private.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ typedef struct {
7474
zval std_err;
7575
php_curl_callback *progress;
7676
php_curl_callback *xferinfo;
77+
#if LIBCURL_VERSION_NUM >= 0x075000 /* 7.80.0 */
78+
php_curl_callback *prereq;
79+
#endif
7780
php_curl_callback *fnmatch;
7881
#if LIBCURL_VERSION_NUM >= 0x075400 /* Available since 7.84.0 */
7982
php_curl_callback *sshhostkey;

ext/curl/interface.c

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,12 @@ static HashTable *curl_get_gc(zend_object *object, zval **table, int *n)
495495
zend_get_gc_buffer_add_zval(gc_buffer, &curl->handlers.xferinfo->func_name);
496496
}
497497

498+
#if LIBCURL_VERSION_NUM >= 0x075000 /* 7.80.0 */
499+
if (curl->handlers.prereq) {
500+
zend_get_gc_buffer_add_zval(gc_buffer, &curl->handlers.prereq->func_name);
501+
}
502+
#endif
503+
498504
if (curl->handlers.fnmatch) {
499505
zend_get_gc_buffer_add_zval(gc_buffer, &curl->handlers.fnmatch->func_name);
500506
}
@@ -938,6 +944,64 @@ static size_t curl_write_header(char *data, size_t size, size_t nmemb, void *ctx
938944
}
939945
/* }}} */
940946

947+
#if LIBCURL_VERSION_NUM >= 0x075000 /* 7.80.0 */
948+
static int curl_prereqfunction(void *clientp, char *conn_primary_ip, char *conn_local_ip, int conn_primary_port, int conn_local_port)
949+
{
950+
php_curl *ch = (php_curl *)clientp;
951+
php_curl_callback *t = ch->handlers.prereq;
952+
953+
int rval = CURL_PREREQFUNC_ABORT; /* Disallow the request by default. */
954+
955+
#if PHP_CURL_DEBUG
956+
fprintf(stderr, "curl_prereqfunction() called\n");
957+
fprintf(stderr, "clientp = %x, conn_primary_ip = %s, conn_local_ip = %s, conn_primary_port = %d, conn_local_port = %d\n", clientp, conn_primary_ip, conn_local_ip, c, onn_primary_port, conn_local_port);
958+
#endif
959+
960+
zval argv[5];
961+
zval retval;
962+
zend_result error;
963+
zend_fcall_info fci;
964+
965+
GC_ADDREF(&ch->std);
966+
ZVAL_OBJ(&argv[0], &ch->std);
967+
ZVAL_STRING(&argv[1], conn_primary_ip);
968+
ZVAL_STRING(&argv[2], conn_local_ip);
969+
ZVAL_LONG(&argv[3], conn_primary_port);
970+
ZVAL_LONG(&argv[4], conn_local_port);
971+
972+
fci.size = sizeof(fci);
973+
ZVAL_COPY_VALUE(&fci.function_name, &t->func_name);
974+
fci.object = NULL;
975+
fci.retval = &retval;
976+
fci.param_count = 5;
977+
fci.params = argv;
978+
fci.named_params = NULL;
979+
980+
ch->in_callback = 1;
981+
error = zend_call_function(&fci, &t->fci_cache);
982+
ch->in_callback = 0;
983+
if (!Z_ISUNDEF(retval)) {
984+
_php_curl_verify_handlers(ch, true);
985+
if (Z_TYPE(retval) == IS_LONG) {
986+
zend_long retval_long = Z_LVAL(retval);
987+
if (retval_long == CURL_PREREQFUNC_OK || retval_long == CURL_PREREQFUNC_ABORT) {
988+
rval = retval_long;
989+
} else {
990+
zend_throw_error(NULL, "The CURLOPT_PREREQFUNCTION callback must return either CURL_PREREQFUNC_OK or CURL_PREREQFUNC_ABORT");
991+
}
992+
} else {
993+
zend_throw_error(NULL, "The CURLOPT_PREREQFUNCTION callback must return either CURL_PREREQFUNC_OK or CURL_PREREQFUNC_ABORT");
994+
}
995+
}
996+
zval_ptr_dtor(&argv[0]);
997+
zval_ptr_dtor(&argv[1]);
998+
zval_ptr_dtor(&argv[2]);
999+
1000+
return rval;
1001+
}
1002+
1003+
#endif
1004+
9411005
static int curl_debug(CURL *cp, curl_infotype type, char *buf, size_t buf_len, void *ctx) /* {{{ */
9421006
{
9431007
php_curl *ch = (php_curl *)ctx;
@@ -1057,6 +1121,9 @@ void init_curl_handle(php_curl *ch)
10571121
ch->handlers.progress = NULL;
10581122
ch->handlers.xferinfo = NULL;
10591123
ch->handlers.fnmatch = NULL;
1124+
#if LIBCURL_VERSION_NUM >= 0x075000 /* 7.80.0 */
1125+
ch->handlers.prereq = NULL;
1126+
#endif
10601127
#if LIBCURL_VERSION_NUM >= 0x075400 /* Available since 7.84.0 */
10611128
ch->handlers.sshhostkey = NULL;
10621129
#endif
@@ -1233,6 +1300,9 @@ void _php_setup_easy_copy_handlers(php_curl *ch, php_curl *source)
12331300
_php_copy_callback(ch, &ch->handlers.progress, source->handlers.progress, CURLOPT_PROGRESSDATA);
12341301
_php_copy_callback(ch, &ch->handlers.xferinfo, source->handlers.xferinfo, CURLOPT_XFERINFODATA);
12351302
_php_copy_callback(ch, &ch->handlers.fnmatch, source->handlers.fnmatch, CURLOPT_FNMATCH_DATA);
1303+
#if LIBCURL_VERSION_NUM >= 0x075000 /* 7.80.0 */
1304+
_php_copy_callback(ch, &ch->handlers.prereq, source->handlers.prereq, CURLOPT_PREREQFUNCTION);
1305+
#endif
12361306
#if LIBCURL_VERSION_NUM >= 0x075400 /* Available since 7.84.0 */
12371307
_php_copy_callback(ch, &ch->handlers.sshhostkey, source->handlers.sshhostkey, CURLOPT_SSH_HOSTKEYDATA);
12381308
#endif
@@ -2143,6 +2213,20 @@ static zend_result _php_curl_setopt(php_curl *ch, zend_long option, zval *zvalue
21432213
ZVAL_COPY(&ch->handlers.xferinfo->func_name, zvalue);
21442214
break;
21452215

2216+
#if LIBCURL_VERSION_NUM >= 0x075000 /* 7.80.0 */
2217+
case CURLOPT_PREREQFUNCTION:
2218+
curl_easy_setopt(ch->cp, CURLOPT_PREREQFUNCTION, curl_prereqfunction);
2219+
curl_easy_setopt(ch->cp, CURLOPT_PREREQDATA, ch);
2220+
if (ch->handlers.prereq == NULL) {
2221+
ch->handlers.prereq = ecalloc(1, sizeof(php_curl_callback));
2222+
} else if (!Z_ISUNDEF(ch->handlers.prereq->func_name)) {
2223+
zval_ptr_dtor(&ch->handlers.prereq->func_name);
2224+
ch->handlers.prereq->fci_cache = empty_fcall_info_cache;
2225+
}
2226+
ZVAL_COPY(&ch->handlers.prereq->func_name, zvalue);
2227+
break;
2228+
#endif
2229+
21462230
/* Curl off_t options */
21472231
case CURLOPT_MAX_RECV_SPEED_LARGE:
21482232
case CURLOPT_MAX_SEND_SPEED_LARGE:
@@ -2786,6 +2870,9 @@ static void curl_free_obj(zend_object *object)
27862870
#if LIBCURL_VERSION_NUM >= 0x075400 /* Available since 7.84.0 */
27872871
_php_curl_free_callback(ch->handlers.sshhostkey);
27882872
#endif
2873+
#if LIBCURL_VERSION_NUM >= 0x075000 /* 7.80.0 */
2874+
_php_curl_free_callback(ch->handlers.prereq);
2875+
#endif
27892876

27902877
zval_ptr_dtor(&ch->postfields);
27912878
zval_ptr_dtor(&ch->private_data);
@@ -2860,6 +2947,14 @@ static void _php_curl_reset_handlers(php_curl *ch)
28602947
ch->handlers.xferinfo = NULL;
28612948
}
28622949

2950+
#if LIBCURL_VERSION_NUM >= 0x075000 /* 7.80.0 */
2951+
if (ch->handlers.prereq) {
2952+
zval_ptr_dtor(&ch->handlers.prereq->func_name);
2953+
efree(ch->handlers.prereq);
2954+
ch->handlers.prereq = NULL;
2955+
}
2956+
#endif
2957+
28632958
if (ch->handlers.fnmatch) {
28642959
zval_ptr_dtor(&ch->handlers.fnmatch->func_name);
28652960
efree(ch->handlers.fnmatch);
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
--TEST--
2+
Curl option CURLOPT_PREREQFUNCTION
3+
--EXTENSIONS--
4+
curl
5+
--SKIPIF--
6+
<?php
7+
$curl_version = curl_version();
8+
if ($curl_version['version_number'] < 0x075000) die("skip: test works only with curl >= 7.80.0");
9+
?>
10+
--FILE--
11+
<?php
12+
include 'server.inc';
13+
14+
$host = curl_cli_server_start();
15+
$port = (int) (explode(':', $host))[1];
16+
17+
$ch = curl_init();
18+
curl_setopt($ch, CURLOPT_URL, $host);
19+
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
20+
//curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4);
21+
22+
var_dump(CURLOPT_PREREQFUNCTION);
23+
var_dump(CURL_PREREQFUNC_OK);
24+
var_dump(CURL_PREREQFUNC_ABORT);
25+
26+
curl_setopt($ch, CURLOPT_PREREQFUNCTION, function() use ($port) {
27+
var_dump('callback');
28+
var_dump(func_num_args());
29+
$args = func_get_args();
30+
var_dump(get_class($args[0]));
31+
var_dump(filter_var($args[1], FILTER_VALIDATE_IP) !== false);
32+
var_dump(filter_var($args[2], FILTER_VALIDATE_IP) !== false);
33+
var_dump($port === $args[3]);
34+
var_dump(is_int($args[4]));
35+
36+
return CURL_PREREQFUNC_ABORT;
37+
});
38+
39+
$result = curl_exec($ch);
40+
41+
var_dump($result);
42+
var_dump(curl_error($ch));
43+
var_dump(curl_errno($ch));
44+
45+
var_dump('finished');
46+
?>
47+
--EXPECT--
48+
int(20312)
49+
int(0)
50+
int(1)
51+
string(8) "callback"
52+
int(5)
53+
string(10) "CurlHandle"
54+
bool(true)
55+
bool(true)
56+
bool(true)
57+
bool(true)
58+
bool(false)
59+
string(41) "operation aborted by pre-request callback"
60+
int(42)
61+
string(8) "finished"

0 commit comments

Comments
 (0)