Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions lib/ex_uid2/encryption/master_payload.ex
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,27 @@ defmodule ExUid2.Encryption.MasterPayload do
payload_size = byte_size(payload)
encrypted_data_size = payload_size - (@nonce_size + @tag_size)

<<nonce::binary-size(@nonce_size), data::binary-size(encrypted_data_size),
tag::binary-size(@tag_size)>> = payload
with {:parse_payload,
<<nonce::binary-size(@nonce_size), data::binary-size(encrypted_data_size),
tag::binary-size(@tag_size)>>} <- {:parse_payload, payload},
{:decrypt, {:ok, decrypted_bin}} <- {:decrypt, decrypt(key, nonce, data, tag)} do
parse_v3(decrypted_bin)
else
{:parse_payload, _} ->
{:error, :cannot_parse_encrypted_payload}

{:decrypt, error} ->
error
end
end

defp decrypt(key, nonce, data, tag) do
case :crypto.crypto_one_time_aead(:aes_256_gcm, key.secret, nonce, data, <<>>, tag, false) do
:error ->
{:error, :cannot_decrypt_payload}

decrypted_bin ->
parse_v3(decrypted_bin)
{:ok, decrypted_bin}
end
end

Expand Down
17 changes: 17 additions & 0 deletions test/master_payload_test.exs
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
defmodule Test.Encryption.MasterPayload do
use ExUnit.Case

alias ExUid2.Encryption.MasterPayload
alias ExUid2.Encryption.EncryptedToken

test "Invalid V3 Tokens return an error when they can't be parsed" do
key = "fake_key"

master_payload =
"invalid" |> Base.encode64()

token = %EncryptedToken{version: 3, master_payload: master_payload}

{:error, :cannot_parse_encrypted_payload} = MasterPayload.decrypt(token, key)
end
end
Loading