From 29364052cdaba1db240fb6c5dc82492a4fd8ceb8 Mon Sep 17 00:00:00 2001
From: martinhsv <55407942+martinhsv@users.noreply.github.com>
Date: Thu, 5 Nov 2020 13:56:38 -0800
Subject: [PATCH] Produce not-supported error for ctl:forceRequestBodyVariable,
 ctl:auditEngine

---
 CHANGES                      |  3 +++
 src/parser/seclang-parser.cc | 20 ++++++++++----------
 src/parser/seclang-parser.yy | 20 ++++++++++----------
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/CHANGES b/CHANGES
index 93be4347..5841fe55 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
 v3.x.y - YYYY-MMM-DD (to be released)
 -------------------------------------
  
+  - Produce not-supported error for ctl:forceRequestBodyVariable
+    and ctl:auditEngine
+    [#2376 - @WGH-, @martinhsv]
   - Implement id ranges for ctl:ruleRemoveTargetById
     [#2110 - @j0k2r, @martinhsv]  
   - Removed unnecessary while processing the transformations.
diff --git a/src/parser/seclang-parser.cc b/src/parser/seclang-parser.cc
index 024ea6d2..ed981cf4 100644
--- a/src/parser/seclang-parser.cc
+++ b/src/parser/seclang-parser.cc
@@ -4827,8 +4827,8 @@ namespace yy {
   case 340: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_ON"
 #line 2628 "seclang-parser.yy"
       {
-        //ACTION_NOT_SUPPORTED("CtlAuditEngine", @0);
-        ACTION_CONTAINER(yylhs.value.as < std::unique_ptr<actions::Action> > (), new actions::Action(yystack_[1].value.as < std::string > ()));
+        ACTION_NOT_SUPPORTED("CtlAuditEngine", yystack_[2].location);
+        //ACTION_CONTAINER($$, new actions::Action($1));
       }
 #line 4834 "seclang-parser.cc"
     break;
@@ -4836,8 +4836,8 @@ namespace yy {
   case 341: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_OFF"
 #line 2633 "seclang-parser.yy"
       {
-        //ACTION_NOT_SUPPORTED("CtlAuditEngine", @0);
-        ACTION_CONTAINER(yylhs.value.as < std::unique_ptr<actions::Action> > (), new actions::Action(yystack_[1].value.as < std::string > ()));
+        ACTION_NOT_SUPPORTED("CtlAuditEngine", yystack_[2].location);
+        //ACTION_CONTAINER($$, new actions::Action($1));
       }
 #line 4843 "seclang-parser.cc"
     break;
@@ -4845,8 +4845,8 @@ namespace yy {
   case 342: // act: "ACTION_CTL_AUDIT_ENGINE" "CONFIG_VALUE_RELEVANT_ONLY"
 #line 2638 "seclang-parser.yy"
       {
-        //ACTION_NOT_SUPPORTED("CtlAuditEngine", @0);
-        ACTION_CONTAINER(yylhs.value.as < std::unique_ptr<actions::Action> > (), new actions::Action(yystack_[1].value.as < std::string > ()));
+        ACTION_NOT_SUPPORTED("CtlAuditEngine", yystack_[2].location);
+        //ACTION_CONTAINER($$, new actions::Action($1));
       }
 #line 4852 "seclang-parser.cc"
     break;
@@ -4886,8 +4886,8 @@ namespace yy {
   case 347: // act: "ACTION_CTL_FORCE_REQ_BODY_VAR" "CONFIG_VALUE_ON"
 #line 2659 "seclang-parser.yy"
       {
-        //ACTION_NOT_SUPPORTED("CtlForceReequestBody", @0);
-        ACTION_CONTAINER(yylhs.value.as < std::unique_ptr<actions::Action> > (), new actions::Action(yystack_[1].value.as < std::string > ()));
+        ACTION_NOT_SUPPORTED("CtlForceRequestBodyVariable", yystack_[2].location);
+        //ACTION_CONTAINER($$, new actions::Action($1));
       }
 #line 4893 "seclang-parser.cc"
     break;
@@ -4895,8 +4895,8 @@ namespace yy {
   case 348: // act: "ACTION_CTL_FORCE_REQ_BODY_VAR" "CONFIG_VALUE_OFF"
 #line 2664 "seclang-parser.yy"
       {
-        //ACTION_NOT_SUPPORTED("CtlForceReequestBody", @0);
-        ACTION_CONTAINER(yylhs.value.as < std::unique_ptr<actions::Action> > (), new actions::Action(yystack_[1].value.as < std::string > ()));
+        ACTION_NOT_SUPPORTED("CtlForceRequestBodyVariable", yystack_[2].location);
+        //ACTION_CONTAINER($$, new actions::Action($1));
       }
 #line 4902 "seclang-parser.cc"
     break;
diff --git a/src/parser/seclang-parser.yy b/src/parser/seclang-parser.yy
index 93acac4f..95d85681 100644
--- a/src/parser/seclang-parser.yy
+++ b/src/parser/seclang-parser.yy
@@ -2626,18 +2626,18 @@ act:
       }
     | ACTION_CTL_AUDIT_ENGINE CONFIG_VALUE_ON
       {
-        //ACTION_NOT_SUPPORTED("CtlAuditEngine", @0);
-        ACTION_CONTAINER($$, new actions::Action($1));
+        ACTION_NOT_SUPPORTED("CtlAuditEngine", @0);
+        //ACTION_CONTAINER($$, new actions::Action($1));
       }
     | ACTION_CTL_AUDIT_ENGINE CONFIG_VALUE_OFF
       {
-        //ACTION_NOT_SUPPORTED("CtlAuditEngine", @0);
-        ACTION_CONTAINER($$, new actions::Action($1));
+        ACTION_NOT_SUPPORTED("CtlAuditEngine", @0);
+        //ACTION_CONTAINER($$, new actions::Action($1));
       }
     | ACTION_CTL_AUDIT_ENGINE CONFIG_VALUE_RELEVANT_ONLY
       {
-        //ACTION_NOT_SUPPORTED("CtlAuditEngine", @0);
-        ACTION_CONTAINER($$, new actions::Action($1));
+        ACTION_NOT_SUPPORTED("CtlAuditEngine", @0);
+        //ACTION_CONTAINER($$, new actions::Action($1));
       }
     | ACTION_CTL_AUDIT_LOG_PARTS
       {
@@ -2657,13 +2657,13 @@ act:
       }
     | ACTION_CTL_FORCE_REQ_BODY_VAR CONFIG_VALUE_ON
       {
-        //ACTION_NOT_SUPPORTED("CtlForceReequestBody", @0);
-        ACTION_CONTAINER($$, new actions::Action($1));
+        ACTION_NOT_SUPPORTED("CtlForceRequestBodyVariable", @0);
+        //ACTION_CONTAINER($$, new actions::Action($1));
       }
     | ACTION_CTL_FORCE_REQ_BODY_VAR CONFIG_VALUE_OFF
       {
-        //ACTION_NOT_SUPPORTED("CtlForceReequestBody", @0);
-        ACTION_CONTAINER($$, new actions::Action($1));
+        ACTION_NOT_SUPPORTED("CtlForceRequestBodyVariable", @0);
+        //ACTION_CONTAINER($$, new actions::Action($1));
       }
     | ACTION_CTL_REQUEST_BODY_ACCESS CONFIG_VALUE_ON
       {