X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_api.c;h=999826dfa7af7a6c89bc8bf72e27519ef1d0063c;hp=654bf884670436f9d37ba75c6e2e0eb76422634c;hb=eccb12ef12282dbe2ffc47b61d5e62e02fcb071c;hpb=0d925a2820b9d75b8e32c451fd400863e51e22fe diff --git a/http_api.c b/http_api.c index 654bf88..999826d 100644 --- a/http_api.c +++ b/http_api.c @@ -22,6 +22,7 @@ #include "SAPI.h" #include "ext/standard/url.h" +#include "ext/standard/head.h" #include "php_http.h" #include "php_http_std_defs.h" @@ -36,6 +37,13 @@ #include +#ifdef HTTP_HAVE_MAGIC +# if defined(PHP_WIN32) && !defined(USE_MAGIC_DLL) && !defined(USE_MAGIC_STATIC) +# define USE_MAGIC_STATIC +# endif +# include +#endif + ZEND_EXTERN_MODULE_GLOBALS(http); /* char *pretty_key(char *, size_t, zend_bool, zend_bool) */ @@ -78,7 +86,7 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator, int vallen = 0, keylen = 0, done = 0; zval array; - Z_ARRVAL(array) = items; + INIT_ZARR(array, items); if (!(val = strchr(list, '='))) { return FAILURE; @@ -157,75 +165,80 @@ STATUS _http_parse_key_list(const char *list, HashTable *items, char separator, /* }}} */ /* {{{ void http_error(long, long, char*) */ -void _http_error_ex(long type, long code, const char *format, ...) +void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...) { va_list args; - TSRMLS_FETCH(); - + va_start(args, format); - if (type == E_THROW) { #ifdef ZEND_ENGINE_2 + if ((type == E_THROW) || (PG(error_handling) == EH_THROW)) { char *message; + vspprintf(&message, 0, format, args); zend_throw_exception(http_exception_get_for_code(code), message, code TSRMLS_CC); -#else - type = E_WARNING; + } else #endif - } - if (type != E_THROW) { - php_verror(NULL, "", type, format, args TSRMLS_CC); - } + php_verror(NULL, "", type, format, args TSRMLS_CC); va_end(args); } /* }}} */ -/* {{{ STATUS http_exit(int, char*, char*, zend_bool) */ -STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header TSRMLS_DC) +/* {{{ void http_log(char *, char *, char *) */ +void _http_log_ex(char *file, const char *ident, const char *message TSRMLS_DC) { + time_t now; + struct tm nowtm; char datetime[128]; - if (SUCCESS != http_send_status_header(status, send_header ? header : NULL)) { - http_error_ex(HE_WARNING, HTTP_E_HEADER, "Failed to exit with status/header: %d - %s", status, header ? header : ""); - STR_FREE(header); - STR_FREE(body); - return FAILURE; - } - if (body) { - PHPWRITE(body, strlen(body)); - } - { - time_t now; - struct tm nowtm; - - time(&now); - strftime(datetime, sizeof(datetime), "%Y-%m-%d %H:%M:%S", php_localtime_r(&now, &nowtm)); - } + time(&now); + strftime(datetime, sizeof(datetime), "%Y-%m-%d %H:%M:%S", php_localtime_r(&now, &nowtm)); -#define HTTP_LOG_WRITE(for, type, header) \ - HTTP_LOG_WRITE_EX(for, type, header); \ - HTTP_LOG_WRITE_EX(composite, type, header); - -#define HTTP_LOG_WRITE_EX(for, type, header) \ - if (HTTP_G(log).##for && strlen(HTTP_G(log).##for)) { \ - php_stream *log = php_stream_open_wrapper(HTTP_G(log).##for, "ab", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL); \ +#define HTTP_LOG_WRITE(file, type, msg) \ + if (file && strlen(file)) { \ + php_stream *log = php_stream_open_wrapper(file, "ab", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL); \ \ if (log) { \ - php_stream_printf(log TSRMLS_CC, "%s [%12s] %32s <%s>%s", datetime, type, header, SG(request_info).request_uri, PHP_EOL); \ + php_stream_printf(log TSRMLS_CC, "%s\t[%s]\t%s\t<%s>%s", datetime, type, msg, SG(request_info).request_uri, PHP_EOL); \ php_stream_close(log); \ } \ \ } + + HTTP_LOG_WRITE(file, ident, message); + HTTP_LOG_WRITE(HTTP_G(log).composite, ident, message); +} +/* }}} */ + +/* {{{ STATUS http_exit(int, char*, char*) */ +STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header TSRMLS_DC) +{ + if (status || send_header) { + if (SUCCESS != http_send_status_header(status, send_header ? header : NULL)) { + http_error_ex(HE_WARNING, HTTP_E_HEADER, "Failed to exit with status/header: %d - %s", status, header ? header : ""); + STR_FREE(header); + STR_FREE(body); + return FAILURE; + } + } + + if (php_header(TSRMLS_C) && body) { + PHPWRITE(body, strlen(body)); + } + switch (status) { - case 301: HTTP_LOG_WRITE(redirect, "301-REDIRECT", header); break; - case 302: HTTP_LOG_WRITE(redirect, "302-REDIRECT", header); break; - case 304: HTTP_LOG_WRITE(cache, "304-CACHE", header); break; - case 401: HTTP_LOG_WRITE(auth, "401-AUTH", header); break; - case 403: HTTP_LOG_WRITE(auth, "403-AUTH", header); break; - case 405: HTTP_LOG_WRITE(allowed_methods, "405-ALLOWED", header); break; + case 301: http_log(HTTP_G(log).redirect, "301-REDIRECT", header); break; + case 302: http_log(HTTP_G(log).redirect, "302-REDIRECT", header); break; + case 303: http_log(HTTP_G(log).redirect, "303-REDIRECT", header); break; + case 307: http_log(HTTP_G(log).redirect, "307-REDIRECT", header); break; + case 304: http_log(HTTP_G(log).cache, "304-CACHE", header); break; + case 405: http_log(HTTP_G(log).allowed_methods, "405-ALLOWED", header); break; + default: http_log(NULL, header, body); break; } + STR_FREE(header); STR_FREE(body); + zend_bailout(); /* fake */ return SUCCESS; @@ -281,29 +294,32 @@ PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_ /* }}} */ /* {{{ 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) +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; char *d_ptr; - + long rest; + *decoded_len = 0; *decoded = ecalloc(1, encoded_len); d_ptr = *decoded; e_ptr = encoded; - while (((e_ptr - encoded) - encoded_len) > 0) { - int no_crlf = 0; + while ((rest = encoded + encoded_len - e_ptr) > 0) { + long chunk_len = 0; + int EOL_len = 0, eol_mismatch = 0; char *n_ptr; - size_t chunk_len = 0; 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 + * - we got a negative chunk size + * - chunk size is greater then remaining size + * - chunk size is not followed by (CR)LF|NUL */ - if ((n_ptr == e_ptr) || (*n_ptr && (no_crlf = strncmp(n_ptr, HTTP_CRLF, lenof(HTTP_CRLF))))) { + if ( (n_ptr == e_ptr) || (chunk_len < 0) || (chunk_len > rest) || + (*n_ptr && (eol_mismatch = (n_ptr != http_locate_eol(e_ptr, &EOL_len))))) { /* don't fail on apperently not encoded data */ if (e_ptr == encoded) { memcpy(*decoded, encoded, encoded_len); @@ -311,14 +327,17 @@ PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encode return encoded + encoded_len; } else { efree(*decoded); - if (no_crlf) { - http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid character (expected 0x0D 0x0A; got: 0x%x 0x%x)", *n_ptr, *(n_ptr + 1)); + if (eol_mismatch) { + if (EOL_len == 2) { + http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid character (expected 0x0D 0x0A; got: 0x%X 0x%X)", *n_ptr, *(n_ptr + 1)); + } else { + http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid character (expected 0x0A; got: 0x%X)", *n_ptr); + } } else { - char *error = estrndup(n_ptr, strcspn(n_ptr, "\r\n \0")); + char *error = estrndup(n_ptr, strcspn(n_ptr, "\r\n ")); http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Invalid chunk size: '%s' at pos %d", error, n_ptr - encoded); efree(error); } - return NULL; } } else { @@ -330,9 +349,9 @@ PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encode break; } - memcpy(d_ptr, e_ptr += 2, chunk_len); + memcpy(d_ptr, e_ptr += EOL_len, chunk_len); d_ptr += chunk_len; - e_ptr += chunk_len + 2; + e_ptr += chunk_len + EOL_len; *decoded_len += chunk_len; } @@ -340,10 +359,63 @@ PHP_HTTP_API const char *_http_chunked_decode(const char *encoded, size_t encode } /* }}} */ -/* {{{ STATUS http_locate_body(char *, size_t) */ -PHP_HTTP_API -/* }}} */ +/* {{{ char *http_guess_content_type(char *magic_file, long magic_mode, void *data, size_t size, http_send_mode mode) */ +PHP_HTTP_API char *_http_guess_content_type(const char *magicfile, long magicmode, void *data_ptr, size_t data_len, http_send_mode data_mode TSRMLS_DC) +{ + char *ct = NULL; +#ifdef HTTP_HAVE_MAGIC + /* magic_load() fails if MAGIC_MIME is set because it + cowardly adds .mime to the file name */ + struct magic_set *magic = magic_open(magicmode &~ MAGIC_MIME); + + if (!magic) { + http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid magic mode: %ld", magicmode); + } else if (-1 == magic_load(magic, magicfile)) { + http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Failed to load magic database '%s' (%s)", magicfile, magic_error(magic)); + } else { + const char *ctype = NULL; + + magic_setflags(magic, magicmode); + + switch (data_mode) + { + case SEND_RSRC: + { + char *buffer; + size_t b_len; + + b_len = php_stream_copy_to_mem(data_ptr, &buffer, 65536, 0); + ctype = magic_buffer(magic, buffer, b_len); + efree(buffer); + } + break; + + case SEND_DATA: + ctype = magic_buffer(magic, data_ptr, data_len); + break; + + default: + ctype = magic_file(magic, data_ptr); + break; + } + + if (ctype) { + ct = estrdup(ctype); + } else { + http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Failed to guess Content-Type: %s", magic_error(magic)); + } + } + if (magic) { + magic_close(magic); + } +#else + http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot guess Content-Type; libmagic not available"); +#endif + + return ct; +} +/* }}} */ /* * Local variables: * tab-width: 4