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

Improves the method fill the ARGS collection

Browse Source
This commit is contained in:
Felipe Zimmerle 2016-01-15 10:35:24 -03:00
parent 98f45f357a
commit a102b5ce2c
2 changed files with 169 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/transaction.cc
View File

@ -683,23 +683,42 @@ int Transaction::processRequestBody() {
*/
char sep2 = '=';
std::vector<std::string> key_value = split(t, sep2);
m_collections.store("ARGS:" + key_value[0], key_value[1]);
m_collections.store("ARGS_POST:" + key_value[0], key_value[1]);
std::vector<std::string> key_value2 = split(t, sep2);
if (key_value2.size() == 0) {
continue;
}
std::string key = key_value2[0];
std::string value = std::string("");
if (key_value2.size() == 2) {
value = key_value2[1];
} else if (key_value2.size() > 2) {
int i = 2;
value = key_value2[1];
while (i < key_value2.size()) {
value = value + std::string("=") + key_value2[i];
i++;
}
}
m_collections.store("ARGS:" + key, value);
m_collections.store("ARGS_POST:" + key, value);
if (m_namesArgs->empty()) {
m_namesArgs->assign(key_value[0]);
m_namesArgs->assign(key);
} else {
m_namesArgs->assign(*m_namesArgs + " " + key_value[0]);
m_namesArgs->assign(*m_namesArgs + " " + key);
}
if (m_namesArgsPost->empty()) {
m_namesArgsPost->assign(key_value[0]);
m_namesArgsPost->assign(key);
} else {
m_namesArgsPost->assign(*m_namesArgsPost + " " + key_value[0]);
m_namesArgsPost->assign(*m_namesArgsPost + " " + key);
}
this->m_ARGScombinedSize = this->m_ARGScombinedSize + \
key_value[0].length() + key_value[1].length();
key.length() + value.length();
this->m_ARGScombinedSizeStr->assign(
std::to_string(this->m_ARGScombinedSize));
}

146
test/test-cases/regression/variable-ARGS.json
View File

@ -2,7 +2,7 @@
{
"enabled":1,
"version_min":300000,
"title":"Testing Variables :: ARGS - GET (1/4)",
"title":"Testing Variables :: ARGS - GET (1/7)",
"client":{
"ip":"200.249.12.31",
"port":123
@ -43,7 +43,7 @@
{
"enabled":1,
"version_min":300000,
"title":"Testing Variables :: ARGS - GET (2/4)",
"title":"Testing Variables :: ARGS - GET (2/7)",
"client":{
"ip":"200.249.12.31",
"port":123
@ -84,7 +84,7 @@
{
"enabled":1,
"version_min":300000,
"title":"Testing Variables :: ARGS - POST (3/4)",
"title":"Testing Variables :: ARGS - POST (3/7)",
"client":{
"ip":"200.249.12.31",
"port":123
@ -130,7 +130,7 @@
{
"enabled":1,
"version_min":300000,
"title":"Testing Variables :: ARGS - POST (4/4)",
"title":"Testing Variables :: ARGS - POST (4/7)",
"client":{
"ip":"200.249.12.31",
"port":123
@ -172,6 +172,144 @@
"SecDebugLogLevel 9",
"SecRule ARGS \"@contains test \" \"id:1,phase:3,pass,t:trim\""
]
},
{
"enabled":1,
"version_min":300000,
"title":"Testing Variables :: ARGS - POST (5/7)",
"client":{
"ip":"200.249.12.31",
"port":123
},
"server":{
"ip":"200.249.12.31",
"port":80
},
"request":{
"headers":{
"Host":"localhost",
"User-Agent":"curl/7.38.0",
"Accept":"*/*",
"Content-Length": "27",
"Content-Type": "application/x-www-form-urlencoded"
},
"uri":"/",
"method":"POST",
"body": [
"param1=value1=morevalue1&param2=value2"
]
},
"response":{
"headers":{
"Date":"Mon, 13 Jul 2015 20:02:41 GMT",
"Last-Modified":"Sun, 26 Oct 2014 22:33:37 GMT",
"Content-Type":"text/html"
},
"body":[
"no need."
]
},
"expected":{
"debug_log":"Target value: \"value1=morevalue1\""
},
"rules":[
"SecRuleEngine On",
"SecDebugLog \/tmp\/modsec_debug.log",
"SecDebugLogLevel 9",
"SecRule ARGS \"@contains test \" \"id:1,phase:3,pass,t:trim\""
]
},
{
"enabled":1,
"version_min":300000,
"title":"Testing Variables :: ARGS - POST (6/7)",
"client":{
"ip":"200.249.12.31",
"port":123
},
"server":{
"ip":"200.249.12.31",
"port":80
},
"request":{
"headers":{
"Host":"localhost",
"User-Agent":"curl/7.38.0",
"Accept":"*/*",
"Content-Length": "27",
"Content-Type": "application/x-www-form-urlencoded"
},
"uri":"/",
"method":"POST",
"body": [
"param1=value1=morevalue1&param2=value2&param3="
]
},
"response":{
"headers":{
"Date":"Mon, 13 Jul 2015 20:02:41 GMT",
"Last-Modified":"Sun, 26 Oct 2014 22:33:37 GMT",
"Content-Type":"text/html"
},
"body":[
"no need."
]
},
"expected":{
"debug_log":"Target value: \"\" \\(Variable: ARGS:param3\\)"
},
"rules":[
"SecRuleEngine On",
"SecDebugLog \/tmp\/modsec_debug.log",
"SecDebugLogLevel 9",
"SecRule ARGS:param3 \"@contains test \" \"id:1,phase:3,pass,t:trim\""
]
},
{
"enabled":1,
"version_min":300000,
"title":"Testing Variables :: ARGS - POST (7/7)",
"client":{
"ip":"200.249.12.31",
"port":123
},
"server":{
"ip":"200.249.12.31",
"port":80
},
"request":{
"headers":{
"Host":"localhost",
"User-Agent":"curl/7.38.0",
"Accept":"*/*",
"Content-Length": "27",
"Content-Type": "application/x-www-form-urlencoded"
},
"uri":"/",
"method":"POST",
"body": [
"param1=value1=morevalue1&param2=value2&&&&&"
]
},
"response":{
"headers":{
"Date":"Mon, 13 Jul 2015 20:02:41 GMT",
"Last-Modified":"Sun, 26 Oct 2014 22:33:37 GMT",
"Content-Type":"text/html"
},
"body":[
"no need."
]
},
"expected":{
"debug_log":"Target value: \"value2\" \\(Variable: ARGS:param2\\)"
},
"rules":[
"SecRuleEngine On",
"SecDebugLog \/tmp\/modsec_debug.log",
"SecDebugLogLevel 9",
"SecRule ARGS:param2 \"@contains test \" \"id:1,phase:3,pass,t:trim\""
]
}
]