You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by to...@apache.org on 2021/04/14 02:06:03 UTC

[apisix-ingress-controller] branch master updated: test: add e2e test cases for request-validation plugin (#363)

This is an automated email from the ASF dual-hosted git repository.

tokers pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


The following commit(s) were added to refs/heads/master by this push:
     new 91a6f1f  test: add e2e test cases for request-validation plugin (#363)
91a6f1f is described below

commit 91a6f1fe85a57882f1b2f388e4286d13ad55c227
Author: Alex Zhang <zc...@gmail.com>
AuthorDate: Wed Apr 14 10:05:56 2021 +0800

    test: add e2e test cases for request-validation plugin (#363)
---
 conf/config-default.yaml               |   2 +-
 test/e2e/plugins/request-validation.go | 196 +++++++++++++++++++++++++++++++++
 2 files changed, 197 insertions(+), 1 deletion(-)

diff --git a/conf/config-default.yaml b/conf/config-default.yaml
index fd890a5..e255b18 100644
--- a/conf/config-default.yaml
+++ b/conf/config-default.yaml
@@ -57,4 +57,4 @@ kubernetes:
 # APISIX related configurations.
 apisix:
   base_url: "http://127.0.0.1:9080/apisix/admin" # the APISIX admin api / manager api
-                                           # base url, it's required.
+                                                 # base url, it's required.
diff --git a/test/e2e/plugins/request-validation.go b/test/e2e/plugins/request-validation.go
new file mode 100644
index 0000000..12e3758
--- /dev/null
+++ b/test/e2e/plugins/request-validation.go
@@ -0,0 +1,196 @@
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements.  See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License.  You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package plugins
+
+import (
+	"fmt"
+
+	"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
+	"github.com/onsi/ginkgo"
+	"github.com/stretchr/testify/assert"
+)
+
+var _ = ginkgo.Describe("redirect plugin", func() {
+	opts := &scaffold.Options{
+		Name:                    "default",
+		Kubeconfig:              scaffold.GetKubeconfig(),
+		APISIXConfigPath:        "testdata/apisix-gw-config.yaml",
+		APISIXDefaultConfigPath: "testdata/apisix-gw-config-default.yaml",
+		IngressAPISIXReplicas:   1,
+		HTTPBinServicePort:      80,
+		APISIXRouteVersion:      "apisix.apache.org/v2alpha1",
+	}
+	s := scaffold.NewScaffold(opts)
+	ginkgo.It("sanity", func() {
+		backendSvc, backendPorts := s.DefaultHTTPBackend()
+		ar := fmt.Sprintf(`
+apiVersion: apisix.apache.org/v2alpha1
+kind: ApisixRoute
+metadata:
+ name: httpbin-route
+spec:
+ http:
+ - name: rule1
+   match:
+     hosts:
+     - httpbin.org
+     paths:
+       - /post
+   backends:
+   - serviceName: %s
+     servicePort: %d
+     weight: 10
+   plugins:
+   - name: request-validation
+     enable: true
+     config:
+       body_schema:
+         type: object
+         properties:
+           name:
+             type: string
+             minLength: 5
+           id:
+             type: integer
+             minimum: 20
+         required:
+         - id
+       header_schema:
+         type: object
+         properties:
+           user-agent:
+             type: string
+             pattern: .*Mozilla.*
+`, backendSvc, backendPorts[0])
+
+		assert.Nil(ginkgo.GinkgoT(), s.CreateResourceFromString(ar))
+		err := s.EnsureNumApisixUpstreamsCreated(1)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixRoutesCreated(1)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
+		// header schema check failure.
+		resp := s.NewAPISIXClient().POST("/post").WithHeader("Host", "httpbin.org").WithHeader("User-Agent", "bad-ua").Expect()
+		resp.Status(400)
+
+		payload := []byte(`
+{
+    "name": "bob",
+    "id": 33
+}
+		`)
+		// body schema check failure.
+		resp = s.NewAPISIXClient().POST("/post").WithHeader("Host", "httpbin.org").WithHeader("User-Agent", "aaaMozillabb").WithBytes(payload).Expect()
+		resp.Status(400)
+
+		payload = []byte(`
+{
+    "name": "long-name",
+    "id": 11
+}
+		`)
+		// body schema check failure.
+		resp = s.NewAPISIXClient().POST("/post").WithHeader("Host", "httpbin.org").WithHeader("User-Agent", "aaaMozillabb").WithBytes(payload).Expect()
+		resp.Status(400)
+
+		payload = []byte(`
+{
+    "name": "long-name",
+    "id": 55
+}
+		`)
+		resp = s.NewAPISIXClient().POST("/post").WithHeader("Host", "httpbin.org").WithHeader("User-Agent", "aaaMozillabb").WithBytes(payload).Expect()
+		resp.Status(200)
+	})
+
+	ginkgo.It("disable plugin", func() {
+		backendSvc, backendPorts := s.DefaultHTTPBackend()
+		ar := fmt.Sprintf(`
+apiVersion: apisix.apache.org/v2alpha1
+kind: ApisixRoute
+metadata:
+ name: httpbin-route
+spec:
+ http:
+ - name: rule1
+   match:
+     hosts:
+     - httpbin.org
+     paths:
+       - /post
+   backends:
+   - serviceName: %s
+     servicePort: %d
+     weight: 10
+   plugins:
+   - name: request-validation
+     enable: false
+     config:
+       body_schema:
+         type: object
+         properties:
+           name:
+             type: string
+             minLength: 5
+           id:
+             type: integer
+             minimum: 20
+         required:
+         - id
+       header_schema:
+         type: object
+         properties:
+           user-agent:
+             type: string
+             pattern: .*Mozilla.*
+`, backendSvc, backendPorts[0])
+
+		assert.Nil(ginkgo.GinkgoT(), s.CreateResourceFromString(ar))
+		err := s.EnsureNumApisixUpstreamsCreated(1)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of upstreams")
+		err = s.EnsureNumApisixRoutesCreated(1)
+		assert.Nil(ginkgo.GinkgoT(), err, "Checking number of routes")
+		resp := s.NewAPISIXClient().POST("/post").WithHeader("Host", "httpbin.org").WithHeader("User-Agent", "bad-ua").Expect()
+		resp.Status(200)
+
+		payload := []byte(`
+{
+    "name": "bob",
+    "id": 33
+}
+		`)
+		// body schema check failure.
+		resp = s.NewAPISIXClient().POST("/post").WithHeader("Host", "httpbin.org").WithHeader("User-Agent", "aaaMozillabb").WithBytes(payload).Expect()
+		resp.Status(200)
+
+		payload = []byte(`
+{
+    "name": "long-name",
+    "id": 11
+}
+		`)
+		// body schema check failure.
+		resp = s.NewAPISIXClient().POST("/post").WithHeader("Host", "httpbin.org").WithHeader("User-Agent", "aaaMozillabb").WithBytes(payload).Expect()
+		resp.Status(200)
+
+		payload = []byte(`
+{
+    "name": "long-name",
+    "id": 55
+}
+		`)
+		resp = s.NewAPISIXClient().POST("/post").WithHeader("Host", "httpbin.org").WithHeader("User-Agent", "aaaMozillabb").WithBytes(payload).Expect()
+		resp.Status(200)
+	})
+})