Refactoring on RuleMessage class, now accepting http code as parameter

This commit is contained in:
Felipe Zimmerle
2017-10-19 23:00:25 -03:00
parent 39fb75c34d
commit 274f9e5aa1
6 changed files with 72 additions and 122 deletions

View File

@@ -33,21 +33,15 @@ bool Deny::evaluate(Rule *rule, Transaction *transaction,
#ifndef NO_LOGS
transaction->debug(8, "Running action deny");
#endif
std::string log;
if (transaction->m_it.status == 200) {
transaction->m_it.status = 403;
}
log.append("Access denied with code %d");
log.append(" (phase ");
log.append(std::to_string(rm->m_rule->m_phase - 1) + "). ");
rm->m_disruptiveMessage.assign(log);
transaction->m_it.disruptive = true;
intervention::freeLog(&transaction->m_it);
transaction->m_it.log = strdup(
rm->disruptiveErrorLog().c_str());
rm->log(RuleMessage::LogMessageInfo::ClientLogMessageInfo).c_str());
rm->m_isDisruptive = true;
return true;

View File

@@ -40,23 +40,18 @@ bool Redirect::init(std::string *error) {
bool Redirect::evaluate(Rule *rule, Transaction *transaction,
std::shared_ptr<RuleMessage> rm) {
m_urlExpanded = MacroExpansion::expand(m_url, transaction);
std::string log;
/* if it was changed before, lets keep it. */
if (transaction->m_it.status == 200) {
transaction->m_it.status = m_status;
}
log.append("Access denied with code %d");
log.append(" (phase ");
log.append(std::to_string(rm->m_rule->m_phase - 1) + "). ");
rm->m_disruptiveMessage.assign(log);
intervention::freeUrl(&transaction->m_it);
transaction->m_it.url = strdup(m_urlExpanded.c_str());
transaction->m_it.disruptive = true;
intervention::freeLog(&transaction->m_it);
transaction->m_it.log = strdup(
rm->disruptiveErrorLog().c_str());
rm->log(RuleMessage::LogMessageInfo::ClientLogMessageInfo).c_str());
rm->m_isDisruptive = true;
return true;