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

Adds support to the RESPONSE_PROTOCOL variable

Browse Source
This commit is contained in:
Felipe Zimmerle 2016-06-21 09:51:50 -03:00
parent b8bd0c5960
commit df1f7c5e08
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
6 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -219,3 +219,4 @@ TESTS+=test/test-cases/regression/variable-REQBODY_PROCESSOR_ERROR.json
TESTS+=test/test-cases/regression/variable-URLENCODED_ERROR.json
TESTS+=test/test-cases/regression/variable-RULE.json
TESTS+=test/test-cases/regression/variable-STATUS.json
TESTS+=test/test-cases/regression/variable-RESPONSE_PROTOCOL.json

1
src/transaction.cc
View File

@ -838,6 +838,7 @@ int Transaction::processResponseHeaders(int code, const std::string& proto) {
this->m_httpCodeReturned = code;
this->m_collections.store("STATUS", std::to_string(code));
m_collections.store("RESPONSE_PROTOCOL", proto);
if (m_rules->secRuleEngine == Rules::DisabledRuleEngine) {
#ifndef NO_LOGS

2
test/regression/regression.cc
View File

@ -291,7 +291,7 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
headers.second.c_str());
}
modsec_transaction->processResponseHeaders(r.status, "HTTP 1.1");
modsec_transaction->processResponseHeaders(r.status, t->response_protocol);
actions(&r, modsec_transaction);
#if 0
if (r.status != 200) {

3
test/regression/regression_test.cc
View File

@ -169,6 +169,9 @@ RegressionTest *RegressionTest::from_yajl_node(const yajl_val &node) {
if (strcmp(key2, "body") == 0) {
u->response_body = yajl_array_to_str(val2);
}
if (strcmp(key2, "protocol") == 0) {
u->response_protocol = YAJL_GET_STRING(val2);
}
}
}
if (strcmp(key, "expected") == 0) {

1
test/regression/regression_test.h
View File

@ -48,6 +48,7 @@ class RegressionTest {
std::unordered_map<std::string, std::string> response_headers;
std::string request_body;
std::string response_body;
std::string response_protocol;
std::string audit_log;
std::string debug_log;

46
test/test-cases/regression/variable-RESPONSE_PROTOCOL.json Normal file
View File

@ -0,0 +1,46 @@
[
{
"enabled":1,
"version_min":300000,
"title":"Testing Variables :: RESPONSE_PROTOCOL",
"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":"*/*"
},
"uri":"/?key=value&key=other_value",
"method":"GET",
"http_version":1.1
},
"response":{
"protocol": "HTTP/1.1",
"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: \"HTTP/1.1\" \\(Variable: RESPONSE_PROTOCOL\\)"
},
"rules":[
"SecRuleEngine On",
"SecDebugLog \/tmp\/modsec_debug.log",
"SecDebugLogLevel 9",
"SecRule RESPONSE_PROTOCOL \"^HTTP\" \"id:1,phase:5,pass,t:trim\""
]
}
]