yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13208 from SergeTupchiy/PATCH-EEC-1039-e5.6.0-jwks-user-agent 

PATCH fix(emqx_authn_jwks) add a user-agent header to jwks HTTP request
This commit is contained in:
zmstone 2024-06-08 18:15:43 +02:00 committed by GitHub
parent a2a598469e b6d7d8b5cd
commit 1863731ecb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx/include/emqx_release.hrl
View File

@ -35,4 +35,4 @@
-define(EMQX_RELEASE_CE, "5.6.1"). -define(EMQX_RELEASE_CE, "5.6.1").
%% Enterprise edition %% Enterprise edition
-define(EMQX_RELEASE_EE, "5.6.1"). -define(EMQX_RELEASE_EE, "5.6.1-patch.2").

2
apps/emqx/src/emqx.app.src
View File

@ -2,7 +2,7 @@
{application, emqx, [ {application, emqx, [
{id, "emqx"}, {id, "emqx"},
{description, "EMQX Core"}, {description, "EMQX Core"},
{vsn, "5.2.1"}, {vsn, "5.2.2"},
{modules, []}, {modules, []},
{registered, []}, {registered, []},
{applications, [ {applications, [

2
apps/emqx_auth_jwt/src/emqx_auth_jwt.app.src
View File

@ -1,7 +1,7 @@
%% -*- mode: erlang -*- %% -*- mode: erlang -*-
{application, emqx_auth_jwt, [ {application, emqx_auth_jwt, [
{description, "EMQX JWT Authentication and Authorization"}, {description, "EMQX JWT Authentication and Authorization"},
{vsn, "0.2.0"}, {vsn, "0.2.1"},
{registered, []}, {registered, []},
{mod, {emqx_auth_jwt_app, []}}, {mod, {emqx_auth_jwt_app, []}},
{applications, [ {applications, [

5
apps/emqx_auth_jwt/src/emqx_authn_jwks_client.erl
View File

@ -159,7 +159,10 @@ refresh_jwks(
case case
httpc:request( httpc:request(
get, get,
{Endpoint, [{"Accept", "application/json"}]}, {Endpoint, [
{"Accept", "application/json"},
{"User-Agent", "EMQX/" ++ emqx_release:version_with_prefix()}
]},
HTTPOpts, HTTPOpts,
[{body_format, binary}, {sync, false}, {receiver, self()}] [{body_format, binary}, {sync, false}, {receiver, self()}]
) )

3
mix.exs
View File

@ -100,7 +100,8 @@ defmodule EMQXUmbrella.MixProject do
{:rfc3339, github: "emqx/rfc3339", tag: "0.2.3", override: true}, {:rfc3339, github: "emqx/rfc3339", tag: "0.2.3", override: true},
{:bcrypt, github: "emqx/erlang-bcrypt", tag: "0.6.2", override: true}, {:bcrypt, github: "emqx/erlang-bcrypt", tag: "0.6.2", override: true},
{:uuid, github: "okeuday/uuid", tag: "v2.0.6", override: true}, {:uuid, github: "okeuday/uuid", tag: "v2.0.6", override: true},
{:quickrand, github: "okeuday/quickrand", tag: "v2.0.6", override: true} {:quickrand, github: "okeuday/quickrand", tag: "v2.0.6", override: true},
{:mimerl, "1.2.0", override: true}
] ++ ] ++
emqx_apps(profile_info, version) ++ emqx_apps(profile_info, version) ++
enterprise_deps(profile_info) ++ jq_dep() ++ quicer_dep() enterprise_deps(profile_info) ++ jq_dep() ++ quicer_dep()