mirror of
https://github.com/owasp-modsecurity/ModSecurity.git
synced 2025-08-14 05:45:59 +03:00
Adds support to REQUEST_HEADERS{_NAMES} and RESPONSE_HEADERS{_NAMES} vars
This commit is contained in:
Felipe Zimmerle
parent
97c0d561f6
commit
cb722c74b9
@ -209,8 +209,8 @@ class Assay {
|
||||
std::string *m_namesArgs;
|
||||
std::string *m_namesArgsPost;
|
||||
std::string *m_namesArgsGet;
|
||||
std::string m_namesResponse;
|
||||
std::string m_namesRequest;
|
||||
std::string *m_requestHeadersNames;
|
||||
std::string *m_responseHeadersNames;
|
||||
double m_ARGScombinedSize;
|
||||
/** TODO: Support to save double in the storage. */
|
||||
std::string *m_ARGScombinedSizeStr;
|
||||
|
||||
25
src/assay.cc
25
src/assay.cc
@ -99,6 +99,8 @@ Assay::Assay(ModSecurity *ms, Rules *rules)
|
||||
m_namesArgsPost(NULL),
|
||||
m_namesArgsGet(NULL),
|
||||
m_requestBodyType(UnknownFormat),
|
||||
m_requestHeadersNames(NULL),
|
||||
m_responseHeadersNames(NULL),
|
||||
start(std::chrono::system_clock::now()),
|
||||
m_ms(ms) {
|
||||
id = std::to_string(this->timeStamp) + \
|
||||
@ -113,6 +115,12 @@ Assay::Assay(ModSecurity *ms, Rules *rules)
|
||||
this->m_namesArgsPost = resolve_variable_first("ARGS_POST_NAMES");
|
||||
store_variable("ARGS_GET_NAMES", std::string(""));
|
||||
this->m_namesArgsGet = resolve_variable_first("ARGS_GET_NAMES");
|
||||
store_variable("REQUEST_HEADERS_NAMES", std::string(""));
|
||||
this->m_requestHeadersNames = resolve_variable_first(
|
||||
"REQUEST_HEADERS_NAMES");
|
||||
store_variable("RESPONSE_HEADERS_NAMES", std::string(""));
|
||||
this->m_responseHeadersNames = resolve_variable_first(
|
||||
"RESPONSE_HEADERS_NAMES");
|
||||
|
||||
this->debug(4, "Initialising transaction");
|
||||
}
|
||||
@ -318,14 +326,7 @@ int Assay::processRequestHeaders() {
|
||||
*/
|
||||
int Assay::addRequestHeader(const std::string& key,
|
||||
const std::string& value) {
|
||||
std::string *names = resolve_variable_first("REQUEST_HEADERS_NAMES");
|
||||
|
||||
if (names == NULL) {
|
||||
this->store_variable("REQUEST_HEADERS_NAMES", m_namesRequest);
|
||||
m_namesRequest = key;
|
||||
} else {
|
||||
m_namesRequest = m_namesRequest + " " + key;
|
||||
}
|
||||
m_requestHeadersNames->assign(*m_requestHeadersNames + " " + key);
|
||||
|
||||
this->store_variable("REQUEST_HEADERS:" + key, value);
|
||||
|
||||
@ -652,13 +653,7 @@ int Assay::processResponseHeaders() {
|
||||
int Assay::addResponseHeader(const std::string& key,
|
||||
const std::string& value) {
|
||||
std::string *names = resolve_variable_first("RESPONSE_HEADERS_NAMES");
|
||||
|
||||
if (names == NULL) {
|
||||
this->store_variable("RESPONSE_HEADERS_NAMES", m_namesResponse);
|
||||
m_namesRequest = key;
|
||||
} else {
|
||||
m_namesRequest = m_namesRequest + " " + key;
|
||||
}
|
||||
m_responseHeadersNames->assign(*m_responseHeadersNames + " " + key);
|
||||
|
||||
this->store_variable("RESPONSE_HEADERS:" + key, value);
|
||||
|
||||
|
||||
63
test/test-cases/regression/variable-REQUEST_HEADERS.json
Normal file
63
test/test-cases/regression/variable-REQUEST_HEADERS.json
Normal file
@ -0,0 +1,63 @@
|
||||
[
|
||||
{
|
||||
"enabled":1,
|
||||
"version_min":300000,
|
||||
"title":"Testing Variables :: REQUEST_HEADERS",
|
||||
"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":"330",
|
||||
"Content-Type":"multipart/form-data; boundary=--------------------------756b6d74fa1a8ee2",
|
||||
"Expect":"100-continue"
|
||||
},
|
||||
"uri":"/",
|
||||
"protocol":"POST",
|
||||
"body":[
|
||||
"--------------------------756b6d74fa1a8ee2",
|
||||
"Content-Disposition: form-data; name=\"name\"",
|
||||
"",
|
||||
"test",
|
||||
"--------------------------756b6d74fa1a8ee2",
|
||||
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
|
||||
"Content-Type: text/plain",
|
||||
"",
|
||||
"This is a very small test file..",
|
||||
"--------------------------756b6d74fa1a8ee2",
|
||||
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
|
||||
"Content-Type: text/plain",
|
||||
"",
|
||||
"This is another very small test file..",
|
||||
"--------------------------756b6d74fa1a8ee2--"
|
||||
]
|
||||
},
|
||||
"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: \"localhost\" \\(Variable: REQUEST_HEADERS:Host\\)"
|
||||
},
|
||||
"rules":[
|
||||
"SecRuleEngine On",
|
||||
"SecDebugLog \/tmp\/modsec_debug.log",
|
||||
"SecDebugLogLevel 9",
|
||||
"SecRule REQUEST_HEADERS \"@contains small_text_file.txt\" \"phase:3,pass,t:trim\""
|
||||
]
|
||||
}
|
||||
]
|
||||
@ -0,0 +1,63 @@
|
||||
[
|
||||
{
|
||||
"enabled":1,
|
||||
"version_min":300000,
|
||||
"title":"Testing Variables :: REQUEST_HEADERS_NAMES",
|
||||
"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":"330",
|
||||
"Content-Type":"multipart/form-data; boundary=--------------------------756b6d74fa1a8ee2",
|
||||
"Expect":"100-continue"
|
||||
},
|
||||
"uri":"/",
|
||||
"protocol":"POST",
|
||||
"body":[
|
||||
"--------------------------756b6d74fa1a8ee2",
|
||||
"Content-Disposition: form-data; name=\"name\"",
|
||||
"",
|
||||
"test",
|
||||
"--------------------------756b6d74fa1a8ee2",
|
||||
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
|
||||
"Content-Type: text/plain",
|
||||
"",
|
||||
"This is a very small test file..",
|
||||
"--------------------------756b6d74fa1a8ee2",
|
||||
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
|
||||
"Content-Type: text/plain",
|
||||
"",
|
||||
"This is another very small test file..",
|
||||
"--------------------------756b6d74fa1a8ee2--"
|
||||
]
|
||||
},
|
||||
"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: \"Expect Content-Type Accept User-Agent Content-Length Host\" \\(Variable: REQUEST_HEADERS_NAMES\\)"
|
||||
},
|
||||
"rules":[
|
||||
"SecRuleEngine On",
|
||||
"SecDebugLog \/tmp\/modsec_debug.log",
|
||||
"SecDebugLogLevel 9",
|
||||
"SecRule REQUEST_HEADERS_NAMES \"@contains small_text_file.txt\" \"phase:3,pass,t:trim\""
|
||||
]
|
||||
}
|
||||
]
|
||||
63
test/test-cases/regression/variable-RESPONSE_HEADERS.json
Normal file
63
test/test-cases/regression/variable-RESPONSE_HEADERS.json
Normal file
@ -0,0 +1,63 @@
|
||||
[
|
||||
{
|
||||
"enabled":1,
|
||||
"version_min":300000,
|
||||
"title":"Testing Variables :: RESPONSE_HEADERS",
|
||||
"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":"330",
|
||||
"Content-Type":"multipart/form-data; boundary=--------------------------756b6d74fa1a8ee2",
|
||||
"Expect":"100-continue"
|
||||
},
|
||||
"uri":"/",
|
||||
"protocol":"POST",
|
||||
"body":[
|
||||
"--------------------------756b6d74fa1a8ee2",
|
||||
"Content-Disposition: form-data; name=\"name\"",
|
||||
"",
|
||||
"test",
|
||||
"--------------------------756b6d74fa1a8ee2",
|
||||
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
|
||||
"Content-Type: text/plain",
|
||||
"",
|
||||
"This is a very small test file..",
|
||||
"--------------------------756b6d74fa1a8ee2",
|
||||
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
|
||||
"Content-Type: text/plain",
|
||||
"",
|
||||
"This is another very small test file..",
|
||||
"--------------------------756b6d74fa1a8ee2--"
|
||||
]
|
||||
},
|
||||
"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: \"Mon, 13 Jul 2015 20:02:41 GMT\" \\(Variable: RESPONSE_HEADERS:Date\\)"
|
||||
},
|
||||
"rules":[
|
||||
"SecRuleEngine On",
|
||||
"SecDebugLog \/tmp\/modsec_debug.log",
|
||||
"SecDebugLogLevel 9",
|
||||
"SecRule RESPONSE_HEADERS \"@contains small_text_file.txt\" \"phase:3,pass,t:trim\""
|
||||
]
|
||||
}
|
||||
]
|
||||
@ -0,0 +1,63 @@
|
||||
[
|
||||
{
|
||||
"enabled":1,
|
||||
"version_min":300000,
|
||||
"title":"Testing Variables :: RESPONSE_HEADERS_NAMES",
|
||||
"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":"330",
|
||||
"Content-Type":"multipart/form-data; boundary=--------------------------756b6d74fa1a8ee2",
|
||||
"Expect":"100-continue"
|
||||
},
|
||||
"uri":"/",
|
||||
"protocol":"POST",
|
||||
"body":[
|
||||
"--------------------------756b6d74fa1a8ee2",
|
||||
"Content-Disposition: form-data; name=\"name\"",
|
||||
"",
|
||||
"test",
|
||||
"--------------------------756b6d74fa1a8ee2",
|
||||
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
|
||||
"Content-Type: text/plain",
|
||||
"",
|
||||
"This is a very small test file..",
|
||||
"--------------------------756b6d74fa1a8ee2",
|
||||
"Content-Disposition: form-data; name=\"filedata\"; filename=\"small_text_file.txt\"",
|
||||
"Content-Type: text/plain",
|
||||
"",
|
||||
"This is another very small test file..",
|
||||
"--------------------------756b6d74fa1a8ee2--"
|
||||
]
|
||||
},
|
||||
"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: \"Content-Type Last-Modified Date\" \\(Variable: RESPONSE_HEADERS_NAMES\\)"
|
||||
},
|
||||
"rules":[
|
||||
"SecRuleEngine On",
|
||||
"SecDebugLog \/tmp\/modsec_debug.log",
|
||||
"SecDebugLogLevel 9",
|
||||
"SecRule RESPONSE_HEADERS_NAMES \"@contains small_text_file.txt\" \"phase:3,pass,t:trim\""
|
||||
]
|
||||
}
|
||||
]
|
||||
Loading…
x
Reference in New Issue
Block a user