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

Fix setvar to understand Rule variable in collections

Browse Source 
Issue #1961
This commit is contained in:
Felipe Zimmerle 2018-11-26 19:48:02 -03:00
parent cbf2fe9703
commit e712d30c56
No known key found for this signature in database
GPG Key ID: E6DFB08CE8B11277
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,6 +1,8 @@
v3.0.4 - YYYY-MMM-DD (to be released)
-------------------------------------
- Rule variable interpolation broken
[Issue #1961 - @soonum, @zimmerle]
- Make the boundary check less strict as per RFC2046
[Issue #1943 - @victorhora, @allanbomsft]
- Fix buffer size for utf8toUnicode transformation

12
src/actions/set_var.cc
View File

@ -65,17 +65,17 @@ bool SetVar::evaluate(Rule *rule, Transaction *t) {
Variables::User_DynamicElement *user = dynamic_cast<
Variables::User_DynamicElement *> (v);
if (tx) {
m_variableNameExpanded = tx->m_string->evaluate(t);
m_variableNameExpanded = tx->m_string->evaluate(t, rule);
} else if (session) {
m_variableNameExpanded = session->m_string->evaluate(t);
m_variableNameExpanded = session->m_string->evaluate(t, rule);
} else if (ip) {
m_variableNameExpanded = ip->m_string->evaluate(t);
m_variableNameExpanded = ip->m_string->evaluate(t, rule);
} else if (resource) {
m_variableNameExpanded = resource->m_string->evaluate(t);
m_variableNameExpanded = resource->m_string->evaluate(t, rule);
} else if (global) {
m_variableNameExpanded = global->m_string->evaluate(t);
m_variableNameExpanded = global->m_string->evaluate(t, rule);
} else if (user) {
m_variableNameExpanded = user->m_string->evaluate(t);
m_variableNameExpanded = user->m_string->evaluate(t, rule);
} else {
m_variableNameExpanded = m_variable->m_name;
}