valitydev/token-keeper
14
0
Fork 0
mirror of https://github.com/valitydev/token-keeper.git synced 2024-11-06 02:15:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ED-271: Don't allow to import duplicate keys on load (#16)

Browse Source
This commit is contained in:
Alexey S 2021-10-11 12:01:13 +03:00 committed by GitHub
parent 8dca9ed3c8
commit b870c4f7c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/tk_token_jwt.erl
View File

@ -337,7 +337,8 @@ ensure_store_key(KeyName, KeyOpts) ->
exit({import_error, KeyName, Source, Reason})
end.
-spec store_key(keyname(), {pem_file, file:filename()}, authority()) -> ok | {error, file:posix() | {unknown_key, _}}.
-spec store_key(keyname(), {pem_file, file:filename()}, authority()) ->
ok | {error, file:posix() | {unknown_key | duplicate_key, _}}.
store_key(Keyname, {pem_file, Filename}, Authority) ->
store_key(Keyname, {pem_file, Filename}, Authority, #{
kid => fun derive_kid_from_public_key_pem_entry/1
@ -354,12 +355,12 @@ derive_kid_from_public_key_pem_entry(JWK) ->
}.
-spec store_key(keyname(), {pem_file, file:filename()}, authority(), store_opts()) ->
ok | {error, file:posix() | {unknown_key, _}}.
ok | {error, file:posix() | {unknown_key | duplicate_key, _}}.
store_key(Keyname, {pem_file, Filename}, Authority, Opts) ->
case jose_jwk:from_pem_file(Filename) of
JWK = #jose_jwk{} ->
Key = construct_key(derive_kid(JWK, Opts), JWK),
ok = insert_key(Keyname, Key#{authority => Authority});
insert_unique_key(Keyname, Key#{authority => Authority});
Error = {error, _} ->
Error
end.
@ -389,6 +390,14 @@ construct_key(KID, JWK) ->
can_verify => Verifier /= undefined
}.
insert_unique_key(Keyname, KeyInfo = #{kid := KID}) ->
case get_key_by_kid(KID) of
undefined ->
insert_key(Keyname, KeyInfo);
_ ->
{error, {duplicate_key, Keyname}}
end.
insert_key(Keyname, KeyInfo = #{kid := KID}) ->
insert_values(#{
{keyname, Keyname} => KeyInfo,