From db7e4cb67b1b463462092aae83e1ad1bf53fa653 Mon Sep 17 00:00:00 2001 From: Ervin Hegedus Date: Fri, 22 Nov 2024 10:40:50 +0100 Subject: [PATCH 1/2] Align TIME_MON variable's behavior --- src/variables/time_mon.cc | 2 +- test/test-cases/regression/variable-TIME_MON.json | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/variables/time_mon.cc b/src/variables/time_mon.cc index 1805911216..cbc73bd404 100644 --- a/src/variables/time_mon.cc +++ b/src/variables/time_mon.cc @@ -46,7 +46,7 @@ void TimeMon::evaluate(Transaction *transaction, struct tm timeinfo; localtime_r(&timer, &timeinfo); - transaction->m_variableTimeMin.assign(std::to_string(timeinfo.tm_mon)); + transaction->m_variableTimeMin.assign(std::to_string(timeinfo.tm_mon + 1)); l->push_back(new VariableValue(&m_retName, &transaction->m_variableTimeMin)); diff --git a/test/test-cases/regression/variable-TIME_MON.json b/test/test-cases/regression/variable-TIME_MON.json index 663956ae5c..b70112144c 100644 --- a/test/test-cases/regression/variable-TIME_MON.json +++ b/test/test-cases/regression/variable-TIME_MON.json @@ -33,7 +33,8 @@ ] }, "expected":{ - "debug_log":"Target value: \"([0-9]+)\" \\(Variable: TIME_MON\\)" + "http_code": 200, + "debug_log":"Target value: \"[1-9][012]?\" \\(Variable: TIME_MON\\)" }, "rules":[ "SecRuleEngine On", From daf550ef5fffbdbd566f9737a2c21c330d02653d Mon Sep 17 00:00:00 2001 From: Ervin Hegedus Date: Sun, 24 Nov 2024 14:06:50 +0100 Subject: [PATCH 2/2] Fix regex for test --- test/test-cases/regression/variable-TIME_MON.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test-cases/regression/variable-TIME_MON.json b/test/test-cases/regression/variable-TIME_MON.json index b70112144c..bdb825f9e9 100644 --- a/test/test-cases/regression/variable-TIME_MON.json +++ b/test/test-cases/regression/variable-TIME_MON.json @@ -34,7 +34,7 @@ }, "expected":{ "http_code": 200, - "debug_log":"Target value: \"[1-9][012]?\" \\(Variable: TIME_MON\\)" + "debug_log":"Target value: \"([1-9]|1[012])\" \\(Variable: TIME_MON\\)" }, "rules":[ "SecRuleEngine On",