mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-11-19 16:10:59 +00:00
Use with w/ pack_info_res
This commit is contained in:
parent
8790365fef
commit
8f509e6d1e
1 changed files with 23 additions and 29 deletions
|
@ -183,19 +183,13 @@ keeping it in cache for #{div(cache_ms, 1000)}s")
|
|||
{:error, "The pack was not set as shared and there is no fallback src to download from"}
|
||||
end
|
||||
|
||||
case pack_info_res do
|
||||
{:ok, %{sha: sha, uri: uri} = pinfo} ->
|
||||
sha = Base.decode16!(sha)
|
||||
emoji_archive = Tesla.get!(uri).body
|
||||
|
||||
got_sha = :crypto.hash(:sha256, emoji_archive)
|
||||
|
||||
if got_sha == sha do
|
||||
with {:ok, %{sha: sha, uri: uri} = pinfo} <- pack_info_res,
|
||||
%{body: emoji_archive} <- Tesla.get!(uri),
|
||||
{_, true} <- {:sha, Base.decode16!(sha) == :crypto.hash(:sha256, emoji_archive)} do
|
||||
local_name = data["as"] || name
|
||||
pack_dir = Path.join(@emoji_dir_path, local_name)
|
||||
File.mkdir_p!(pack_dir)
|
||||
|
||||
# Fallback cannot contain a pack.json file
|
||||
files = Enum.map(full_pack["files"], fn {_, path} -> to_charlist(path) end)
|
||||
# Fallback cannot contain a pack.json file
|
||||
files = if pinfo[:fallback], do: files, else: ['pack.json'] ++ files
|
||||
|
@ -210,16 +204,16 @@ keeping it in cache for #{div(cache_ms, 1000)}s")
|
|||
File.write!(pack_file_path, Jason.encode!(full_pack, pretty: true))
|
||||
end
|
||||
|
||||
conn |> text("ok")
|
||||
text(conn, "ok")
|
||||
else
|
||||
{:error, e} ->
|
||||
conn |> put_status(:internal_server_error) |> text(e)
|
||||
|
||||
{:sha, _} ->
|
||||
conn
|
||||
|> put_status(:internal_server_error)
|
||||
|> text("SHA256 for the pack doesn't match the one sent by the server")
|
||||
end
|
||||
|
||||
{:error, e} ->
|
||||
conn |> put_status(:internal_server_error) |> text(e)
|
||||
end
|
||||
end
|
||||
|
||||
@doc """
|
||||
|
|
Loading…
Reference in a new issue