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

Enhanced logging [Issue #3107]

Browse Source
This commit is contained in:
Marc Stern 2024-05-10 17:26:23 +02:00
parent dd400f7fa3
commit a61820fe2c
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,6 +1,8 @@
DD mmm YYYY - 2.9.x (to be released) DD mmm YYYY - 2.9.x (to be released)
------------------- -------------------
* Enhance logging
[Issue #3107 - @marcstern]
* Fix possible segfault in collection_unpack * Fix possible segfault in collection_unpack
[Issue #3072 - @twouters] [Issue #3072 - @twouters]
* Set the minimum security protocol version for SecRemoteRules * Set the minimum security protocol version for SecRemoteRules

10
apache2/msc_json.c
View File

@ -65,6 +65,7 @@ int json_add_argument(modsec_rec *msr, const char *value, unsigned length)
log_escape_ex(msr->mp, arg->value, arg->value_len)); log_escape_ex(msr->mp, arg->value, arg->value_len));
} }
msr->msc_reqbody_error = 1; msr->msc_reqbody_error = 1;
msr->json->yajl_error = apr_psprintf(msr->mp, "More than %ld JSON keys", msr->txcfg->arguments_limit);
return 0; return 0;
} }
@ -374,9 +375,12 @@ int json_process_chunk(modsec_rec *msr, const char *buf, unsigned int size, char
if (msr->json->depth_limit_exceeded) { if (msr->json->depth_limit_exceeded) {
*error_msg = "JSON depth limit exceeded"; *error_msg = "JSON depth limit exceeded";
} else { } else {
char *yajl_err = yajl_get_error(msr->json->handle, 0, buf, size); if (msr->json->yajl_error) *error_msg = msr->json->yajl_error;
*error_msg = apr_pstrdup(msr->mp, yajl_err); else {
yajl_free_error(msr->json->handle, yajl_err); char* yajl_err = yajl_get_error(msr->json->handle, 0, buf, size);
*error_msg = apr_pstrdup(msr->mp, yajl_err);
yajl_free_error(msr->json->handle, yajl_err);
}
} }
return -1; return -1;
} }