From: Michael Wallner Date: Sat, 4 Nov 2006 14:04:34 +0000 (+0000) Subject: - servers may return a header multiple times, join them in http_message_header() X-Git-Tag: RELEASE_1_4_0RC1~27 X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=864a85259b0369033e49666603eed6661b01606c;p=m6w6%2Fext-http - servers may return a header multiple times, join them in http_message_header() - separate body soaking to http_message_body_parse() - string pointer safety checks --- diff --git a/http_api.c b/http_api.c index 78745ee..f8f93e1 100644 --- a/http_api.c +++ b/http_api.c @@ -212,7 +212,7 @@ STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header { if ( (send_header && (SUCCESS != http_send_status_header(status, header))) || (status && (SUCCESS != http_send_status(status)))) { - http_error_ex(HE_WARNING, HTTP_E_HEADER, "Failed to exit with status/header: %d - %s", status, header ? header : ""); + http_error_ex(HE_WARNING, HTTP_E_HEADER, "Failed to exit with status/header: %d - %s", status, STR_PTR(header)); STR_FREE(header); STR_FREE(body); return FAILURE; diff --git a/http_cookie_api.c b/http_cookie_api.c index aff04ab..b487e20 100644 --- a/http_cookie_api.c +++ b/http_cookie_api.c @@ -221,8 +221,8 @@ PHP_HTTP_API void _http_cookie_list_tostruct(http_cookie_list *list, zval *strct add_assoc_long(&array, "flags", list->flags); add_assoc_long(&array, "expires", (long) list->expires); - add_assoc_string(&array, "path", list->path?list->path:"", 1); - add_assoc_string(&array, "domain", list->domain?list->domain:"", 1); + add_assoc_string(&array, "path", STR_PTR(list->path), 1); + add_assoc_string(&array, "domain", STR_PTR(list->domain), 1); } /* }}} */ diff --git a/http_message_api.c b/http_message_api.c index 6470725..4da4e88 100644 --- a/http_message_api.c +++ b/http_message_api.c @@ -122,75 +122,66 @@ PHP_HTTP_API void _http_message_set_info(http_message *message, http_info *info) } } -PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char *message, size_t message_length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC) +#define http_message_body_parse(m, ms, ml, c) _http_message_body_parse((m), (ms), (ml), (c) TSRMLS_CC) +static inline void _http_message_body_parse(http_message *msg, const char *message, size_t message_length, const char **continue_at TSRMLS_DC) { - const char *body = NULL; - zend_bool free_msg = msg ? 0 : 1; - - if ((!message) || (message_length < HTTP_MSG_MIN_SIZE)) { - http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Empty or too short HTTP message: '%s'", message); - return NULL; - } - - msg = http_message_init_rel(msg, 0); - - if (SUCCESS != http_parse_headers_cb(message, &msg->hdrs, 1, (http_info_callback) http_message_info_callback, (void *) &msg)) { - if (free_msg) { - http_message_free(&msg); - } - http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Failed to parse message headers"); - return NULL; - } + zval *c; + size_t remaining; + const char *body; - /* header parsing stops at (CR)LF (CR)LF */ + *continue_at = NULL; if ((body = http_locate_body(message))) { - zval *c; - const char *continue_at = NULL; - size_t remaining = message + message_length - body; - - /* message has chunked transfer encoding */ - if ((c = http_message_header(msg, "Transfer-Encoding")) && (!strcasecmp("chunked", Z_STRVAL_P(c)))) { - char *decoded; - size_t decoded_len; - - /* decode and replace Transfer-Encoding with Content-Length header */ - if ((continue_at = http_encoding_dechunk(body, message + message_length - body, &decoded, &decoded_len))) { - zval *len; - char *tmp; - int tmp_len; - - tmp_len = (int) spprintf(&tmp, 0, "%zu", decoded_len); - MAKE_STD_ZVAL(len); - ZVAL_STRINGL(len, tmp, tmp_len, 0); - - ZVAL_ADDREF(c); - zend_hash_add(&msg->hdrs, "X-Original-Transfer-Encoding", sizeof("X-Original-Transfer-Encoding"), (void *) &c, sizeof(zval *), NULL); - zend_hash_del(&msg->hdrs, "Transfer-Encoding", sizeof("Transfer-Encoding")); - zend_hash_del(&msg->hdrs, "Content-Length", sizeof("Content-Length")); - zend_hash_add(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL); + remaining = message + message_length - body; + + if ((c = http_message_header(msg, "Transfer-Encoding"))) { + if (strstr(Z_STRVAL_P(c), "chunked")) { + /* message has chunked transfer encoding */ + char *decoded; + size_t decoded_len; - phpstr_from_string_ex(PHPSTR(msg), decoded, decoded_len); - efree(decoded); + /* decode and replace Transfer-Encoding with Content-Length header */ + if ((*continue_at = http_encoding_dechunk(body, message + message_length - body, &decoded, &decoded_len))) { + zval *len; + char *tmp; + int tmp_len; + + tmp_len = (int) spprintf(&tmp, 0, "%zu", decoded_len); + MAKE_STD_ZVAL(len); + ZVAL_STRINGL(len, tmp, tmp_len, 0); + + ZVAL_ADDREF(c); + zend_hash_update(&msg->hdrs, "X-Original-Transfer-Encoding", sizeof("X-Original-Transfer-Encoding"), (void *) &c, sizeof(zval *), NULL); + zend_hash_del(&msg->hdrs, "Transfer-Encoding", sizeof("Transfer-Encoding")); + zend_hash_del(&msg->hdrs, "Content-Length", sizeof("Content-Length")); + zend_hash_update(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL); + + phpstr_from_string_ex(PHPSTR(msg), decoded, decoded_len); + efree(decoded); + } } - } else - - /* message has content-length header */ - if ((c = http_message_header(msg, "Content-Length"))) { + zval_ptr_dtor(&c); + } + + if (!*continue_at && (c = http_message_header(msg, "Content-Length"))) { + /* message has content-length header */ ulong len = strtoul(Z_STRVAL_P(c), NULL, 10); if (len > remaining) { http_error_ex(HE_NOTICE, HTTP_E_MALFORMED_HEADERS, "The Content-Length header pretends a larger body than actually received (expected %lu bytes; got %lu bytes)", len, remaining); len = remaining; } phpstr_from_string_ex(PHPSTR(msg), body, len); - continue_at = body + len; - } else - - /* message has content-range header */ - if ((c = http_message_header(msg, "Content-Range"))) { + *continue_at = body + len; + zval_ptr_dtor(&c); + } + + if (!*continue_at && (c = http_message_header(msg, "Content-Range"))) { + /* message has content-range header */ ulong total = 0, start = 0, end = 0, len = 0; if (!strncasecmp(Z_STRVAL_P(c), "bytes", lenof("bytes")) && - (Z_STRVAL_P(c)[lenof("bytes")] == ':' || Z_STRVAL_P(c)[lenof("bytes")] == ' ')) { + ( Z_STRVAL_P(c)[lenof("bytes")] == ':' || + Z_STRVAL_P(c)[lenof("bytes")] == ' ' || + Z_STRVAL_P(c)[lenof("bytes")] == '=')) { char *total_at = NULL, *end_at = NULL; char *start_at = Z_STRVAL_P(c) + sizeof("bytes"); @@ -206,75 +197,107 @@ PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char } if (end >= start && (!total || end < total)) { phpstr_from_string_ex(PHPSTR(msg), body, len); - continue_at = body + len; + *continue_at = body + len; } } } - - if (!continue_at) { + + if (!*continue_at) { http_error_ex(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Invalid Content-Range header: %s", Z_STRVAL_P(c)); } - } else - - /* no headers that indicate content length */ - if (HTTP_MSG_TYPE(RESPONSE, msg)) { - phpstr_from_string_ex(PHPSTR(msg), body, remaining); - } else { - continue_at = body; + zval_ptr_dtor(&c); + } + + if (!*continue_at) { + /* no headers that indicate content length */ + if (HTTP_MSG_TYPE(RESPONSE, msg)) { + phpstr_from_string_ex(PHPSTR(msg), body, remaining); + } else { + *continue_at = body; + } } #ifdef HTTP_HAVE_ZLIB /* check for compressed data */ - if (http_message_header(msg, "Vary") && (c = http_message_header(msg, "Content-Encoding"))) { - char *decoded = NULL; - size_t decoded_len = 0; - - if ( !strcasecmp(Z_STRVAL_P(c), "gzip") || - !strcasecmp(Z_STRVAL_P(c), "x-gzip") || - !strcasecmp(Z_STRVAL_P(c), "deflate")) { - http_encoding_inflate(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len); - } + if ((c = http_message_header(msg, "Vary"))) { + zval_ptr_dtor(&c); - if (decoded) { - zval *len, **original_len; - char *tmp; - int tmp_len; + if ((c = http_message_header(msg, "Content-Encoding"))) { + char *decoded = NULL; + size_t decoded_len = 0; - tmp_len = (int) spprintf(&tmp, 0, "%zu", decoded_len); - MAKE_STD_ZVAL(len); - ZVAL_STRINGL(len, tmp, tmp_len, 0); - - ZVAL_ADDREF(c); - zend_hash_add(&msg->hdrs, "X-Original-Content-Encoding", sizeof("X-Original-Content-Encoding"), (void *) &c, sizeof(zval *), NULL); - zend_hash_del(&msg->hdrs, "Content-Encoding", sizeof("Content-Encoding")); - if (SUCCESS == zend_hash_find(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &original_len)) { - ZVAL_ADDREF(*original_len); - zend_hash_add(&msg->hdrs, "X-Original-Content-Length", sizeof("X-Original-Content-Length"), (void *) original_len, sizeof(zval *), NULL); - zend_hash_update(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL); - } else { - zend_hash_add(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL); + if ( !strcasecmp(Z_STRVAL_P(c), "gzip") || + !strcasecmp(Z_STRVAL_P(c), "x-gzip") || + !strcasecmp(Z_STRVAL_P(c), "deflate")) { + http_encoding_inflate(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len); } - - phpstr_dtor(PHPSTR(msg)); - PHPSTR(msg)->data = decoded; - PHPSTR(msg)->used = decoded_len; - PHPSTR(msg)->free = 1; + + if (decoded) { + zval *len, **original_len; + char *tmp; + int tmp_len; + + tmp_len = (int) spprintf(&tmp, 0, "%zu", decoded_len); + MAKE_STD_ZVAL(len); + ZVAL_STRINGL(len, tmp, tmp_len, 0); + + ZVAL_ADDREF(c); + zend_hash_update(&msg->hdrs, "X-Original-Content-Encoding", sizeof("X-Original-Content-Encoding"), (void *) &c, sizeof(zval *), NULL); + zend_hash_del(&msg->hdrs, "Content-Encoding", sizeof("Content-Encoding")); + if (SUCCESS == zend_hash_find(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &original_len)) { + ZVAL_ADDREF(*original_len); + zend_hash_update(&msg->hdrs, "X-Original-Content-Length", sizeof("X-Original-Content-Length"), (void *) original_len, sizeof(zval *), NULL); + zend_hash_update(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL); + } else { + zend_hash_update(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL); + } + + phpstr_dtor(PHPSTR(msg)); + PHPSTR(msg)->data = decoded; + PHPSTR(msg)->used = decoded_len; + PHPSTR(msg)->free = 1; + } + + zval_ptr_dtor(&c); } } #endif /* HTTP_HAVE_ZLIB */ + } +} - /* check for following messages */ - if (continue_at && (continue_at < (message + message_length))) { - while (HTTP_IS_CTYPE(space, *continue_at)) ++continue_at; - if (continue_at < (message + message_length)) { - http_message *next = NULL, *most = NULL; - - /* set current message to parent of most parent following messages and return deepest */ - if ((most = next = http_message_parse_rel(NULL, continue_at, message + message_length - continue_at))) { - while (most->parent) most = most->parent; - most->parent = msg; - msg = next; - } +PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char *message, size_t message_length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC) +{ + const char *continue_at; + zend_bool free_msg = msg ? 0 : 1; + + if ((!message) || (message_length < HTTP_MSG_MIN_SIZE)) { + http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Empty or too short HTTP message: '%s'", message); + return NULL; + } + + msg = http_message_init_rel(msg, 0); + + if (SUCCESS != http_parse_headers_cb(message, &msg->hdrs, 1, (http_info_callback) http_message_info_callback, (void *) &msg)) { + if (free_msg) { + http_message_free(&msg); + } + http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Failed to parse message headers"); + return NULL; + } + + http_message_body_parse(msg, message, message_length, &continue_at); + + /* check for following messages */ + if (continue_at && (continue_at < (message + message_length))) { + while (HTTP_IS_CTYPE(space, *continue_at)) ++continue_at; + if (continue_at < (message + message_length)) { + http_message *next = NULL, *most = NULL; + + /* set current message to parent of most parent following messages and return deepest */ + if ((most = next = http_message_parse_rel(NULL, continue_at, message + message_length - continue_at))) { + while (most->parent) most = most->parent; + most->parent = msg; + msg = next; } } } @@ -295,8 +318,8 @@ PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_ switch (msg->type) { case HTTP_MSG_REQUEST: phpstr_appendf(&str, "%s %s HTTP/%1.1f" HTTP_CRLF, - msg->http.info.request.method, - msg->http.info.request.url, + msg->http.info.request.method?msg->http.info.request.method:"UNKNOWN", + msg->http.info.request.url?msg->http.info.request.url:"/", msg->http.version); break; @@ -304,8 +327,8 @@ PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_ phpstr_appendf(&str, "HTTP/%1.1f %d%s%s" HTTP_CRLF, msg->http.version, msg->http.info.response.code, - *msg->http.info.response.status ? " ":"", - msg->http.info.response.status); + msg->http.info.response.status&&*msg->http.info.response.status ? " ":"", + STR_PTR(msg->http.info.response.status)); break; case HTTP_MSG_NONE: @@ -315,6 +338,7 @@ PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_ FOREACH_HASH_KEYVAL(pos1, &msg->hdrs, key, idx, header) { if (key) { + HashPosition pos2; zval **single_header; switch (Z_TYPE_PP(header)) { @@ -323,13 +347,10 @@ PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_ break; case IS_ARRAY: - { - HashPosition pos2; FOREACH_VAL(pos2, *header, single_header) { phpstr_appendf(&str, "%s: %s" HTTP_CRLF, key, Z_STRVAL_PP(single_header)); } break; - } } key = NULL; diff --git a/http_message_object.c b/http_message_object.c index 044df4c..5624e21 100644 --- a/http_message_object.c +++ b/http_message_object.c @@ -637,13 +637,13 @@ static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC) case HTTP_MSG_REQUEST: ASSOC_PROP(array, long, "responseCode", 0); ASSOC_STRINGL(array, "responseStatus", "", 0); - ASSOC_STRING(array, "requestMethod", msg->http.info.request.method?msg->http.info.request.method:""); - ASSOC_STRING(array, "requestUrl", msg->http.info.request.url?msg->http.info.request.url:""); + ASSOC_STRING(array, "requestMethod", STR_PTR(msg->http.info.request.method)); + ASSOC_STRING(array, "requestUrl", STR_PTR(msg->http.info.request.url)); break; case HTTP_MSG_RESPONSE: ASSOC_PROP(array, long, "responseCode", msg->http.info.response.code); - ASSOC_STRING(array, "responseStatus", msg->http.info.response.status?msg->http.info.response.status:""); + ASSOC_STRING(array, "responseStatus", STR_PTR(msg->http.info.response.status)); ASSOC_STRINGL(array, "requestMethod", "", 0); ASSOC_STRINGL(array, "requestUrl", "", 0); break; @@ -809,8 +809,8 @@ PHP_METHOD(HttpMessage, getHeader) } nice_header = pretty_key(estrndup(orig_header, header_len), header_len, 1, 1); - if ((header = http_message_header_ex(obj->message, nice_header, header_len + 1))) { - RETVAL_ZVAL(header, 1, 0); + if ((header = http_message_header_ex(obj->message, nice_header, header_len + 1, 0))) { + RETVAL_ZVAL(header, 1, 1); } efree(nice_header); } @@ -1306,6 +1306,7 @@ PHP_METHOD(HttpMessage, toMessageTypeObject) memset(&hurl, 0, sizeof(php_url)); hurl.host = host ? Z_STRVAL_P(host) : NULL; + zval_ptr_dtor(&host); http_build_url(HTTP_URL_REPLACE, purl, &hurl, NULL, &url, NULL); php_url_free(purl); add_assoc_string(array, "url", url, 0); diff --git a/http_request_object.c b/http_request_object.c index 8e0b7ce..b9e8af7 100644 --- a/http_request_object.c +++ b/http_request_object.c @@ -653,7 +653,7 @@ STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this } UPD_PROP(long, responseCode, msg->http.info.response.code); - UPD_PROP(string, responseStatus, msg->http.info.response.status ? msg->http.info.response.status : ""); + UPD_PROP(string, responseStatus, STR_PTR(msg->http.info.response.status)); MAKE_STD_ZVAL(message); ZVAL_OBJVAL(message, http_message_object_new_ex(http_message_object_ce, msg, NULL), 0); @@ -1719,8 +1719,8 @@ PHP_METHOD(HttpRequest, getResponseHeader) getObjectEx(http_message_object, msg, message); if (header_len) { - if ((header = http_message_header_ex(msg->message, pretty_key(header_name, header_len, 1, 1), header_len + 1))) { - RETURN_ZVAL(header, 1, 0); + if ((header = http_message_header_ex(msg->message, pretty_key(header_name, header_len, 1, 1), header_len + 1, 0))) { + RETURN_ZVAL(header, 1, 1); } } else { array_init(return_value); diff --git a/php_http_message_api.h b/php_http_message_api.h index e3ab839..4688c71 100644 --- a/php_http_message_api.h +++ b/php_http_message_api.h @@ -51,13 +51,29 @@ PHP_HTTP_API void _http_message_set_type(http_message *m, http_message_type t); #define http_message_set_info(m, i) _http_message_set_info((m), (i)) PHP_HTTP_API void _http_message_set_info(http_message *message, http_info *info); -#define http_message_header(m, h) _http_message_header_ex((m), (h), sizeof(h)) +#define http_message_header(m, h) _http_message_header_ex((m), (h), sizeof(h), 1) #define http_message_header_ex _http_message_header_ex -static inline zval *_http_message_header_ex(http_message *msg, char *key_str, size_t key_len) +static inline zval *_http_message_header_ex(http_message *msg, char *key_str, size_t key_len, int join) { zval **header; if (SUCCESS == zend_hash_find(&msg->hdrs, key_str, key_len, (void *) &header)) { - return *header; + if (join && Z_TYPE_PP(header) == IS_ARRAY) { + zval *header_str, **val; + HashPosition pos; + phpstr str; + + phpstr_init(&str); + MAKE_STD_ZVAL(header_str); + FOREACH_VAL(pos, *header, val) { + phpstr_appendf(&str, PHPSTR_LEN(&str) ? ", %s":"%s", Z_STRVAL_PP(val)); + } + phpstr_fix(&str); + ZVAL_STRINGL(header_str, PHPSTR_VAL(&str), PHPSTR_LEN(&str), 0); + return header_str; + } else { + ZVAL_ADDREF(*header); + return *header; + } } return NULL; } diff --git a/php_http_std_defs.h b/php_http_std_defs.h index 2f92c87..fd96018 100644 --- a/php_http_std_defs.h +++ b/php_http_std_defs.h @@ -49,6 +49,8 @@ typedef int STATUS; } #endif +#define STR_PTR(s) (s?s:"") + #define INIT_ZARR(zv, ht) \ { \ INIT_PZVAL(&(zv)); \