BUG/MEDIUM: make ACL Value optional

haproxytech · Aug 1, 2023 · a0b117c · a0b117c
1 parent 278d806
commit a0b117c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 20 deletions.
diff --git a/configuration/acl_test.go b/configuration/acl_test.go
@@ -79,6 +79,7 @@ func TestClient_GetACLs(t *testing.T) {
 				&models.ACL{ACLName: "invalid_src", Criterion: "src", Index: misc.Int64P(0), Value: "0.0.0.0/7 224.0.0.0/3"},
 				&models.ACL{ACLName: "invalid_src", Criterion: "src_port", Index: misc.Int64P(1), Value: "0:1023"},
 				&models.ACL{ACLName: "local_dst", Criterion: "hdr(host)", Index: misc.Int64P(2), Value: "-i localhost"},
+				&models.ACL{ACLName: "waf_wafTest_drop", Criterion: "var(txn.wafTest.drop),bool", Index: misc.Int64P(3), Value: ""},
 			},
 			wantErr: false,
 		},
@@ -246,7 +247,7 @@ func TestCreateEditDeleteACL(t *testing.T) {
 	}
 
 	// TestDeleteACL
-	err = clientTest.DeleteACL(3, "frontend", "test", "", version)
+	err = clientTest.DeleteACL(4, "frontend", "test", "", version)
 	if err != nil {
 		t.Error(err.Error())
 	} else {
@@ -257,9 +258,9 @@ func TestCreateEditDeleteACL(t *testing.T) {
 		t.Error("Version not incremented")
 	}
 
-	_, _, err = clientTest.GetACL(3, "frontend", "test", "")
+	_, _, err = clientTest.GetACL(4, "frontend", "test", "")
 	if err == nil {
-		t.Error("DeleteACL failed, ACL Rule 3 still exists")
+		t.Error("DeleteACL failed, ACL Rule 4 still exists")
 	}
 
 	err = clientTest.DeleteACL(2, "backend", "test_2", "", version)

diff --git a/configuration/configuration_test.go b/configuration/configuration_test.go
@@ -335,6 +335,7 @@ frontend test
   acl invalid_src  src          0.0.0.0/7 224.0.0.0/3
   acl invalid_src  src_port     0:1023
   acl local_dst    hdr(host) -i localhost
+  acl waf_wafTest_drop var(txn.wafTest.drop),bool
   monitor-uri /healthz
   monitor fail if site_dead
   filter trace name BEFORE-HTTP-COMP random-parsing hexdump

diff --git a/models/acl.go b/models/acl.go
diff --git a/specification/build/haproxy_spec.yaml b/specification/build/haproxy_spec.yaml
@@ -6962,7 +6962,6 @@ definitions:
           - index
           - acl_name
           - criterion
-          - value
       title: ACL Lines
       type: object
   acls:

diff --git a/specification/models/configuration/acl.yaml b/specification/models/configuration/acl.yaml
@@ -10,7 +10,6 @@ acl:
     - index
     - acl_name
     - criterion
-    - value
   properties:
     index:
       type: integer