Add list() type support for opts paramter

G-Corp · May 8, 2020 · 3cd56a3 · 3cd56a3
1 parent 7cce3a4
commit 3cd56a3
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -59,12 +59,6 @@ jwerl:verify(Jwt, rs512, PublcPem).
 {ok, PublcPem} = file:read_file("path/to/es_public.pem"),
 Jwt = jwerl:sign([{name, <<"bob">>}], es256, PrivtPem).
 jwerl:verify(Jwt, es256, PublcPem).
-
-% Compatibility
-%   - sign/verify the signature with raw format instead of DER
-%   - it is necessary to compatible with nodejs or other platforms
-Jwt = jwerl:sign([{name, <<"bob">>}], es256, PrivtPem, #{raw => true}).
-jwerl:verify(Jwt, es256, PublcPem, Claims, #{raw => true}).
 ```
 
 
@@ -99,7 +93,6 @@ Jwerl.verify(jwt, :rs512, public_pem)
 {ok, public_pem} = File.read("path/to/es_public.pem")
 jwt = Jwerl.sign([name: "bob"], :es256, private_pem)
 Jwerl.verify(jwt, :es256, public_pem)
-
 ```
 
 

diff --git a/overview.edoc b/overview.edoc
@@ -53,6 +53,12 @@ jwerl:verify(Jwt, rs512, PublcPem).
 {ok, PublcPem} = file:read_file("path/to/es_public.pem"),
 Jwt = jwerl:sign([{name, &lt;&lt;"bob"&gt;&gt;}], es256, PrivtPem).
 jwerl:verify(Jwt, es256, PublcPem).
+
+% Compatibility
+%   - sign/verify the signature with raw format instead of DER
+%   - it is necessary to compatible with nodejs or other platforms
+Jwt = jwerl:sign([{name, <<"bob">>}], es256, PrivtPem, #{raw => true}).
+jwerl:verify(Jwt, es256, PublcPem, Claims, #{raw => true}).
 </pre>
 
 <h3>Elixir</h3>
@@ -85,6 +91,12 @@ Jwerl.verify(jwt, :rs512, public_pem)
 {ok, public_pem} = File.read("path/to/es_public.pem")
 jwt = Jwerl.sign([name: "bob"], :es256, private_pem)
 Jwerl.verify(jwt, :es256, public_pem)
+
+% Compatibility
+%   - sign/verify the signature with raw format instead of DER
+%   - it is necessary to compatible with nodejs or other platforms
+Jwt = Jwerl:sign([name: "bob"], :es256, private_pem, [raw: true])
+Jwerl.verify(jwt, :es256, public_pem, claims, [raw: true])
 </pre>
 
 <h2>Licence</h2>

diff --git a/src/jwerl.erl b/src/jwerl.erl
@@ -47,7 +47,7 @@ sign(Data, Algorithm, KeyOrPem) ->
 % Token = jwerl:sign(#{key =&gt; &lt;&lt;"Hello World"&gt;&gt;}, hs256, &lt;&lt;"s3cr3t k3y"&gt;&gt;).
 % </pre>
 % @end
--spec sign(Data :: map() | list(), Algorithm :: algorithm(), KeyOrPem :: binary(), Opts :: map()) -> binary().
+-spec sign(Data :: map() | list(), Algorithm :: algorithm(), KeyOrPem :: binary(), Opts :: map() | list()) -> binary().
 sign(Data, Algorithm, KeyOrPem, Opts) when (is_map(Data) orelse is_list(Data)), is_atom(Algorithm), is_binary(KeyOrPem), is_map(Opts) ->
     encode(jsx:encode(Data), config_headers(#{alg => algorithm_to_binary(Algorithm)}), KeyOrPem, Opts).
 
@@ -77,7 +77,7 @@ verify(Data, Algorithm, KeyOrPem, Claims) ->
 %                                                            aud =&gt; [&lt;&lt;"world"&gt;&gt;, &lt;&lt;"aliens"&gt;&gt;]}).
 % </pre>
 % @end
--spec verify(Data :: binary(), Algorithm :: algorithm(), KeyOrPem :: binary(), CheckClaims :: map() | list() | false, Opts :: map()) ->
+-spec verify(Data :: binary(), Algorithm :: algorithm(), KeyOrPem :: binary(), CheckClaims :: map() | list() | false, Opts :: map() | list()) ->
   {ok, map()} | {error, term()}.
 verify(Data, Algorithm, KeyOrPem, Claims, Opts) ->
   case decode(Data, KeyOrPem, Algorithm, Opts) of
@@ -110,11 +110,11 @@ check_claims(TokenData, Claims, Opts) ->
   claims_errors(
     [
      check_claim(TokenData, exp, false, fun(ExpireTime) ->
-                                            ExpLeeway = maps:get(exp_leeway, Opts, 0),
+                                            ExpLeeway = get_value(exp_leeway, Opts, 0),
                                             Now < ExpireTime + ExpLeeway
                                         end, exp),
      check_claim(TokenData, iat, false, fun(IssuedAt) ->
-                                            IatLeeway = maps:get(iat_leeway, Opts, 0),
+                                            IatLeeway = get_value(iat_leeway, Opts, 0),
                                             IssuedAt - IatLeeway =< Now
                                         end, iat),
      check_claim(TokenData, nbf, false, fun(NotBefore) ->
@@ -233,7 +233,7 @@ payload(Data, Algorithm, Key, Opts) ->
   [Header, Data1, Signature0] = binary:split(Data, <<".">>, [global]),
   {AlgMod, ShaBits} = algorithm_to_infos(Algorithm),
 
-  Signature = case maps:get(raw, Opts, false) of
+  Signature = case get_value(raw, Opts, false) of
                   true -> raw_to_der(base64_decode(Signature0));
                   _ -> base64_decode(Signature0)
               end,
@@ -253,14 +253,19 @@ encode_input(Data, Options) ->
 signature(Algorithm, Key, Data, Opts) ->
   {AlgMod, ShaBits} = algorithm_to_infos(Algorithm),
   Signature0 = erlang:apply(AlgMod, sign, [ShaBits, Key, Data]),
-  Signature = case maps:get(raw, Opts, false) of
+  Signature = case get_value(raw, Opts, false) of
                   true ->
                       der_to_raw(Signature0);
                   _ ->
                       Signature0
               end,
   base64_encode(Signature).
 
+get_value(K, T, Default) when is_list(T) ->
+    proplists:get_value(K, T, Default);
+get_value(K, M, Default) when is_map(M) ->
+    maps:get(K, M, Default).
+
 der_to_raw(<<48,_,_, L1, R:L1/binary, _, L2, S:L2/binary>>) ->
     <<(trim_zero_padding(R))/binary, (trim_zero_padding(S))/binary>>.
 

diff --git a/test/jwerl_tests.erl b/test/jwerl_tests.erl
@@ -115,7 +115,6 @@ t_jwerl_ecdsa() ->
                              jwerl:sign(Data, es512, ec_private_key()),
                              es512,
                              ec_public_key())),
-
   ?assertMatch({ok, Data}, jwerl:verify(
                              jwerl:sign(Data, es512, ec_private_key(), #{raw => true}),
                              es512,