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

Adds protocol and http version to processUri method's signature

Browse Source 
Protocol and http version will be further used to fill some variables
and the audit log.
This commit is contained in:
Felipe Zimmerle
2015-07-08 13:50:17 -03:00
parent 2109910848
commit 278b513933
12 changed files with 79 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/regression/regression.cc
View File

@@ -85,12 +85,13 @@ void perform_unit_test(std::vector<RegressionTest *> *tests,
if (r.status != 200) {
goto end;
}
if (t->uri.empty() == false) {
modsec_assay->processURI(t->uri.c_str());
actions(&r, modsec_assay->intervention());
if (r.status != 200) {
goto end;
}
modsec_assay->processURI(t->uri.c_str(), t->protocol.c_str(),
t->httpVersion.c_str());
actions(&r, modsec_assay->intervention());
if (r.status != 200) {
goto end;
}
for (std::pair<std::string, std::string> headers :

6
test/regression/regression_test.cc
View File

@@ -141,6 +141,12 @@ RegressionTest *RegressionTest::from_yajl_node(const yajl_val &node) {
if (strcmp(key2, "uri") == 0) {
u->uri = YAJL_GET_STRING(val2);
}
if (strcmp(key2, "protocol") == 0) {
u->protocol = YAJL_GET_STRING(val2);
}
if (strcmp(key2, "http_version") == 0) {
u->httpVersion = YAJL_GET_NUMBER(val2);
}
if (strcmp(key2, "headers") == 0) {
u->request_headers = yajl_array_to_map(val2);
}

2
test/regression/regression_test.h
View File

@@ -56,6 +56,8 @@ class RegressionTest {
int clientPort;
int serverPort;
std::string protocol;
std::string httpVersion;
std::string uri;
static inline std::string yajl_array_to_str(const yajl_val &node);