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

chore: fix bad conflict resolution

This commit is contained in:
zmstone 2024-06-14 16:57:53 +02:00
parent b86d631744
commit 626aae6edf
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/emqx/integration_test/emqx_persistent_session_ds_SUITE.erl
View File

@ -251,7 +251,7 @@ t_session_subscription_idempotency(Config) ->
ok ok
end, end,
fun(Trace) -> fun(_Trace) ->
Session = session_open(Node1, ClientId), Session = session_open(Node1, ClientId),
?assertMatch( ?assertMatch(
#{SubTopicFilter := #{}}, #{SubTopicFilter := #{}},
@ -324,7 +324,7 @@ t_session_unsubscription_idempotency(Config) ->
ok ok
end, end,
fun(Trace) -> fun(_Trace) ->
Session = session_open(Node1, ClientId), Session = session_open(Node1, ClientId),
?assertEqual( ?assertEqual(
#{}, #{},

2
apps/emqx/src/emqx_channel.erl
View File

@ -1738,7 +1738,7 @@ maybe_add_cert(Map, #channel{conninfo = ConnInfo}) ->
maybe_add_cert(Map, ConnInfo); maybe_add_cert(Map, ConnInfo);
maybe_add_cert(Map, #{peercert := PeerCert}) when is_binary(PeerCert) -> maybe_add_cert(Map, #{peercert := PeerCert}) when is_binary(PeerCert) ->
%% NOTE: it's raw binary at this point, %% NOTE: it's raw binary at this point,
%% encoding to PEM (base64) is done lazy in emqx_authn_utils:render_var %% encoding to PEM (base64) is done lazy in emqx_auth_utils:render_var
Map#{cert_pem => PeerCert}; Map#{cert_pem => PeerCert};
maybe_add_cert(Map, _) -> maybe_add_cert(Map, _) ->
Map. Map.

1
apps/emqx_auth/include/emqx_authn.hrl
View File

@ -39,6 +39,7 @@
?VAR_PEERHOST, ?VAR_PEERHOST,
?VAR_CERT_SUBJECT, ?VAR_CERT_SUBJECT,
?VAR_CERT_CN_NAME, ?VAR_CERT_CN_NAME,
?VAR_CERT_PEM,
?VAR_NS_CLIENT_ATTRS ?VAR_NS_CLIENT_ATTRS
]). ]).

2
apps/emqx_auth/src/emqx_auth_utils.erl
View File

@ -207,6 +207,8 @@ render_var(_, undefined) ->
% Any allowed but undefined binding will be replaced with empty string, even when % Any allowed but undefined binding will be replaced with empty string, even when
% rendering SQL values. % rendering SQL values.
<<>>; <<>>;
render_var(?VAR_CERT_PEM, Value) ->
base64:encode(Value);
render_var(?VAR_PEERHOST, Value) -> render_var(?VAR_PEERHOST, Value) ->
inet:ntoa(Value); inet:ntoa(Value);
render_var(?VAR_PASSWORD, Value) -> render_var(?VAR_PASSWORD, Value) ->