X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=48e3c3151b4f6a9b5d130f2b0c3238e92f29de3e;hp=5a0dd3728a8a4f655bbb609d89b0aca73b071935;hb=d07df3421e591d06d0bc000fabf49d6987a8bcd5;hpb=ae1297f5908f5683e7384395e5ae0e5a295be576 diff --git a/http_api.c b/http_api.c index 5a0dd37..48e3c31 100644 --- a/http_api.c +++ b/http_api.c @@ -22,6 +22,7 @@ #include #include "php.h" +#include "ext/standard/url.h" #include "php_http.h" #include "php_http_std_defs.h" @@ -30,6 +31,7 @@ #include "php_http_send_api.h" #ifdef ZEND_ENGINE_2 +# include "zend_exceptions.h" # include "php_http_exception_object.h" #endif @@ -59,6 +61,99 @@ char *_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool x } /* }}} */ +/* {{{ */ +void _http_key_list_default_decoder(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC) +{ + *decoded = estrndup(encoded, encoded_len); + *decoded_len = (size_t) php_url_decode(*decoded, encoded_len); +} +/* }}} */ + +/* {{{ */ +STATUS _http_parse_key_list(const char *list, HashTable *items, char separator, http_key_list_decode_t decode, zend_bool first_entry_is_name_value_pair TSRMLS_DC) +{ + const char *key = list, *val = NULL; + int vallen = 0, keylen = 0, done = 0; + zval array; + + Z_ARRVAL(array) = items; + + if (!(val = strchr(list, '='))) { + return FAILURE; + } + +#define HTTP_KEYLIST_VAL(array, k, str, len) \ + { \ + char *decoded; \ + size_t decoded_len; \ + if (decode) { \ + decode(str, len, &decoded, &decoded_len TSRMLS_CC); \ + } else { \ + decoded = estrdup(str); \ + decoded_len = len; \ + } \ + add_assoc_stringl(array, k, decoded, decoded_len, 0); \ + } +#define HTTP_KEYLIST_FIXKEY() \ + { \ + while (isspace(*key)) ++key; \ + keylen = val - key; \ + while (isspace(key[keylen - 1])) --keylen; \ + } +#define HTTP_KEYLIST_FIXVAL() \ + { \ + ++val; \ + while (isspace(*val)) ++val; \ + vallen = key - val; \ + while (isspace(val[vallen - 1])) --vallen; \ + } + + HTTP_KEYLIST_FIXKEY(); + + if (first_entry_is_name_value_pair) { + HTTP_KEYLIST_VAL(&array, "name", key, keylen); + + /* just one name=value */ + if (!(key = strchr(val, separator))) { + key = val + strlen(val); + HTTP_KEYLIST_FIXVAL(); + HTTP_KEYLIST_VAL(&array, "value", val, vallen); + goto list_done; + } + /* additional info appended */ + else { + HTTP_KEYLIST_FIXVAL(); + HTTP_KEYLIST_VAL(&array, "value", val, vallen); + } + } + + do { + char *keydup = NULL; + + if (!(val = strchr(key, '='))) { + break; + } + + /* start at 0 if first_entry_is_name_value_pair==0 */ + if (zend_hash_num_elements(items)) { + ++key; + } + + HTTP_KEYLIST_FIXKEY(); + keydup = estrndup(key, keylen); + if (!(key = strchr(val, separator))) { + done = 1; + key = val + strlen(val); + } + HTTP_KEYLIST_FIXVAL(); + HTTP_KEYLIST_VAL(&array, keydup, val, vallen); + efree(keydup); + } while (!done); + +list_done: + return SUCCESS; +} + /* {{{ void http_error(long, long, char*) */ void _http_error_ex(long type, long code, const char *format, ...) { @@ -70,7 +165,7 @@ void _http_error_ex(long type, long code, const char *format, ...) #ifdef ZEND_ENGINE_2 char *message; vspprintf(&message, 0, format, args); - zend_throw_exception(http_exception_get_default(), message, code TSRMLS_CC); + zend_throw_exception(http_exception_get_for_code(code), message, code TSRMLS_CC); #else type = E_WARNING; #endif @@ -101,6 +196,20 @@ STATUS _http_exit_ex(int status, char *header, zend_bool free_header TSRMLS_DC) } /* }}} */ +/* {{{ STATUS http_check_method(char *) */ +STATUS _http_check_method_ex(const char *method, const char *methods) +{ + const char *found; + + if ( (found = strstr(methods, method)) && + (found == method || !isalpha(found[-1])) && + (!isalpha(found[strlen(method) + 1]))) { + return SUCCESS; + } + return FAILURE; +} +/* }}} */ + /* {{{ zval *http_get_server_var_ex(char *, size_t) */ PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_size, zend_bool check TSRMLS_DC) { @@ -117,8 +226,8 @@ PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_size, zen /* }}} */ -/* {{{ STATUS http_chunked_decode(char *, size_t, char **, size_t *) */ -PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded, size_t encoded_len, +/* {{{ char *http_chunked_decode(char *, size_t, char **, size_t *) */ +PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC) { const char *e_ptr; @@ -130,66 +239,55 @@ PHP_HTTP_API STATUS _http_chunked_decode(const char *encoded, size_t encoded_len e_ptr = encoded; while (((e_ptr - encoded) - encoded_len) > 0) { - char hex_len[9] = {0}; + int no_crlf = 0; + char *n_ptr; size_t chunk_len = 0; - int i = 0; - /* read in chunk size */ - while (isxdigit(*e_ptr)) { - if (i == 9) { - http_error_ex(E_WARNING, HTTP_E_PARSE, "Chunk size is too long: 0x%s...", hex_len); + chunk_len = strtol(e_ptr, &n_ptr, 16); + + /* check if: + * - we could not read in chunk size + * - chunk size is not followed by HTTP_CRLF|NUL + */ + if ((n_ptr == e_ptr) || (*n_ptr && (no_crlf = strncmp(n_ptr, HTTP_CRLF, lenof(HTTP_CRLF))))) { + /* don't fail on apperently not encoded data */ + if (e_ptr == encoded) { + memcpy(*decoded, encoded, encoded_len); + *decoded_len = encoded_len; + return encoded + encoded_len; + } else { efree(*decoded); - return FAILURE; + if (no_crlf) { + http_error_ex(E_WARNING, HTTP_E_PARSE, "Invalid character (expected 0x0D 0x0A; got: 0x%x 0x%x)", *n_ptr, *(n_ptr + 1)); + } else { + char *error = estrndup(n_ptr, strcspn(n_ptr, "\r\n \0")); + http_error_ex(E_WARNING, HTTP_E_PARSE, "Invalid chunk size: '%s' at pos %d", error, n_ptr - encoded); + efree(error); + } + + return NULL; } - hex_len[i++] = *e_ptr++; + } else { + e_ptr = n_ptr; } /* reached the end */ - if (!strcmp(hex_len, "0")) { + if (!chunk_len) { break; } - /* new line */ - if (strncmp(e_ptr, HTTP_CRLF, 2)) { - http_error_ex(E_WARNING, HTTP_E_PARSE, "Invalid character (expected 0x0D 0x0A; got: %x %x)", *e_ptr, *(e_ptr + 1)); - efree(*decoded); - return FAILURE; - } - - /* hex to long */ - { - char *error = NULL; - chunk_len = strtol(hex_len, &error, 16); - if (error == hex_len) { - http_error_ex(E_WARNING, HTTP_E_PARSE, "Invalid chunk size string: '%s'", hex_len); - efree(*decoded); - return FAILURE; - } - } - memcpy(d_ptr, e_ptr += 2, chunk_len); d_ptr += chunk_len; e_ptr += chunk_len + 2; *decoded_len += chunk_len; } - return SUCCESS; -} -/* }}} */ - -/* {{{ STATUS http_split_response(zval *, zval *, zval *) */ -PHP_HTTP_API STATUS _http_split_response(zval *response, zval *headers, zval *body TSRMLS_DC) -{ - char *b = NULL; - size_t l = 0; - STATUS status = http_split_response_ex(Z_STRVAL_P(response), Z_STRLEN_P(response), Z_ARRVAL_P(headers), &b, &l); - ZVAL_STRINGL(body, b, l, 0); - return status; + return e_ptr; } /* }}} */ /* {{{ STATUS http_split_response(char *, size_t, HashTable *, char **, size_t *) */ -PHP_HTTP_API STATUS _http_split_response_ex(char *response, size_t response_len, +PHP_HTTP_API STATUS _http_split_response(char *response, size_t response_len, HashTable *headers, char **body, size_t *body_len TSRMLS_DC) { char *header = response, *real_body = NULL; @@ -209,7 +307,7 @@ PHP_HTTP_API STATUS _http_split_response_ex(char *response, size_t response_len, memcpy(*body, real_body, *body_len); } - return http_parse_headers_ex(header, real_body ? response_len - *body_len : response_len, headers, 1); + return http_parse_headers_ex(header, headers, 1); } /* }}} */