feat: fix ci

apache · Oct 12, 2023 · b51f672 · b51f672
1 parent 26cee67
commit b51f672
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 6 deletions.
diff --git a/apisix/plugins/jwe-decrypt.lua b/apisix/plugins/jwe-decrypt.lua
@@ -20,7 +20,7 @@ local base64          = require("ngx.base64")
 local ngx             = ngx
 local sub_str         = string.sub
 local plugin_name     = "jwe-decrypt"
-local cipher          = assert(require("resty.openssl.cipher").new("aes-256-gcm"))
+local cipher          = require("resty.openssl.cipher").new("aes-256-gcm")
 
 local schema          = {
   type = "object",
@@ -54,7 +54,7 @@ local consumer_schema = {
 
 local _M = {
   version = 0.1,
-  priority = 2510,
+  priority = 2509,
   type = 'auth',
   name = plugin_name,
   schema = schema,

diff --git a/conf/config-default.yaml b/conf/config-default.yaml
@@ -456,7 +456,6 @@ plugins:                           # plugin list (sorted by priority)
   - uri-blocker                    # priority: 2900
   - request-validation             # priority: 2800
   - chaitin-waf                    # priority: 2700
-  - jwe-decrypt                    # priority: 2600
   - openid-connect                 # priority: 2599
   - cas-auth                       # priority: 2597
   - authz-casbin                   # priority: 2560
@@ -466,6 +465,7 @@ plugins:                           # plugin list (sorted by priority)
   - hmac-auth                      # priority: 2530
   - basic-auth                     # priority: 2520
   - jwt-auth                       # priority: 2510
+  - jwe-decrypt                    # priority: 2509
   - key-auth                       # priority: 2500
   - consumer-restriction           # priority: 2400
   - forward-auth                   # priority: 2002

diff --git a/docs/en/latest/config.json b/docs/en/latest/config.json
@@ -101,6 +101,7 @@
           "items": [
             "plugins/key-auth",
             "plugins/jwt-auth",
+            "plugins/jwe-decrypt",
             "plugins/basic-auth",
             "plugins/authz-keycloak",
             "plugins/authz-casdoor",

diff --git a/docs/en/latest/plugins/jwe-decrypt.md b/docs/en/latest/plugins/jwe-decrypt.md
@@ -80,7 +80,7 @@ curl http://127.0.0.1:9180/apisix/admin/consumers -H 'X-API-KEY: edd1c9f034335f1
 }'
 ```
 
-:::
+:::note
 
 Once you have created a Consumer object, you can configure a Route to decrypt the header:
 
@@ -101,6 +101,8 @@ curl http://127.0.0.1:9180/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f13
 }'
 ```
 
+:::
+
 ## Example usage
 
 You need to first setup a Route for an API that signs the token using the [public-api](public-api.md) Plugin:
@@ -140,6 +142,7 @@ curl http://127.0.0.1:9080/anything/hello -H 'Authorization: eyJhbGciOiJkaXIiLCJ
 ```
 
 You can see header "Authorization" change to plaintext.
+
 ```
 HTTP/1.1 200 OK
 Content-Type: application/json

diff --git a/rockspec/apisix-master-0.rockspec b/rockspec/apisix-master-0.rockspec
@@ -79,7 +79,8 @@ dependencies = {
     "nanoid = 0.1-1",
     "lua-resty-mediador = 0.1.2-1",
     "lua-resty-ldap = 0.1.0-0",
-    "lua-resty-t1k = 1.1.0"
+    "lua-resty-t1k = 1.1.0",
+    "lua-resty-openssl = 0.8.25-1"
 }
 
 build = {

diff --git a/t/admin/plugins.t b/t/admin/plugins.t
@@ -84,6 +84,7 @@ ldap-auth
 hmac-auth
 basic-auth
 jwt-auth
+jwe-decrypt
 key-auth
 consumer-restriction
 forward-auth
@@ -311,7 +312,7 @@ qr/\{"metadata_schema":\{"properties":\{"ikey":\{"minimum":0,"type":"number"\},"
         }
     }
 --- response_body eval
-qr/\[\{"name":"wolf-rbac","priority":2555\},\{"name":"ldap-auth","priority":2540\},\{"name":"hmac-auth","priority":2530\},\{"name":"basic-auth","priority":2520\},\{"name":"jwt-auth","priority":2510\},\{"name":"key-auth","priority":2500\}\]/
+qr/\[\{"name":"wolf-rbac","priority":2555\},\{"name":"ldap-auth","priority":2540\},\{"name":"hmac-auth","priority":2530\},\{"name":"basic-auth","priority":2520\},\{"name":"jwt-auth","priority":2510\},\{"name":"jwe-decrypt","priority":2509\},\{"name":"key-auth","priority":2500\}\]/
 
 
 

diff --git a/t/plugin/jwe-decrypt.t b/t/plugin/jwe-decrypt.t
@@ -72,6 +72,8 @@ qr/{"key":"123","secret":"[a-zA-Z0-9+\\\/]+={0,2}"}/
 property "key" validation failed: wrong type: expected string, got number
 done
 
+
+
 === TEST 3: wrong type of string
 --- config
     location /t {
@@ -90,6 +92,8 @@ done
 property "secret" validation failed: string too short, expected at least 32, got 6
 done
 
+
+
 === TEST 4: add consumer with username and plugins
 --- config
     location /t {