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

fix(license): allow CRLF in license keys

This commit is contained in:
Zaiming (Stone) Shi 2023-11-22 21:23:49 +01:00
parent 48b69bd60c
commit 7375bc5f9b
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/emqx_license/src/emqx_license_parser_v20220101.erl
View File

@ -85,8 +85,9 @@ max_connections(#{max_connections := MaxConns}) ->
%% Private functions %% Private functions
%%------------------------------------------------------------------------------ %%------------------------------------------------------------------------------
do_parse(Content) -> do_parse(Content0) ->
try try
Content = trim(Content0),
[EncodedPayload, EncodedSignature] = binary:split(Content, <<".">>), [EncodedPayload, EncodedSignature] = binary:split(Content, <<".">>),
Payload = base64:decode(EncodedPayload), Payload = base64:decode(EncodedPayload),
Signature = base64:decode(EncodedSignature), Signature = base64:decode(EncodedSignature),
@ -96,6 +97,13 @@ do_parse(Content) ->
{error, bad_license_format} {error, bad_license_format}
end. end.
trim(Bin) ->
trim(trim(Bin, $\n), $\r).
trim(Bin, C) ->
[OneValue] = lists:filter(fun(X) -> X =/= <<>> end, binary:split(Bin, <<C:8>>, [global])),
OneValue.
verify_signature(Payload, Signature, Key) -> verify_signature(Payload, Signature, Key) ->
public_key:verify(Payload, ?DIGEST_TYPE, Signature, Key). public_key:verify(Payload, ?DIGEST_TYPE, Signature, Key).