Jelajahi Sumber

chore(authz): fix Mysql variable substitution

Ilya Averyanov 4 tahun lalu
induk
melakukan
e24cdb067c
1 mengubah file dengan 2 tambahan dan 2 penghapusan
  1. 2 2
      apps/emqx_authz/src/emqx_authz_mysql.erl

+ 2 - 2
apps/emqx_authz/src/emqx_authz_mysql.erl

@@ -108,8 +108,8 @@ replvar([], _ClientInfo, Acc) ->
 
 
 replvar([?PH_S_USERNAME | Params], ClientInfo, Acc) ->
 replvar([?PH_S_USERNAME | Params], ClientInfo, Acc) ->
     replvar(Params, ClientInfo, [safe_get(username, ClientInfo) | Acc]);
     replvar(Params, ClientInfo, [safe_get(username, ClientInfo) | Acc]);
-replvar([?PH_S_CLIENTID | Params], ClientInfo = #{clientid := ClientId}, Acc) ->
-    replvar(Params, ClientInfo, [ClientId | Acc]);
+replvar([?PH_S_CLIENTID | Params], ClientInfo = #{clientid := _ClientId}, Acc) ->
+    replvar(Params, ClientInfo, [safe_get(clientid, ClientInfo) | Acc]);
 replvar([?PH_S_PEERHOST | Params], ClientInfo = #{peerhost := IpAddr}, Acc) ->
 replvar([?PH_S_PEERHOST | Params], ClientInfo = #{peerhost := IpAddr}, Acc) ->
     replvar(Params, ClientInfo, [inet_parse:ntoa(IpAddr) | Acc]);
     replvar(Params, ClientInfo, [inet_parse:ntoa(IpAddr) | Acc]);
 replvar([?PH_S_CERT_CN_NAME | Params], ClientInfo, Acc) ->
 replvar([?PH_S_CERT_CN_NAME | Params], ClientInfo, Acc) ->