fix: workflow plugin should support operator (apache#8121)

Liu-Junlin · Nov 4, 2022 · 41d7dae · 41d7dae
1 parent fd4695b
commit 41d7dae
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 1 deletion.
diff --git a/apisix/plugins/workflow.lua b/apisix/plugins/workflow.lua
@@ -30,7 +30,14 @@ local schema = {
                     case = {
                         type = "array",
                         items = {
-                            type = "array",
+                            anyOf = {
+                                {
+                                    type = "array",
+                                },
+                                {
+                                    type = "string",
+                                },
+                            }
                         },
                         minItems = 1,
                     },

diff --git a/t/plugin/workflow.t b/t/plugin/workflow.t
@@ -687,3 +687,63 @@ passed
 "GET /hello", "GET /hello1", "GET /hello", "GET /hello1"]
 --- error_code eval
 [200, 200, 200, 200, 200, 200, 503, 503]
+
+
+
+=== TEST 19: multiple conditions in one case
+--- config
+    location /t {
+        content_by_lua_block {
+            local t = require("lib.test_admin").test
+            local code, body = t('/apisix/admin/routes/1',
+                 ngx.HTTP_PUT,
+                 [[{
+                        "plugins": {
+                            "workflow": {
+                                "rules": [
+                                    {
+                                        "case": [
+                                            "OR",
+                                            ["arg_foo", "==", "bar"],
+                                            ["uri", "==", "/hello"]
+                                        ],
+                                        "actions": [
+                                            [
+                                                "return",
+                                                {
+                                                    "code": 403
+                                                }
+                                            ]
+                                        ]
+                                    }
+                                ]
+                            }
+                        },
+                        "upstream": {
+                            "nodes": {
+                                "127.0.0.1:1980": 1
+                            },
+                            "type": "roundrobin"
+                        },
+                        "uri": "/hello"
+                }]]
+            )
+
+            if code >= 300 then
+                ngx.status = code
+            end
+
+            ngx.say(body)
+        }
+    }
+--- response_body
+passed
+
+
+
+=== TEST 20: trigger workflow
+--- request
+GET /hello
+--- error_code: 403
+--- response_body
+{"error_msg":"rejected by workflow"}