github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-11-17 09:55:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Add var name to validateUtf8Encoding message. See #408.

Browse Source
This commit is contained in:
brectanus
2007-12-12 18:40:35 +00:00
parent 3c1d5a0210
commit e7e9756966
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
apache2/re_operators.c
View File

@@ -1556,33 +1556,39 @@ static int msre_op_validateUtf8Encoding_execute(modsec_rec *msr, msre_rule *rule
switch(rc) { switch(rc) {
case UNICODE_ERROR_CHARACTERS_MISSING : case UNICODE_ERROR_CHARACTERS_MISSING :
*error_msg = apr_psprintf(msr->mp, "Invalid UTF-8 encoding: not enough bytes in " *error_msg = apr_psprintf(msr->mp, "Invalid UTF-8 encoding: "
"character (pos %d).", i); "not enough bytes in character "
"at %s. [offset \"%d\"]", var->name, i);
return 1; return 1;
break; break;
case UNICODE_ERROR_INVALID_ENCODING : case UNICODE_ERROR_INVALID_ENCODING :
*error_msg = apr_psprintf(msr->mp, "Invalid UTF-8 encoding: invalid byte value " *error_msg = apr_psprintf(msr->mp, "Invalid UTF-8 encoding: "
"in character (pos %d).", i); "invalid byte value in character "
"at %s. [offset \"%d\"]", var->name, i);
return 1; return 1;
break; break;
case UNICODE_ERROR_OVERLONG_CHARACTER : case UNICODE_ERROR_OVERLONG_CHARACTER :
*error_msg = apr_psprintf(msr->mp, "Invalid UTF-8 encoding: overlong " *error_msg = apr_psprintf(msr->mp, "Invalid UTF-8 encoding: "
"character detected (pos %d).", i); "overlong character detected "
"at %s. [offset \"%d\"]", var->name, i);
return 1; return 1;
break; break;
case UNICODE_ERROR_RESTRICTED_CHARACTER : case UNICODE_ERROR_RESTRICTED_CHARACTER :
*error_msg = apr_psprintf(msr->mp, "Invalid UTF-8 encoding: use of restricted character" *error_msg = apr_psprintf(msr->mp, "Invalid UTF-8 encoding: "
" (pos %d).", i); "use of restricted character "
"at %s. [offset \"%d\"]", var->name, i);
return 1; return 1;
break; break;
case UNICODE_ERROR_DECODING_ERROR : case UNICODE_ERROR_DECODING_ERROR :
*error_msg = apr_psprintf(msr->mp, "Error validating UTF-8 decoding (pos %d).", i); *error_msg = apr_psprintf(msr->mp, "Error validating UTF-8 decoding "
"at %s. [offset \"%d\"]", var->name, i);
return 1; return 1;
break; break;
} }
if (rc <= 0) { if (rc <= 0) {
*error_msg = apr_psprintf(msr->mp, "Internal error during UTF-8 validation."); *error_msg = apr_psprintf(msr->mp, "Internal error during UTF-8 validation "
"at %s.", var->name);
return 1; return 1;
} }