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

Fixed: detect comma plus white space as a cookie separator - change variable names

Browse Source
This commit is contained in:
Breno Silva
2013-01-05 12:11:18 -04:00
parent 80146b2c74
commit 213cd1e840
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apache2/modsecurity.c
View File

@@ -276,7 +276,8 @@ static apr_status_t modsecurity_tx_cleanup(void *data) {
apr_status_t modsecurity_tx_init(modsec_rec *msr) { apr_status_t modsecurity_tx_init(modsec_rec *msr) {
const char *s = NULL; const char *s = NULL;
const apr_array_header_t *arr; const apr_array_header_t *arr;
char *_cookies = NULL; char *semicolon = NULL;
char *comma = NULL;
apr_table_entry_t *te; apr_table_entry_t *te;
int i; int i;
@@ -402,16 +403,16 @@ apr_status_t modsecurity_tx_init(modsec_rec *msr) {
for (i = 0; i < arr->nelts; i++) { for (i = 0; i < arr->nelts; i++) {
if (strcasecmp(te[i].key, "Cookie") == 0) { if (strcasecmp(te[i].key, "Cookie") == 0) {
if (msr->txcfg->cookie_format == COOKIES_V0) { if (msr->txcfg->cookie_format == COOKIES_V0) {
_cookies = apr_pstrdup(msr->mp, te[i].val); semicolon = apr_pstrdup(msr->mp, te[i].val);
while((*_cookies != 0)&&(*_cookies != ';')) _cookies++; while((*semicolon != 0)&&(*semicolon != ';')) semicolon++;
if(*_cookies == ';') { if(*semicolon == ';') {
parse_cookies_v0(msr, te[i].val, msr->request_cookies, ";"); parse_cookies_v0(msr, te[i].val, msr->request_cookies, ";");
} else { } else {
_cookies = apr_pstrdup(msr->mp, te[i].val); comma = apr_pstrdup(msr->mp, te[i].val);
while((*_cookies != 0)&&(*_cookies != ',')) _cookies++; while((*comma != 0)&&(*comma != ',')) comma++;
if(*_cookies == ',') { if(*comma == ',') {
_cookies++; comma++;
if(*_cookies == 0x20) {// looks like comma is the separator if(*comma == 0x20) {// looks like comma is the separator
if (msr->txcfg->debuglog_level >= 5) { if (msr->txcfg->debuglog_level >= 5) {
msr_log(msr, 5, "Cookie v0 parser: Using comma as a separator. Semi-colon was not identified!"); msr_log(msr, 5, "Cookie v0 parser: Using comma as a separator. Semi-colon was not identified!");
} }