we may as well handle (expires) as well
All checks were successful
ci/woodpecker/push/lint Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/push/build-amd64 Pipeline was successful
ci/woodpecker/push/build-arm64 Pipeline was successful
ci/woodpecker/push/docs Pipeline was successful
ci/woodpecker/pr/lint Pipeline was successful
ci/woodpecker/pr/test Pipeline was successful
ci/woodpecker/pr/build-amd64 Pipeline was successful
ci/woodpecker/pr/build-arm64 Pipeline was successful
ci/woodpecker/pr/docs Pipeline was successful
All checks were successful
ci/woodpecker/push/lint Pipeline was successful
ci/woodpecker/push/test Pipeline was successful
ci/woodpecker/push/build-amd64 Pipeline was successful
ci/woodpecker/push/build-arm64 Pipeline was successful
ci/woodpecker/push/docs Pipeline was successful
ci/woodpecker/pr/lint Pipeline was successful
ci/woodpecker/pr/test Pipeline was successful
ci/woodpecker/pr/build-amd64 Pipeline was successful
ci/woodpecker/pr/build-arm64 Pipeline was successful
ci/woodpecker/pr/docs Pipeline was successful
This commit is contained in:
parent
2b96c3b224
commit
57273754b7
2 changed files with 22 additions and 3 deletions
|
@ -54,6 +54,16 @@ def maybe_put_created_psudoheader(conn) do
|
|||
end
|
||||
end
|
||||
|
||||
def maybe_put_expires_psudoheader(conn) do
|
||||
case HTTPSignatures.signature_for_conn(conn) do
|
||||
%{"expires" => expires} ->
|
||||
put_req_header(conn, "(expires)", expires)
|
||||
|
||||
_ ->
|
||||
conn
|
||||
end
|
||||
end
|
||||
|
||||
defp assign_valid_signature_on_route_aliases(conn, []), do: conn
|
||||
|
||||
defp assign_valid_signature_on_route_aliases(%{assigns: %{valid_signature: true}} = conn, _),
|
||||
|
@ -66,6 +76,7 @@ defp assign_valid_signature_on_route_aliases(conn, [path | rest]) do
|
|||
conn
|
||||
|> put_req_header("(request-target)", request_target)
|
||||
|> maybe_put_created_psudoheader()
|
||||
|> maybe_put_expires_psudoheader()
|
||||
|> case do
|
||||
%{assigns: %{digest: digest}} = conn -> put_req_header(conn, "digest", digest)
|
||||
conn -> conn
|
||||
|
|
|
@ -21,6 +21,7 @@ defmodule Pleroma.Web.Plugs.HTTPSignaturePlugTest do
|
|||
%{
|
||||
"keyId" => "http://mastodon.example.org/users/admin#main-key",
|
||||
"created" => "1234567890",
|
||||
"expires" => "1234567890"
|
||||
}
|
||||
end,
|
||||
validate_conn: fn conn ->
|
||||
|
@ -151,4 +152,11 @@ test "(created) psudoheader", _ do
|
|||
created_header = List.keyfind(conn.req_headers, "(created)", 0)
|
||||
assert {_, "1234567890"} = created_header
|
||||
end
|
||||
|
||||
test "(expires) psudoheader", _ do
|
||||
conn = build_conn(:get, "/doesntmattter")
|
||||
conn = HTTPSignaturePlug.maybe_put_expires_psudoheader(conn)
|
||||
expires_header = List.keyfind(conn.req_headers, "(expires)", 0)
|
||||
assert {_, "1234567890"} = expires_header
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue