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
22 changes: 15 additions & 7 deletions lib/plug/crypto.ex
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,9 @@ defmodule Plug.Crypto do
%{data: data, signed: signed} -> {data, signed, 86400}
end

if expired?(signed, Keyword.get(opts, :max_age, max_age)) do
{:error, :expired}
else
{:ok, data}
case validate_age(signed, Keyword.get(opts, :max_age, max_age)) do
:ok -> {:ok, data}
error -> error
end
end

Expand All @@ -351,9 +350,18 @@ defmodule Plug.Crypto do
KeyGenerator.generate(secret_key_base, salt, iterations, length, digest, cache)
end

defp expired?(_signed, :infinity), do: false
defp expired?(_signed, max_age_secs) when max_age_secs <= 0, do: true
defp expired?(signed, max_age_secs), do: signed + trunc(max_age_secs * 1000) < now_ms()
defp validate_age(_signed, :infinity), do: :ok
defp validate_age(_signed, max_age_secs) when max_age_secs <= 0, do: {:error, :expired}

defp validate_age(signed, max_age_secs) do
now = now_ms()

cond do
signed > now -> {:error, :invalid}
signed + trunc(max_age_secs * 1000) < now -> {:error, :expired}
true -> :ok
end
end

defp now_ms, do: System.os_time(:millisecond)
end
5 changes: 5 additions & 0 deletions test/plug/crypto_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,11 @@ defmodule Plug.CryptoTest do
{:error, :expired}
end

test "ensures signed_at is not in future while decrypting" do
token = encrypt(@key, "secret", 1, signed_at: System.os_time(:second) + 31_536_000)
assert {:error, :invalid} = decrypt(@key, "secret", token)
end

test "passes key_iterations options to key generator" do
signed1 = encrypt(@key, "secret", 1, signed_at: 0, key_iterations: 1)
signed2 = encrypt(@key, "secret", 1, signed_at: 0, key_iterations: 2)
Expand Down
Loading