Changes the regression test client to read the interception msg

This commit is contained in:
Felipe Zimmerle 2018-10-25 21:51:23 -03:00
parent 1e5df5312b
commit b05901e8ae
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277

View File

@ -59,7 +59,7 @@ bool contains(const std::string &s, const std::string &pattern) {
void actions(ModSecurityTestResults<RegressionTest> *r, void actions(ModSecurityTestResults<RegressionTest> *r,
modsecurity::Transaction *a) { modsecurity::Transaction *a, std::stringstream *serverLog) {
modsecurity::ModSecurityIntervention it; modsecurity::ModSecurityIntervention it;
memset(&it, '\0', sizeof(modsecurity::ModSecurityIntervention)); memset(&it, '\0', sizeof(modsecurity::ModSecurityIntervention));
it.status = 200; it.status = 200;
@ -76,6 +76,7 @@ void actions(ModSecurityTestResults<RegressionTest> *r,
it.url = NULL; it.url = NULL;
} }
if (it.log != NULL) { if (it.log != NULL) {
*serverLog << it.log;
free(it.log); free(it.log);
it.log = NULL; it.log = NULL;
} }
@ -273,7 +274,7 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
modsec_transaction->processConnection(t->clientIp.c_str(), modsec_transaction->processConnection(t->clientIp.c_str(),
t->clientPort, t->serverIp.c_str(), t->serverPort); t->clientPort, t->serverIp.c_str(), t->serverPort);
actions(&r, modsec_transaction); actions(&r, modsec_transaction, &serverLog);
#if 0 #if 0
if (r.status != 200) { if (r.status != 200) {
goto end; goto end;
@ -283,7 +284,7 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
modsec_transaction->processURI(t->uri.c_str(), t->method.c_str(), modsec_transaction->processURI(t->uri.c_str(), t->method.c_str(),
t->httpVersion.c_str()); t->httpVersion.c_str());
actions(&r, modsec_transaction); actions(&r, modsec_transaction, &serverLog);
#if 0 #if 0
if (r.status != 200) { if (r.status != 200) {
goto end; goto end;
@ -297,7 +298,7 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
} }
modsec_transaction->processRequestHeaders(); modsec_transaction->processRequestHeaders();
actions(&r, modsec_transaction); actions(&r, modsec_transaction, &serverLog);
#if 0 #if 0
if (r.status != 200) { if (r.status != 200) {
goto end; goto end;
@ -308,7 +309,7 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
(unsigned char *)t->request_body.c_str(), (unsigned char *)t->request_body.c_str(),
t->request_body.size()); t->request_body.size());
modsec_transaction->processRequestBody(); modsec_transaction->processRequestBody();
actions(&r, modsec_transaction); actions(&r, modsec_transaction, &serverLog);
#if 0 #if 0
if (r.status != 200) { if (r.status != 200) {
goto end; goto end;
@ -323,7 +324,7 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
modsec_transaction->processResponseHeaders(r.status, modsec_transaction->processResponseHeaders(r.status,
t->response_protocol); t->response_protocol);
actions(&r, modsec_transaction); actions(&r, modsec_transaction, &serverLog);
#if 0 #if 0
if (r.status != 200) { if (r.status != 200) {
goto end; goto end;
@ -334,7 +335,7 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
(unsigned char *)t->response_body.c_str(), (unsigned char *)t->response_body.c_str(),
t->response_body.size()); t->response_body.size());
modsec_transaction->processResponseBody(); modsec_transaction->processResponseBody();
actions(&r, modsec_transaction); actions(&r, modsec_transaction, &serverLog);
#if 0 #if 0
if (r.status != 200) { if (r.status != 200) {
goto end; goto end;