From 5bb21b1d29f58875fbac05a9fdfd49f84de991d8 Mon Sep 17 00:00:00 2001
From: William Lallemand <wlallemand@haproxy.com>
Date: Thu, 18 Jun 2020 18:56:44 +0200
Subject: [PATCH] REGTEST: http-rules: test spaces in ACLs with master CLI

Do the tests for spaces on the CLI with the master CLI.

Could be backported as far as 2.0 once the required patches are applied.
---
 reg-tests/http-rules/acl_cli_spaces.vtc | 34 ++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/reg-tests/http-rules/acl_cli_spaces.vtc b/reg-tests/http-rules/acl_cli_spaces.vtc
index fcae0c472..e67f7ce5a 100644
--- a/reg-tests/http-rules/acl_cli_spaces.vtc
+++ b/reg-tests/http-rules/acl_cli_spaces.vtc
@@ -1,7 +1,7 @@
-varnishtest "haproxy ACL, CLI and spaces"
+varnishtest "haproxy ACL, CLI and mCLI spaces"
 feature ignore_unknown_macro
 
-#REQUIRE_VERSION=1.6
+#REQUIRE_VERSION=2.0
 
 server s1 {
    rxreq
@@ -9,7 +9,7 @@ server s1 {
    txresp
 } -repeat 2 -start
 
-haproxy h1 -conf {
+haproxy h1 -W -S -conf {
   defaults
     mode http
     ${no-htx} option http-use-htx
@@ -50,3 +50,31 @@ client c1 -connect ${h1_fe1_sock} {
     rxresp
     expect resp.status == 403
 } -run
+
+
+haproxy h1 -cli {
+  send "del acl ${testdir}/agents.acl Mon\\ User\\ Agent\\;"
+  expect ~ .*
+
+  send "show acl ${testdir}/agents.acl"
+  expect ~ .*
+}
+
+client c1 -connect ${h1_fe1_sock} {
+    txreq -hdr "User-Agent: Mon User Agent;"
+    rxresp
+    expect resp.status == 200
+} -run
+
+
+# Try it with the master CLI
+haproxy h1 -mcli {
+  send "@1 add acl ${testdir}/agents.acl Mon\\ User\\ Agent\\;;@1 show acl ${testdir}/agents.acl"
+  expect ~ ".*Mon User Agent;.*"
+}
+
+client c1 -connect ${h1_fe1_sock} {
+    txreq -hdr "User-Agent: Mon User Agent;"
+    rxresp
+    expect resp.status == 403
+} -run