Merge 2023.05 stable #8

Merged
fedward merged 29 commits from AkkomaGang/akkoma:stable into stable 2023-05-30 19:19:23 +00:00
1 changed files with 5 additions and 0 deletions
Showing only changes of commit 9d83a1e23f - Show all commits

View File

@ -251,6 +251,7 @@ defmodule Pleroma.ReverseProxy do
|> Enum.filter(fn {k, _} -> k in @keep_resp_headers end)
|> build_resp_cache_headers(opts)
|> build_resp_content_disposition_header(opts)
|> build_csp_headers()
|> Keyword.merge(Keyword.get(opts, :resp_headers, []))
end
@ -316,6 +317,10 @@ defmodule Pleroma.ReverseProxy do
end
end
defp build_csp_headers(headers) do
List.keystore(headers, "content-security-policy", 0, {"content-security-policy", "sandbox"})
end
defp header_length_constraint(headers, limit) when is_integer(limit) and limit > 0 do
with {_, size} <- List.keyfind(headers, "content-length", 0),
{size, _} <- Integer.parse(size),