cvs: php-src(PHP_5_0) / NEWS /ext/curl interface.c

From: Date: Mon, 14 Mar 2005 09:02:43 +0000
Subject: cvs: php-src(PHP_5_0) / NEWS /ext/curl interface.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-30922@lists.php.net to get a copy of this message
sniper Mon Mar 14 04:02:43 2005 EDT Modified files: (Branch: PHP_5_0) /php-src NEWS /php-src/ext/curl interface.c Log: - Fixed bug #30609 (cURL functions bypass open_basedir) http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.286&r2=1.1760.2.287&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1760.2.286 php-src/NEWS:1.1760.2.287 --- php-src/NEWS:1.1760.2.286 Mon Mar 14 03:57:43 2005 +++ php-src/NEWS Mon Mar 14 04:02:42 2005 @@ -132,6 +132,7 @@ - Fixed bug #30726 (-.1 like numbers are not being handled correctly). (Ilia) - Fixed bug #30725 (PHP segfaults when an exception is thrown in getIterator() within foreach). (Marcus) +- Fixed bug #30609 (cURL functions bypass open_basedir). (Jani) - Fixed bug #30446 (apache2handler: virtual() includes files out of sequence) - Fixed bug #30430 (odbc_next_result() doesn't bind values and that results in segfault). (pdan-php at esync dot org, Tony) http://cvs.php.net/diff.php/php-src/ext/curl/interface.c?r1=1.46.2.6&r2=1.46.2.7&ty=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.46.2.6 php-src/ext/curl/interface.c:1.46.2.7 --- php-src/ext/curl/interface.c:1.46.2.6 Thu Jan 6 05:21:09 2005 +++ php-src/ext/curl/interface.c Mon Mar 14 04:02:42 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interface.c,v 1.46.2.6 2005/01/06 10:21:09 jorton Exp $ */ +/* $Id: interface.c,v 1.46.2.7 2005/03/14 09:02:42 sniper Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -49,6 +49,7 @@ #include "ext/standard/php_smart_str.h" #include "ext/standard/info.h" #include "ext/standard/file.h" +#include "ext/standard/url.h" #include "php_curl.h" static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC); @@ -60,6 +61,26 @@ #define CAAS(s, v) add_assoc_string_ex(return_value, s, sizeof(s), (char *) v, 1); #define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s), (zval *) v); +#define PHP_CURL_CHECK_OPEN_BASEDIR(str, len) \ + if (PG(open_basedir) && *PG(open_basedir) && \ + strncasecmp(str, "file://", sizeof("file://") - 1) == 0) \ + { \ + php_url *tmp_url; \ + \ + if (!(tmp_url = php_url_parse_ex(str, len))) { \ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid url '%s'", str); \ + RETURN_FALSE; \ + } \ + \ + if (php_check_open_basedir(tmp_url->path TSRMLS_CC) || \ + (PG(safe_mode) && !php_checkuid(tmp_url->path, "rb+", CHECKUID_CHECK_MODE_PARAM)) \ + ) { \ + php_url_free(tmp_url); \ + RETURN_FALSE; \ + } \ + php_url_free(tmp_url); \ + } + /* {{{ curl_functions[] */ function_entry curl_functions[] = { @@ -773,6 +794,11 @@ WRONG_PARAM_COUNT; } + if (argc > 0) { + convert_to_string_ex(url); + PHP_CURL_CHECK_OPEN_BASEDIR(Z_STRVAL_PP(url), Z_STRLEN_PP(url)); + } + cp = curl_easy_init(); if (!cp) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not initialize a new cURL handle"); @@ -809,7 +835,6 @@ if (argc > 0) { char *urlcopy; - convert_to_string_ex(url); urlcopy = estrndup(Z_STRVAL_PP(url), Z_STRLEN_PP(url)); curl_easy_setopt(ch->cp, CURLOPT_URL, urlcopy); @@ -855,7 +880,7 @@ } /* }}} */ -/* {{{ proto bool curl_setopt(resource ch, string option, mixed value) +/* {{{ proto bool curl_setopt(resource ch, int option, mixed value) Set an option for a CURL transfer */ PHP_FUNCTION(curl_setopt) { @@ -956,8 +981,12 @@ char *copystr = NULL; convert_to_string_ex(zvalue); - copystr = estrndup(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue)); + if (option == CURLOPT_URL) { + PHP_CURL_CHECK_OPEN_BASEDIR(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue)); + } + + copystr = estrndup(Z_STRVAL_PP(zvalue), Z_STRLEN_PP(zvalue)); error = curl_easy_setopt(ch->cp, option, copystr); zend_llist_add_element(&ch->to_free.str, &copystr);

« previous php.cvs (#30922) next »