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

feat: don't merge default headers if user already setting one

This commit is contained in:
zhongwencool 2023-12-12 17:37:19 +08:00
parent 7f0cbcc323
commit c73b371a7a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx_auth/src/emqx_authn/emqx_authn_utils.erl
View File

@ -281,12 +281,12 @@ parse_url(Url) ->
end. end.
convert_headers(Headers) -> convert_headers(Headers) ->
maps:merge(default_headers(), transform_header_name(Headers)). transform_header_name(Headers).
convert_headers_no_content_type(Headers) -> convert_headers_no_content_type(Headers) ->
maps:without( maps:without(
[<<"content-type">>], [<<"content-type">>],
maps:merge(default_headers_no_content_type(), transform_header_name(Headers)) transform_header_name(Headers)
). ).
default_headers() -> default_headers() ->

12
apps/emqx_conf/test/emqx_conf_schema_tests.erl
View File

@ -358,7 +358,7 @@ authn_validations_test() ->
Headers0 = authentication_headers(Res0), Headers0 = authentication_headers(Res0),
?assertEqual(<<"application/json">>, maps:get(<<"content-type">>, Headers0)), ?assertEqual(<<"application/json">>, maps:get(<<"content-type">>, Headers0)),
%% accept from converter %% accept from converter
?assertEqual(<<"application/json">>, maps:get(<<"accept">>, Headers0)), ?assertNot(maps:is_key(<<"accept">>, Headers0)),
OKHttp = to_bin(?BASE_AUTHN_ARRAY, [post, false, <<"http://127.0.0.1:8080">>]), OKHttp = to_bin(?BASE_AUTHN_ARRAY, [post, false, <<"http://127.0.0.1:8080">>]),
Conf1 = <<BaseConf/binary, OKHttp/binary>>, Conf1 = <<BaseConf/binary, OKHttp/binary>>,
@ -366,7 +366,7 @@ authn_validations_test() ->
{_, Res1} = hocon_tconf:map_translate(emqx_conf_schema, ConfMap1, #{format => richmap}), {_, Res1} = hocon_tconf:map_translate(emqx_conf_schema, ConfMap1, #{format => richmap}),
Headers1 = authentication_headers(Res1), Headers1 = authentication_headers(Res1),
?assertEqual(<<"application/json">>, maps:get(<<"content-type">>, Headers1), Headers1), ?assertEqual(<<"application/json">>, maps:get(<<"content-type">>, Headers1), Headers1),
?assertEqual(<<"application/json">>, maps:get(<<"accept">>, Headers1), Headers1), ?assertNot(maps:is_key(<<"accept">>, Headers1)),
DisableSSLWithHttps = to_bin(?BASE_AUTHN_ARRAY, [post, false, <<"https://127.0.0.1:8080">>]), DisableSSLWithHttps = to_bin(?BASE_AUTHN_ARRAY, [post, false, <<"https://127.0.0.1:8080">>]),
Conf2 = <<BaseConf/binary, DisableSSLWithHttps/binary>>, Conf2 = <<BaseConf/binary, DisableSSLWithHttps/binary>>,
@ -382,16 +382,16 @@ authn_validations_test() ->
{_, Res3} = hocon_tconf:map_translate(emqx_conf_schema, ConfMap3, #{format => richmap}), {_, Res3} = hocon_tconf:map_translate(emqx_conf_schema, ConfMap3, #{format => richmap}),
Headers3 = authentication_headers(Res3), Headers3 = authentication_headers(Res3),
%% remove the content-type header when get method %% remove the content-type header when get method
?assertEqual(false, maps:is_key(<<"content-type">>, Headers3), Headers3), ?assertNot(maps:is_key(<<"content-type">>, Headers3), Headers3),
?assertEqual(<<"application/json">>, maps:get(<<"accept">>, Headers3), Headers3), ?assertNot(maps:is_key(<<"accept">>, Headers3), Headers3),
BadHeaderWithTuple = binary:replace(BadHeader, [<<"[">>, <<"]">>], <<"">>, [global]), BadHeaderWithTuple = binary:replace(BadHeader, [<<"[">>, <<"]">>], <<"">>, [global]),
Conf4 = <<BaseConf/binary, BadHeaderWithTuple/binary>>, Conf4 = <<BaseConf/binary, BadHeaderWithTuple/binary>>,
{ok, ConfMap4} = hocon:binary(Conf4, #{format => richmap}), {ok, ConfMap4} = hocon:binary(Conf4, #{format => richmap}),
{_, Res4} = hocon_tconf:map_translate(emqx_conf_schema, ConfMap4, #{}), {_, Res4} = hocon_tconf:map_translate(emqx_conf_schema, ConfMap4, #{}),
Headers4 = authentication_headers(Res4), Headers4 = authentication_headers(Res4),
?assertEqual(false, maps:is_key(<<"content-type">>, Headers4), Headers4), ?assertNot(maps:is_key(<<"content-type">>, Headers4), Headers4),
?assertEqual(<<"application/json">>, maps:get(<<"accept">>, Headers4), Headers4), ?assertNot(maps:is_key(<<"accept">>, Headers4), Headers4),
ok. ok.
%% erlfmt-ignore %% erlfmt-ignore