Override the default status code if not suitable to redirect action

Felipe Zimmerle · Felipe Zimmerle · commit e1e8a01ed2d0 · 2018-10-30T18:20:23.000-03:00
Issue #1850
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,8 @@
 v3.0.3 - YYYY-MMM-DD (to be released)
 -------------------------------------
 
+ - Override the default status code if not suitable to redirect action
+   [Issue #1850 - @zimmerle, @victorhora]
  - parser: Fix the support for CRLF configuration files
    [Issue #1945 - @zimmerle, @defanator, @kjakub]
  - Organizes the server logs
diff --git a/others/libinjection b/others/libinjection
@@ -1 +1 @@
-Subproject commit 54e9a6ec017c687c8fad1f347a263a7b259f8525
+Subproject commit bf234eb2f385b969c4f803b35fda53cffdd93922
diff --git a/src/actions/disruptive/redirect.cc b/src/actions/disruptive/redirect.cc
@@ -38,7 +38,8 @@ bool Redirect::evaluate(Rule *rule, Transaction *transaction,
     std::shared_ptr<RuleMessage> rm) {
     std::string m_urlExpanded(m_string->evaluate(transaction));
     /* if it was changed before, lets keep it. */
-    if (transaction->m_it.status == 200) {
+    if (transaction->m_it.status == 200
+        || (!(transaction->m_it.status <= 307 && transaction->m_it.status >= 301))) {
         transaction->m_it.status = m_status;
     }
 
diff --git a/test/test-cases/secrules-language-tests b/test/test-cases/secrules-language-tests
@@ -1 +1 @@
-Subproject commit a9c58a25771493ac2abadffbfd5dce1213d5db93
+Subproject commit e6b03e46046ce9ce6dcfc0e6ad0820194e21db35

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,8 @@ bool Redirect::evaluate(Rule rule, Transaction transaction,`
`38`	`38`	`std::shared_ptr<RuleMessage> rm) {`
`39`	`39`	`std::string m_urlExpanded(m_string->evaluate(transaction));`
`40`	`40`	`/* if it was changed before, lets keep it. */`
`41`		`- if (transaction->m_it.status == 200) {`
	`41`	`+ if (transaction->m_it.status == 200`
	`42`	`+ \|\| (!(transaction->m_it.status <= 307 && transaction->m_it.status >= 301))) {`
`42`	`43`	`transaction->m_it.status = m_status;`
`43`	`44`	`}`
`44`	`45`