X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_message_body.c;h=c80c2389151b78ce0976dd23ba86f4796fb594d9;hp=f80cb460e9124d2638d4285cdc3b57990507b37c;hb=refs%2Fheads%2Fv2.4.x;hpb=5ec364a753efc077007c4180e3ae6d4f1fdb6390 diff --git a/php_http_message_body.c b/php_http_message_body.c index f80cb46..c80c238 100644 --- a/php_http_message_body.c +++ b/php_http_message_body.c @@ -6,17 +6,13 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2010, Michael Wallner | + | Copyright (c) 2004-2014, Michael Wallner | +--------------------------------------------------------------------+ */ -/* $Id: http_message_body.c 292841 2009-12-31 08:48:57Z mike $ */ +#include "php_http_api.h" -#include "php_http.h" - -#include #include -#include #define BOUNDARY_OPEN(body) \ do {\ @@ -28,19 +24,26 @@ php_http_message_body_appendf(body, "--%s" PHP_HTTP_CRLF, php_http_message_body_boundary(body)); \ } \ } while(0) + #define BOUNDARY_CLOSE(body) \ php_http_message_body_appendf(body, PHP_HTTP_CRLF "--%s--" PHP_HTTP_CRLF, php_http_message_body_boundary(body)) -static STATUS add_recursive_fields(php_http_message_body_t *body, const char *name, zval *value); -static STATUS add_recursive_files(php_http_message_body_t *body, const char *name, zval *value); +static ZEND_RESULT_CODE add_recursive_fields(php_http_message_body_t *body, const char *name, zval *value); +static ZEND_RESULT_CODE add_recursive_files(php_http_message_body_t *body, const char *name, zval *value); -PHP_HTTP_API php_http_message_body_t *php_http_message_body_init(php_http_message_body_t *body, php_stream *stream TSRMLS_DC) +php_http_message_body_t *php_http_message_body_init(php_http_message_body_t **body_ptr, php_stream *stream TSRMLS_DC) { - if (!body) { - body = emalloc(sizeof(php_http_message_body_t)); + php_http_message_body_t *body; + + if (body_ptr && *body_ptr) { + body = *body_ptr; + ++body->refcount; + return body; } - memset(body, 0, sizeof(*body)); + body = ecalloc(1, sizeof(php_http_message_body_t)); + body->refcount = 1; + if (stream) { php_stream_auto_cleanup(stream); body->stream_id = php_stream_get_resource_id(stream); @@ -52,55 +55,66 @@ PHP_HTTP_API php_http_message_body_t *php_http_message_body_init(php_http_messag } TSRMLS_SET_CTX(body->ts); + if (body_ptr) { + *body_ptr = body; + } + return body; } -PHP_HTTP_API php_http_message_body_t *php_http_message_body_copy(php_http_message_body_t *from, php_http_message_body_t *to, zend_bool dup_internal_stream_and_contents) +unsigned php_http_message_body_addref(php_http_message_body_t *body) { - if (!from) { - return NULL; - } else { + return ++body->refcount; +} + +php_http_message_body_t *php_http_message_body_copy(php_http_message_body_t *from, php_http_message_body_t *to) +{ + if (from) { TSRMLS_FETCH_FROM_CTX(from->ts); - if (dup_internal_stream_and_contents) { - to = php_http_message_body_init(to, NULL TSRMLS_CC); - php_http_message_body_to_stream(from, php_http_message_body_stream(to), 0, 0); + if (to) { + php_stream_truncate_set_size(php_http_message_body_stream(to), 0); } else { - to = php_http_message_body_init(to, php_http_message_body_stream(from) TSRMLS_CC); + to = php_http_message_body_init(NULL, NULL TSRMLS_CC); } + php_http_message_body_to_stream(from, php_http_message_body_stream(to), 0, 0); + if (to->boundary) { + efree(to->boundary); + } if (from->boundary) { to->boundary = estrdup(from->boundary); } - - return to; + } else { + to = NULL; } + return to; } -PHP_HTTP_API void php_http_message_body_dtor(php_http_message_body_t *body) +void php_http_message_body_free(php_http_message_body_t **body_ptr) { - /* NO FIXME: shows leakinfo in DEBUG mode */ - zend_list_delete(body->stream_id); - STR_FREE(body->boundary); -} - -PHP_HTTP_API void php_http_message_body_free(php_http_message_body_t **body) -{ - if (*body) { - php_http_message_body_dtor(*body); - efree(*body); - *body = NULL; + if (*body_ptr) { + php_http_message_body_t *body = *body_ptr; + + if (!--body->refcount) { + TSRMLS_FETCH_FROM_CTX(body->ts); + /* NOFIXME: shows leakinfo in DEBUG mode */ + zend_list_delete(body->stream_id); + PTR_FREE(body->boundary); + efree(body); + } + *body_ptr = NULL; } } -PHP_HTTP_API const php_stream_statbuf *php_http_message_body_stat(php_http_message_body_t *body) +const php_stream_statbuf *php_http_message_body_stat(php_http_message_body_t *body) { TSRMLS_FETCH_FROM_CTX(body->ts); php_stream_stat(php_http_message_body_stream(body), &body->ssb); return &body->ssb; } -PHP_HTTP_API const char *php_http_message_body_boundary(php_http_message_body_t *body) +const char *php_http_message_body_boundary(php_http_message_body_t *body) { if (!body->boundary) { union { double dbl; int num[2]; } data; @@ -112,29 +126,37 @@ PHP_HTTP_API const char *php_http_message_body_boundary(php_http_message_body_t return body->boundary; } -PHP_HTTP_API char *php_http_message_body_etag(php_http_message_body_t *body) +char *php_http_message_body_etag(php_http_message_body_t *body) { + php_http_etag_t *etag; + php_stream *s = php_http_message_body_stream(body); TSRMLS_FETCH_FROM_CTX(body->ts); - php_stream_statbuf *ssb = php_http_message_body_stat(body); /* real file or temp buffer ? */ - if (body->ssb.sb.st_mtime) { - char *etag; + if (s->ops != &php_stream_temp_ops && s->ops != &php_stream_memory_ops) { + php_stream_stat(php_http_message_body_stream(body), &body->ssb); - spprintf(&etag, 0, "%lx-%lx-%lx", ssb->sb.st_ino, ssb->sb.st_mtime, ssb->sb.st_size); - return etag; - } else { - void *ctx = php_http_etag_init(TSRMLS_C); + if (body->ssb.sb.st_mtime) { + char *etag; + + spprintf(&etag, 0, "%lx-%lx-%lx", body->ssb.sb.st_ino, body->ssb.sb.st_mtime, body->ssb.sb.st_size); + return etag; + } + } - php_http_message_body_to_callback(body, php_http_etag_update, ctx, 0, 0); - return php_http_etag_finish(ctx TSRMLS_CC); + /* content based */ + if ((etag = php_http_etag_init(PHP_HTTP_G->env.etag_mode TSRMLS_CC))) { + php_http_message_body_to_callback(body, (php_http_pass_callback_t) php_http_etag_update, etag, 0, 0); + return php_http_etag_finish(etag); } + + return NULL; } -PHP_HTTP_API void php_http_message_body_to_string(php_http_message_body_t *body, char **buf, size_t *len, off_t offset, size_t forlen) +void php_http_message_body_to_string(php_http_message_body_t *body, char **buf, size_t *len, off_t offset, size_t forlen) { - TSRMLS_FETCH_FROM_CTX(body->ts); php_stream *s = php_http_message_body_stream(body); + TSRMLS_FETCH_FROM_CTX(body->ts); php_stream_seek(s, offset, SEEK_SET); if (!forlen) { @@ -143,23 +165,24 @@ PHP_HTTP_API void php_http_message_body_to_string(php_http_message_body_t *body, *len = php_stream_copy_to_mem(s, buf, forlen, 0); } -PHP_HTTP_API void php_http_message_body_to_stream(php_http_message_body_t *body, php_stream *dst, off_t offset, size_t forlen) +ZEND_RESULT_CODE php_http_message_body_to_stream(php_http_message_body_t *body, php_stream *dst, off_t offset, size_t forlen) { - TSRMLS_FETCH_FROM_CTX(body->ts); php_stream *s = php_http_message_body_stream(body); + TSRMLS_FETCH_FROM_CTX(body->ts); php_stream_seek(s, offset, SEEK_SET); + if (!forlen) { forlen = -1; } - php_stream_copy_to_stream_ex(s, dst, forlen, NULL); + return php_stream_copy_to_stream_ex(s, dst, forlen, NULL); } -PHP_HTTP_API void php_http_message_body_to_callback(php_http_message_body_t *body, php_http_pass_callback_t cb, void *cb_arg, off_t offset, size_t forlen) +ZEND_RESULT_CODE php_http_message_body_to_callback(php_http_message_body_t *body, php_http_pass_callback_t cb, void *cb_arg, off_t offset, size_t forlen) { - TSRMLS_FETCH_FROM_CTX(body->ts); php_stream *s = php_http_message_body_stream(body); char *buf = emalloc(0x1000); + TSRMLS_FETCH_FROM_CTX(body->ts); php_stream_seek(s, offset, SEEK_SET); @@ -170,7 +193,9 @@ PHP_HTTP_API void php_http_message_body_to_callback(php_http_message_body_t *bod size_t read = php_stream_read(s, buf, MIN(forlen, 0x1000)); if (read) { - cb(cb_arg, buf, read); + if (-1 == cb(cb_arg, buf, read)) { + return FAILURE; + } } if (read < MIN(forlen, sizeof(buf))) { @@ -182,19 +207,34 @@ PHP_HTTP_API void php_http_message_body_to_callback(php_http_message_body_t *bod } } efree(buf); + + return SUCCESS; } -PHP_HTTP_API size_t php_http_message_body_append(php_http_message_body_t *body, const char *buf, size_t len) +size_t php_http_message_body_append(php_http_message_body_t *body, const char *buf, size_t len) { php_stream *s; + size_t written; TSRMLS_FETCH_FROM_CTX(body->ts); - s = php_http_message_body_stream(body); - php_stream_seek(s, 0, SEEK_END); - return php_stream_write(s, buf, len); + if (!(s = php_http_message_body_stream(body))) { + return -1; + } + + if (s->ops->seek) { + php_stream_seek(s, 0, SEEK_END); + } + + written = php_stream_write(s, buf, len); + + if (written != len) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to append %zu bytes to body; wrote %zu", len, written); + } + + return len; } -PHP_HTTP_API size_t php_http_message_body_appendf(php_http_message_body_t *body, const char *fmt, ...) +size_t php_http_message_body_appendf(php_http_message_body_t *body, const char *fmt, ...) { va_list argv; char *print_str; @@ -210,10 +250,9 @@ PHP_HTTP_API size_t php_http_message_body_appendf(php_http_message_body_t *body, return print_len; } -PHP_HTTP_API STATUS php_http_message_body_add(php_http_message_body_t *body, HashTable *fields, HashTable *files) +ZEND_RESULT_CODE php_http_message_body_add_form(php_http_message_body_t *body, HashTable *fields, HashTable *files) { zval tmp; - TSRMLS_FETCH_FROM_CTX(body->ts); if (fields) { INIT_PZVAL_ARRAY(&tmp, fields); @@ -231,17 +270,30 @@ PHP_HTTP_API STATUS php_http_message_body_add(php_http_message_body_t *body, Has return SUCCESS; } +void php_http_message_body_add_part(php_http_message_body_t *body, php_http_message_t *part) +{ + TSRMLS_FETCH_FROM_CTX(body->ts); + + BOUNDARY_OPEN(body); + php_http_message_to_callback(part, (php_http_pass_callback_t) php_http_message_body_append, body); + BOUNDARY_CLOSE(body); +} + -PHP_HTTP_API STATUS php_http_message_body_add_field(php_http_message_body_t *body, const char *name, const char *value_str, size_t value_len) +ZEND_RESULT_CODE php_http_message_body_add_form_field(php_http_message_body_t *body, const char *name, const char *value_str, size_t value_len) { - char *safe_name = php_addslashes(estrdup(name), strlen(name), NULL, 1 TSRMLS_CC); + char *safe_name; + TSRMLS_FETCH_FROM_CTX(body->ts); + + safe_name = php_addslashes(estrdup(name), strlen(name), NULL, 1 TSRMLS_CC); BOUNDARY_OPEN(body); php_http_message_body_appendf( body, - "Content-Disposition: form-data; name=\"%s\"" PHP_HTTP_CRLF - "" PHP_HTTP_CRLF, - safe_name); + "Content-Disposition: form-data; name=\"%s\"" PHP_HTTP_CRLF + "" PHP_HTTP_CRLF, + safe_name + ); php_http_message_body_append(body, value_str, value_len); BOUNDARY_CLOSE(body); @@ -249,44 +301,33 @@ PHP_HTTP_API STATUS php_http_message_body_add_field(php_http_message_body_t *bod return SUCCESS; } -PHP_HTTP_API STATUS php_http_message_body_add_file(php_http_message_body_t *body, const char *name, const char *path, const char *ctype) +ZEND_RESULT_CODE php_http_message_body_add_form_file(php_http_message_body_t *body, const char *name, const char *ctype, const char *path, php_stream *in) { - php_stream *in; - char *path_dup = estrdup(path); + char *safe_name, *path_dup = estrdup(path), *bname; + size_t bname_len; TSRMLS_FETCH_FROM_CTX(body->ts); - if ((in = php_stream_open_wrapper(path_dup, "r", REPORT_ERRORS|USE_PATH|STREAM_MUST_SEEK, NULL))) { - php_stream_statbuf ssb = {{0}}; - - if (SUCCESS == php_stream_stat(in, &ssb) && S_ISREG(ssb.sb.st_mode)) { - char *safe_name = php_addslashes(estrdup(name), strlen(name), NULL, 1 TSRMLS_CC); - - BOUNDARY_OPEN(body); - php_http_message_body_appendf( - body, - "Content-Disposition: attachment; name=\"%s\"; filename=\"%s\"" PHP_HTTP_CRLF - "Content-Type: %s" PHP_HTTP_CRLF - "Content-Length: %zu" PHP_HTTP_CRLF - "" PHP_HTTP_CRLF, - safe_name, basename(path_dup), ctype, ssb.sb.st_size); - php_stream_copy_to_stream_ex(in, php_http_message_body_stream(body), PHP_STREAM_COPY_ALL, NULL); - BOUNDARY_CLOSE(body); - - efree(safe_name); - efree(path_dup); - php_stream_close(in); - return SUCCESS; - } else { - efree(path_dup); - php_stream_close(in); - php_http_error(HE_WARNING, PHP_HTTP_E_MESSAGE_BODY, "Not a valid regular file: %s", path); - return FAILURE; - } - } else { - efree(path_dup); - return FAILURE; - } + safe_name = php_addslashes(estrdup(name), strlen(name), NULL, 1 TSRMLS_CC); + + php_basename(path_dup, strlen(path_dup), NULL, 0, &bname, &bname_len TSRMLS_CC); + + BOUNDARY_OPEN(body); + php_http_message_body_appendf( + body, + "Content-Disposition: form-data; name=\"%s\"; filename=\"%s\"" PHP_HTTP_CRLF + "Content-Transfer-Encoding: binary" PHP_HTTP_CRLF + "Content-Type: %s" PHP_HTTP_CRLF + PHP_HTTP_CRLF, + safe_name, bname, ctype + ); + php_stream_copy_to_stream_ex(in, php_http_message_body_stream(body), PHP_STREAM_COPY_ALL, NULL); + BOUNDARY_CLOSE(body); + efree(safe_name); + efree(path_dup); + efree(bname); + + return SUCCESS; } static inline char *format_key(uint type, char *str, ulong num, const char *prefix) { @@ -301,142 +342,232 @@ static inline char *format_key(uint type, char *str, ulong num, const char *pref } else if (type == HASH_KEY_IS_STRING) { new_key = estrdup(str); } else { - spprintf(&new_key, 0, "%lu", num); + new_key = estrdup(""); } return new_key; } -static STATUS add_recursive_fields(php_http_message_body_t *body, const char *name, zval *value) +static ZEND_RESULT_CODE add_recursive_fields(php_http_message_body_t *body, const char *name, zval *value) { if (Z_TYPE_P(value) == IS_ARRAY || Z_TYPE_P(value) == IS_OBJECT) { zval **val; + HashTable *ht; HashPosition pos; php_http_array_hashkey_t key = php_http_array_hashkey_init(0); + TSRMLS_FETCH_FROM_CTX(body->ts); - if (!HASH_OF(value)->nApplyCount) { - ++HASH_OF(value)->nApplyCount; + ht = HASH_OF(value); + if (!ht->nApplyCount) { + ++ht->nApplyCount; FOREACH_KEYVAL(pos, value, key, val) { char *str = format_key(key.type, key.str, key.num, name); if (SUCCESS != add_recursive_fields(body, str, *val)) { efree(str); - HASH_OF(value)->nApplyCount--; + ht->nApplyCount--; return FAILURE; } efree(str); } - --HASH_OF(value)->nApplyCount; + --ht->nApplyCount; } } else { zval *cpy = php_http_ztyp(IS_STRING, value); - php_http_message_body_add_field(body, name, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)); + php_http_message_body_add_form_field(body, name, Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)); zval_ptr_dtor(&cpy); } return SUCCESS; } -static STATUS add_recursive_files(php_http_message_body_t *body, const char *name, zval *value) +static ZEND_RESULT_CODE add_recursive_files(php_http_message_body_t *body, const char *name, zval *value) { - if (Z_TYPE_P(value) == IS_ARRAY || Z_TYPE_P(value) == IS_OBJECT) { - zval **zfile, **zname, **ztype; + zval **zdata = NULL, **zfile, **zname, **ztype; + HashTable *ht; + TSRMLS_FETCH_FROM_CTX(body->ts); - if ((SUCCESS == zend_hash_find(HASH_OF(value), ZEND_STRS("name"), (void *) &zname)) - && (SUCCESS == zend_hash_find(HASH_OF(value), ZEND_STRS("file"), (void *) &zfile)) - && (SUCCESS == zend_hash_find(HASH_OF(value), ZEND_STRS("type"), (void *) &ztype)) - ) { - zval *zfc = php_http_ztyp(IS_STRING, *zfile), *znc = php_http_ztyp(IS_STRING, *zname), *ztc = php_http_ztyp(IS_STRING, *ztype); - char *str = format_key(HASH_KEY_IS_STRING, Z_STRVAL_P(znc), 0, name); - STATUS ret = php_http_message_body_add_file(body, str, Z_STRVAL_P(zfc), Z_STRVAL_P(ztc)); + if (Z_TYPE_P(value) != IS_ARRAY && Z_TYPE_P(value) != IS_OBJECT) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Expected array or object (name, type, file) for message body file to add"); + return FAILURE; + } - efree(str); - zval_ptr_dtor(&znc); - zval_ptr_dtor(&zfc); - zval_ptr_dtor(&ztc); + ht = HASH_OF(value); - if (ret != SUCCESS) { - return ret; - } - } else { - zval **val; - HashPosition pos; - php_http_array_hashkey_t key = php_http_array_hashkey_init(0); + if ((SUCCESS != zend_hash_find(ht, ZEND_STRS("name"), (void *) &zname)) + || (SUCCESS != zend_hash_find(ht, ZEND_STRS("type"), (void *) &ztype)) + || (SUCCESS != zend_hash_find(ht, ZEND_STRS("file"), (void *) &zfile)) + ) { + zval **val; + HashPosition pos; + php_http_array_hashkey_t key = php_http_array_hashkey_init(0); - if (!HASH_OF(value)->nApplyCount) { - ++HASH_OF(value)->nApplyCount; - FOREACH_KEYVAL(pos, value, key, val) { + if (!ht->nApplyCount) { + ++ht->nApplyCount; + FOREACH_HASH_KEYVAL(pos, ht, key, val) { + if (Z_TYPE_PP(val) == IS_ARRAY || Z_TYPE_PP(val) == IS_OBJECT) { char *str = format_key(key.type, key.str, key.num, name); + if (SUCCESS != add_recursive_files(body, str, *val)) { efree(str); - --HASH_OF(value)->nApplyCount; + --ht->nApplyCount; return FAILURE; } efree(str); } - --HASH_OF(value)->nApplyCount; } + --ht->nApplyCount; } + return SUCCESS; } else { - php_http_error(HE_WARNING, PHP_HTTP_E_MESSAGE_BODY, "Unrecognized array format for message body file to add"); - return FAILURE; - } + php_stream *stream; + zval *zfc = php_http_ztyp(IS_STRING, *zfile); - return SUCCESS; -} + if (SUCCESS == zend_hash_find(ht, ZEND_STRS("data"), (void *) &zdata)) { + if (Z_TYPE_PP(zdata) == IS_RESOURCE) { + php_stream_from_zval_no_verify(stream, zdata); + } else { + zval *tmp = php_http_ztyp(IS_STRING, *zdata); -/* PHP */ + stream = php_stream_memory_open(TEMP_STREAM_READONLY, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp)); + zval_ptr_dtor(&tmp); + } + } else { + stream = php_stream_open_wrapper(Z_STRVAL_P(zfc), "r", REPORT_ERRORS|USE_PATH, NULL); + } -#define PHP_HTTP_BEGIN_ARGS(method, req_args) PHP_HTTP_BEGIN_ARGS_EX(HttpMessageBody, method, 0, req_args) -#define PHP_HTTP_EMPTY_ARGS(method) PHP_HTTP_EMPTY_ARGS_EX(HttpMessageBody, method, 0) -#define PHP_HTTP_MESSAGE_BODY_ME(method, visibility) PHP_ME(HttpMessageBody, method, PHP_HTTP_ARGS(HttpMessageBody, method), visibility) + if (!stream) { + zval_ptr_dtor(&zfc); + return FAILURE; + } else { + zval *znc = php_http_ztyp(IS_STRING, *zname), *ztc = php_http_ztyp(IS_STRING, *ztype); + char *key = format_key(HASH_KEY_IS_STRING, Z_STRVAL_P(znc), 0, name); + ZEND_RESULT_CODE ret = php_http_message_body_add_form_file(body, key, Z_STRVAL_P(ztc), Z_STRVAL_P(zfc), stream); -PHP_HTTP_BEGIN_ARGS(__construct, 0) - PHP_HTTP_ARG_VAL(stream, 0) -PHP_HTTP_END_ARGS; + efree(key); + zval_ptr_dtor(&znc); + zval_ptr_dtor(&ztc); + zval_ptr_dtor(&zfc); + if (!zdata || Z_TYPE_PP(zdata) != IS_RESOURCE) { + php_stream_close(stream); + } + return ret; + } -PHP_HTTP_EMPTY_ARGS(__toString); + } +} -PHP_HTTP_BEGIN_ARGS(toStream, 1) - PHP_HTTP_ARG_VAL(stream, 0) -PHP_HTTP_END_ARGS; +struct splitbody_arg { + php_http_buffer_t buf; + php_http_message_parser_t *parser; + char *boundary_str; + size_t boundary_len; + size_t consumed; +}; -PHP_HTTP_BEGIN_ARGS(toCallback, 1) - PHP_HTTP_ARG_VAL(callback, 0) -PHP_HTTP_END_ARGS; +static size_t splitbody(void *opaque, char *buf, size_t len TSRMLS_DC) +{ + struct splitbody_arg *arg = opaque; + const char *boundary = NULL; + size_t consumed = 0; + int first_boundary; + + do { + first_boundary = !(consumed || arg->consumed); + + if ((boundary = php_http_locate_str(buf, len, arg->boundary_str + first_boundary, arg->boundary_len - first_boundary))) { + size_t real_boundary_len = arg->boundary_len - 1, cut; + const char *real_boundary = boundary + !first_boundary; + int eol_len = 0; + + if (buf + len <= real_boundary + real_boundary_len) { + /* if we just have enough data for the boundary, it's just a byte too less */ + arg->consumed += consumed; + return consumed; + } -PHP_HTTP_BEGIN_ARGS(append, 1) - PHP_HTTP_ARG_VAL(string, 0) -PHP_HTTP_END_ARGS; + if (!first_boundary) { + /* this is not the first boundary, read rest of this message */ + php_http_buffer_append(&arg->buf, buf, real_boundary - buf); + php_http_message_parser_parse(arg->parser, &arg->buf, 0, &arg->parser->message); + } -PHP_HTTP_BEGIN_ARGS(add, 0) - PHP_HTTP_ARG_VAL(fields, 0) - PHP_HTTP_ARG_VAL(files, 0) -PHP_HTTP_END_ARGS; + /* move after the boundary */ + cut = real_boundary - buf + real_boundary_len; + buf += cut; + len -= cut; + consumed += cut; + + if (buf == php_http_locate_bin_eol(buf, len, &eol_len)) { + /* skip CRLF */ + buf += eol_len; + len -= eol_len; + consumed += eol_len; + + if (!first_boundary) { + /* advance messages */ + php_http_message_t *msg; + + msg = php_http_message_init(NULL, 0, NULL TSRMLS_CC); + msg->parent = arg->parser->message; + arg->parser->message = msg; + } + } else { + /* is this the last boundary? */ + if (*buf == '-') { + /* ignore the rest */ + consumed += len; + len = 0; + } else { + /* let this be garbage */ + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Malformed multipart boundary at pos %zu", consumed); + return -1; + } + } + } + } while (boundary && len); + /* let there be room for the next boundary */ + if (len > arg->boundary_len) { + consumed += len - arg->boundary_len; + php_http_buffer_append(&arg->buf, buf, len - arg->boundary_len); + php_http_message_parser_parse(arg->parser, &arg->buf, 0, &arg->parser->message); + } -zend_class_entry *php_http_message_body_class_entry; -zend_function_entry php_http_message_body_method_entry[] = { - PHP_HTTP_MESSAGE_BODY_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) - PHP_HTTP_MESSAGE_BODY_ME(__toString, ZEND_ACC_PUBLIC) - PHP_MALIAS(HttpMessageBody, toString, __toString, args_for_HttpMessageBody___toString, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_BODY_ME(toStream, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_BODY_ME(toCallback, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_BODY_ME(append, ZEND_ACC_PUBLIC) - PHP_HTTP_MESSAGE_BODY_ME(add, ZEND_ACC_PUBLIC) - EMPTY_FUNCTION_ENTRY -}; -static zend_object_handlers php_http_message_body_object_handlers; + arg->consumed += consumed; + return consumed; +} -PHP_MINIT_FUNCTION(http_message_body) +php_http_message_t *php_http_message_body_split(php_http_message_body_t *body, const char *boundary) { - PHP_HTTP_REGISTER_CLASS(http\\message, Body, http_message_body, php_http_object_class_entry, 0); - php_http_message_body_class_entry->create_object = php_http_message_body_object_new; - memcpy(&php_http_message_body_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); - php_http_message_body_object_handlers.clone_obj = php_http_message_body_object_clone; + php_stream *s = php_http_message_body_stream(body); + php_http_buffer_t *tmp = NULL; + php_http_message_t *msg = NULL; + struct splitbody_arg arg; + TSRMLS_FETCH_FROM_CTX(body->ts); - return SUCCESS; + php_http_buffer_init(&arg.buf); + arg.parser = php_http_message_parser_init(NULL TSRMLS_CC); + arg.boundary_len = spprintf(&arg.boundary_str, 0, "\n--%s", boundary); + arg.consumed = 0; + + php_stream_rewind(s); + while (!php_stream_eof(s)) { + php_http_buffer_passthru(&tmp, 0x1000, (php_http_buffer_pass_func_t) _php_stream_read, s, splitbody, &arg TSRMLS_CC); + } + + msg = arg.parser->message; + arg.parser->message = NULL; + + php_http_buffer_free(&tmp); + php_http_message_parser_free(&arg.parser); + php_http_buffer_dtor(&arg.buf); + PTR_FREE(arg.boundary_str); + + return msg; } +static zend_object_handlers php_http_message_body_object_handlers; + zend_object_value php_http_message_body_object_new(zend_class_entry *ce TSRMLS_DC) { return php_http_message_body_object_new_ex(ce, NULL, NULL TSRMLS_CC); @@ -444,7 +575,6 @@ zend_object_value php_http_message_body_object_new(zend_class_entry *ce TSRMLS_D zend_object_value php_http_message_body_object_new_ex(zend_class_entry *ce, php_http_message_body_t *body, php_http_message_body_object_t **ptr TSRMLS_DC) { - zend_object_value ov; php_http_message_body_object_t *o; o = ecalloc(1, sizeof(php_http_message_body_object_t)); @@ -459,10 +589,10 @@ zend_object_value php_http_message_body_object_new_ex(zend_class_entry *ce, php_ o->body = body; } - ov.handle = zend_objects_store_put((zend_object *) o, NULL, php_http_message_body_object_free, NULL TSRMLS_CC); - ov.handlers = &php_http_message_body_object_handlers; + o->zv.handle = zend_objects_store_put((zend_object *) o, NULL, php_http_message_body_object_free, NULL TSRMLS_CC); + o->zv.handlers = &php_http_message_body_object_handlers; - return ov; + return o->zv; } zend_object_value php_http_message_body_object_clone(zval *object TSRMLS_DC) @@ -470,8 +600,9 @@ zend_object_value php_http_message_body_object_clone(zval *object TSRMLS_DC) zend_object_value new_ov; php_http_message_body_object_t *new_obj = NULL; php_http_message_body_object_t *old_obj = zend_object_store_get_object(object TSRMLS_CC); + php_http_message_body_t *body = php_http_message_body_copy(old_obj->body, NULL); - new_ov = php_http_message_body_object_new_ex(old_obj->zo.ce, php_http_message_body_copy(old_obj->body, NULL, 1), &new_obj); + new_ov = php_http_message_body_object_new_ex(old_obj->zo.ce, body, &new_obj TSRMLS_CC); zend_objects_clone_members(&new_obj->zo, new_ov, &old_obj->zo, Z_OBJ_HANDLE_P(object) TSRMLS_CC); return new_ov; @@ -482,36 +613,40 @@ void php_http_message_body_object_free(void *object TSRMLS_DC) php_http_message_body_object_t *obj = object; php_http_message_body_free(&obj->body); - zend_object_std_dtor((zend_object *) obj TSRMLS_CC); efree(obj); } +#define PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj) \ + do { \ + if (!obj->body) { \ + obj->body = php_http_message_body_init(NULL, NULL TSRMLS_CC); \ + } \ + } while(0) + +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody___construct, 0, 0, 0) + ZEND_ARG_INFO(0, stream) +ZEND_END_ARG_INFO(); PHP_METHOD(HttpMessageBody, __construct) { php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); zval *zstream = NULL; php_stream *stream; - with_error_handling(EH_THROW, php_http_exception_class_entry) { - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r!", &zstream)) { - if (zstream) { - php_stream_from_zval(stream, &zstream); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|r!", &zstream), invalid_arg, return); - if (stream) { - if (obj->body) { - php_http_message_body_dtor(obj->body); - } - obj->body = php_http_message_body_init(obj->body, stream TSRMLS_CC); - } - } - if (!obj->body) { - obj->body = php_http_message_body_init(NULL, NULL TSRMLS_CC); - } + if (zstream) { + php_http_expect(php_stream_from_zval_no_verify(stream, &zstream), unexpected_val, return); + + if (obj->body) { + php_http_message_body_free(&obj->body); } - } end_error_handling(); + obj->body = php_http_message_body_init(NULL, stream TSRMLS_CC); + } } +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody___toString, 0, 0, 0) +ZEND_END_ARG_INFO(); PHP_METHOD(HttpMessageBody, __toString) { if (SUCCESS == zend_parse_parameters_none()) { @@ -519,6 +654,8 @@ PHP_METHOD(HttpMessageBody, __toString) char *str; size_t len; + PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj); + php_http_message_body_to_string(obj->body, &str, &len, 0, 0); if (str) { RETURN_STRINGL(str, len, 0); @@ -527,6 +664,27 @@ PHP_METHOD(HttpMessageBody, __toString) RETURN_EMPTY_STRING(); } +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_unserialize, 0, 0, 1) + ZEND_ARG_INFO(0, serialized) +ZEND_END_ARG_INFO(); +PHP_METHOD(HttpMessageBody, unserialize) +{ + char *us_str; + int us_len; + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &us_str, &us_len)) { + php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_stream *s = php_stream_memory_open(0, us_str, us_len); + + obj->body = php_http_message_body_init(NULL, s TSRMLS_CC); + } +} + +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_toStream, 0, 0, 1) + ZEND_ARG_INFO(0, stream) + ZEND_ARG_INFO(0, offset) + ZEND_ARG_INFO(0, maxlen) +ZEND_END_ARG_INFO(); PHP_METHOD(HttpMessageBody, toStream) { zval *zstream; @@ -536,74 +694,236 @@ PHP_METHOD(HttpMessageBody, toStream) php_stream *stream; php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj); + php_stream_from_zval(stream, &zstream); php_http_message_body_to_stream(obj->body, stream, offset, forlen); - RETURN_TRUE; - } - RETURN_FALSE; -} - -struct fcd { - zval *fcz; - zend_fcall_info *fci; - zend_fcall_info_cache *fcc; -}; - -static size_t pass(void *cb_arg, const char *str, size_t len TSRMLS_DC) -{ - struct fcd *fcd = cb_arg; - zval *zdata; - - MAKE_STD_ZVAL(zdata); - ZVAL_STRINGL(zdata, str, len, 1); - if (SUCCESS == zend_fcall_info_argn(fcd->fci TSRMLS_CC, 2, fcd->fcz, zdata)) { - zend_fcall_info_call(fcd->fci, fcd->fcc, NULL, NULL TSRMLS_CC); - zend_fcall_info_args_clear(fcd->fci, 0); + RETURN_ZVAL(getThis(), 1, 0); } - zval_ptr_dtor(&zdata); - return len; } +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_toCallback, 0, 0, 1) + ZEND_ARG_INFO(0, callback) + ZEND_ARG_INFO(0, offset) + ZEND_ARG_INFO(0, maxlen) +ZEND_END_ARG_INFO(); PHP_METHOD(HttpMessageBody, toCallback) { - struct fcd fcd; + php_http_pass_fcall_arg_t fcd; long offset = 0, forlen = 0; if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "f|ll", &fcd.fci, &fcd.fcc, &offset, &forlen)) { php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj); + fcd.fcz = getThis(); Z_ADDREF_P(fcd.fcz); - php_http_message_body_to_callback(obj->body, pass, &fcd, offset, forlen); + TSRMLS_SET_CTX(fcd.ts); + + php_http_message_body_to_callback(obj->body, php_http_pass_fcall_callback, &fcd, offset, forlen); + zend_fcall_info_args_clear(&fcd.fci, 1); + zval_ptr_dtor(&fcd.fcz); - RETURN_TRUE; + RETURN_ZVAL(getThis(), 1, 0); + } +} + +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_getResource, 0, 0, 0) +ZEND_END_ARG_INFO(); +PHP_METHOD(HttpMessageBody, getResource) +{ + if (SUCCESS == zend_parse_parameters_none()) { + php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj); + + zend_list_addref(obj->body->stream_id); + RETVAL_RESOURCE(obj->body->stream_id); } - RETURN_FALSE; } +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_getBoundary, 0, 0, 0) +ZEND_END_ARG_INFO(); +PHP_METHOD(HttpMessageBody, getBoundary) +{ + if (SUCCESS == zend_parse_parameters_none()) { + php_http_message_body_object_t * obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj); + + if (obj->body->boundary) { + RETURN_STRING(obj->body->boundary, 1); + } + } +} + +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_append, 0, 0, 1) + ZEND_ARG_INFO(0, string) +ZEND_END_ARG_INFO(); PHP_METHOD(HttpMessageBody, append) { char *str; int len; + php_http_message_body_object_t *obj; - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &len)) { - php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &len), invalid_arg, return); - RETURN_LONG(php_http_message_body_append(obj->body, str, len)); - } - RETURN_FALSE; + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj); + + php_http_expect(len == php_http_message_body_append(obj->body, str, len), runtime, return); + + RETURN_ZVAL(getThis(), 1, 0); } -PHP_METHOD(HttpMessageBody, add) +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_addForm, 0, 0, 0) + ZEND_ARG_ARRAY_INFO(0, fields, 1) + ZEND_ARG_ARRAY_INFO(0, files, 1) +ZEND_END_ARG_INFO(); +PHP_METHOD(HttpMessageBody, addForm) { HashTable *fields = NULL, *files = NULL; + php_http_message_body_object_t *obj; + + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|h!h!", &fields, &files), invalid_arg, return); + + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + + PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj); + + php_http_expect(SUCCESS == php_http_message_body_add_form(obj->body, fields, files), runtime, return); - if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|hh", &fields, &files)) { + RETURN_ZVAL(getThis(), 1, 0); +} + +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_addPart, 0, 0, 1) + ZEND_ARG_OBJ_INFO(0, message, http\\Message, 0) +ZEND_END_ARG_INFO(); +PHP_METHOD(HttpMessageBody, addPart) +{ + zval *zobj; + php_http_message_body_object_t *obj; + php_http_message_object_t *mobj; + zend_error_handling zeh; + + php_http_expect(SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &zobj, php_http_message_class_entry), invalid_arg, return); + + obj = zend_object_store_get_object(getThis() TSRMLS_CC); + mobj = zend_object_store_get_object(zobj TSRMLS_CC); + + PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj); + + zend_replace_error_handling(EH_THROW, php_http_exception_runtime_class_entry, &zeh TSRMLS_CC); + php_http_message_body_add_part(obj->body, mobj->message); + zend_restore_error_handling(&zeh TSRMLS_CC); + + if (!EG(exception)) { + RETURN_ZVAL(getThis(), 1, 0); + } +} + +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_etag, 0, 0, 0) +ZEND_END_ARG_INFO(); +PHP_METHOD(HttpMessageBody, etag) +{ + if (SUCCESS == zend_parse_parameters_none()) { php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + char *etag; - RETURN_SUCCESS(php_http_message_body_add(obj->body, fields, files)); + PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj); + + if ((etag = php_http_message_body_etag(obj->body))) { + RETURN_STRING(etag, 0); + } else { + RETURN_FALSE; + } + } +} + +ZEND_BEGIN_ARG_INFO_EX(ai_HttpMessageBody_stat, 0, 0, 0) + ZEND_ARG_INFO(0, field) +ZEND_END_ARG_INFO(); +PHP_METHOD(HttpMessageBody, stat) +{ + char *field_str = NULL; + int field_len = 0; + + if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &field_str, &field_len)) { + php_http_message_body_object_t *obj = zend_object_store_get_object(getThis() TSRMLS_CC); + const php_stream_statbuf *sb; + + PHP_HTTP_MESSAGE_BODY_OBJECT_INIT(obj); + + if ((sb = php_http_message_body_stat(obj->body))) { + if (field_str && field_len) { + switch (*field_str) { + case 's': + case 'S': + RETURN_LONG(sb->sb.st_size); + break; + case 'a': + case 'A': + RETURN_LONG(sb->sb.st_atime); + break; + case 'm': + case 'M': + RETURN_LONG(sb->sb.st_mtime); + break; + case 'c': + case 'C': + RETURN_LONG(sb->sb.st_ctime); + break; + default: + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown stat field: '%s' (should be one of [s]ize, [a]time, [m]time or [c]time)", field_str); + break; + } + } else { + object_init(return_value); + add_property_long_ex(return_value, ZEND_STRS("size"), sb->sb.st_size TSRMLS_CC); + add_property_long_ex(return_value, ZEND_STRS("atime"), sb->sb.st_atime TSRMLS_CC); + add_property_long_ex(return_value, ZEND_STRS("mtime"), sb->sb.st_mtime TSRMLS_CC); + add_property_long_ex(return_value, ZEND_STRS("ctime"), sb->sb.st_ctime TSRMLS_CC); + } + } } - RETURN_FALSE; } + +static zend_function_entry php_http_message_body_methods[] = { + PHP_ME(HttpMessageBody, __construct, ai_HttpMessageBody___construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) + PHP_ME(HttpMessageBody, __toString, ai_HttpMessageBody___toString, ZEND_ACC_PUBLIC) + PHP_MALIAS(HttpMessageBody, toString, __toString, ai_HttpMessageBody___toString, ZEND_ACC_PUBLIC) + PHP_MALIAS(HttpMessageBody, serialize, __toString, ai_HttpMessageBody___toString, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessageBody, unserialize, ai_HttpMessageBody_unserialize, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessageBody, toStream, ai_HttpMessageBody_toStream, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessageBody, toCallback, ai_HttpMessageBody_toCallback, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessageBody, getResource, ai_HttpMessageBody_getResource, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessageBody, getBoundary, ai_HttpMessageBody_getBoundary, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessageBody, append, ai_HttpMessageBody_append, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessageBody, addForm, ai_HttpMessageBody_addForm, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessageBody, addPart, ai_HttpMessageBody_addPart, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessageBody, etag, ai_HttpMessageBody_etag, ZEND_ACC_PUBLIC) + PHP_ME(HttpMessageBody, stat, ai_HttpMessageBody_stat, ZEND_ACC_PUBLIC) + EMPTY_FUNCTION_ENTRY +}; + +zend_class_entry *php_http_message_body_class_entry; + +PHP_MINIT_FUNCTION(http_message_body) +{ + zend_class_entry ce = {0}; + + INIT_NS_CLASS_ENTRY(ce, "http\\Message", "Body", php_http_message_body_methods); + php_http_message_body_class_entry = zend_register_internal_class(&ce TSRMLS_CC); + php_http_message_body_class_entry->create_object = php_http_message_body_object_new; + memcpy(&php_http_message_body_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); + php_http_message_body_object_handlers.clone_obj = php_http_message_body_object_clone; + zend_class_implements(php_http_message_body_class_entry TSRMLS_CC, 1, zend_ce_serializable); + + return SUCCESS; +} + /* * Local variables: * tab-width: 4