github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-08-14 13:56:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Changes JSON parser to not accept parcial contents

Browse Source 
Also cleanup installer file.
This commit is contained in:
Felipe Zimmerle 2014-03-25 05:22:00 -07:00
parent 966e7e1ff1
commit ec61749a68
2 changed files with 437 additions and 614 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apache2/msc_json.c
View File

@ -254,7 +254,7 @@ int json_init(modsec_rec *msr, char **error_msg) {
* yajl initialization * yajl initialization
* *
* yajl_parser_config definition: * yajl_parser_config definition:
* http://lloyd.github.com/yajl/yajl-1.0.12/structyajl__parser__config.html * http://lloyd.github.io/yajl/yajl-2.0.1/yajl__parse_8h.html#aec816c5518264d2ac41c05469a0f986c
* *
* TODO: make UTF8 validation optional, as it depends on Content-Encoding * TODO: make UTF8 validation optional, as it depends on Content-Encoding
*/ */
@ -262,6 +262,7 @@ int json_init(modsec_rec *msr, char **error_msg) {
msr_log(msr, 9, "yajl JSON parsing callback initialization"); msr_log(msr, 9, "yajl JSON parsing callback initialization");
} }
msr->json->handle = yajl_alloc(&callbacks, NULL, msr); msr->json->handle = yajl_alloc(&callbacks, NULL, msr);
yajl_config(msr->json->handle, yajl_allow_partial_values, 0);
return 1; return 1;
} }
@ -278,6 +279,7 @@ int json_process_chunk(modsec_rec *msr, const char *buf, unsigned int size, char
if (msr->json->status != yajl_status_ok) { if (msr->json->status != yajl_status_ok) {
/* We need to free the yajl error message later, how to do this? */ /* We need to free the yajl error message later, how to do this? */
*error_msg = yajl_get_error(msr->json->handle, 0, buf, size); *error_msg = yajl_get_error(msr->json->handle, 0, buf, size);
return -1;
} }
return 1; return 1;
@ -297,6 +299,7 @@ int json_complete(modsec_rec *msr, char **error_msg) {
if (msr->json->status != yajl_status_ok) { if (msr->json->status != yajl_status_ok) {
/* We need to free the yajl error message later, how to do this? */ /* We need to free the yajl error message later, how to do this? */
*error_msg = yajl_get_error(msr->json->handle, 0, NULL, 0); *error_msg = yajl_get_error(msr->json->handle, 0, NULL, 0);
return -1;
} }
return 1; return 1;

1046
iis/installer.wxs
View File

File diff suppressed because it is too large Load Diff