Skip to content

Commit

Permalink
feat(jwt-auth): support configuring key_claim_name
Browse files Browse the repository at this point in the history
  • Loading branch information
shreemaan-abhishek committed Nov 21, 2024
1 parent 4bbb7cc commit 42254a4
Show file tree
Hide file tree
Showing 3 changed files with 175 additions and 2 deletions.
11 changes: 9 additions & 2 deletions apisix/plugins/jwt-auth.lua
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@ local schema = {
hide_credentials = {
type = "boolean",
default = false
}
},
key_claim_name = {
type = "string",
default = "key"
},
},
}

Expand Down Expand Up @@ -240,7 +244,9 @@ function _M.rewrite(conf, ctx)
return 401, {message = "JWT token invalid"}
end

local user_key = jwt_obj.payload and jwt_obj.payload.key
local key_claim_name = conf.key_claim_name
core.log.warn("dibag: ", core.json.encode(jwt_obj, true))
local user_key = jwt_obj.payload and jwt_obj.payload[key_claim_name]
if not user_key then
return 401, {message = "missing user key in JWT token"}
end
Expand All @@ -258,6 +264,7 @@ function _M.rewrite(conf, ctx)
end
core.log.info("consumer: ", core.json.delay_encode(consumer))

core.log.warn("dibag: ", core.json.encode(consumer.auth_conf))
local auth_secret, err = get_auth_secret(consumer.auth_conf)
if not auth_secret then
core.log.error("failed to retrieve secrets, err: ", err)
Expand Down
4 changes: 4 additions & 0 deletions ci/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ create_lua_deps() {
echo "Create lua deps"

make deps

# just for jwt-auth test
luarocks install lua-resty-openssl --tree deps

# maybe reopen this feature later
# luarocks install luacov-coveralls --tree=deps --local > build.log 2>&1 || (cat build.log && exit 1)
# for github action cache
Expand Down
162 changes: 162 additions & 0 deletions t/plugin/jwt-auth4.t
Original file line number Diff line number Diff line change
@@ -0,0 +1,162 @@
#
# 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.
#

use t::APISIX 'no_plan';

repeat_each(1);
no_long_string();
no_root_location();
no_shuffle();

add_block_preprocessor(sub {
my ($block) = @_;

if ((!defined $block->error_log) && (!defined $block->no_error_log)) {
$block->set_value("no_error_log", "[error]");
}

if (!defined $block->request) {
$block->set_value("request", "GET /t");
if (!$block->response_body) {
$block->set_value("response_body", "passed\n");
}
}
});

run_tests;

__DATA__
=== TEST 1: add consumer with username and plugins
--- config
location /t {
content_by_lua_block {
local t = require("lib.test_admin").test
local code, body = t('/apisix/admin/consumers',
ngx.HTTP_PUT,
[[{
"username": "jack",
"plugins": {
"jwt-auth": {
"key": "user-key",
"secret": "my-secret-key"
}
}
}]]
)
if code >= 300 then
ngx.status = code
end
ngx.say(body)
}
}
--- response_body
passed
=== TEST 2: enable jwt auth plugin using admin api
--- 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": {
"jwt-auth": {
"key": "user-key",
"secret": "my-secret-key",
"key_claim_name": "iss"
}
},
"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 3: verify (in header)
--- config
location /t {
content_by_lua_block {
local function gen_token(payload)
local buffer = require "string.buffer"
local openssl_mac = require "resty.openssl.mac"
local base64 = require "ngx.base64"
local base64_encode = base64.encode_base64url
local json = require("cjson")
local function sign(data, key)
return openssl_mac.new(key, "HMAC", nil, "sha256"):final(data)
end
local header = { typ = "JWT", alg = "HS256" }
local buf = buffer.new()
buf:put(base64_encode(json.encode(header))):put("."):put(base64_encode(json.encode(payload)))
local ok, signature = pcall(sign, buf:tostring(), "my-secret-key")
if not ok then
return nil, signature
end
buf:put("."):put(base64_encode(signature))
return buf:get()
end
local payload = {
sub = "1234567890",
iss = "user-key",
exp = 9916239022
}
local token = gen_token(payload)
local http = require("resty.http")
local uri = "http://127.0.0.1:" .. ngx.var.server_port .. "/hello"
local opt = {method = "POST", headers = {["Authorization"] = "Bearer " .. token}}
local httpc = http.new()
local res = httpc:request_uri(uri, opt)
assert(res.status == 200)
ngx.print(res.body)
}
}
--- request
GET /t
--- more_headers
--- response_body
hello world

0 comments on commit 42254a4

Please sign in to comment.