diff options
| author | Lain Soykaf <lain@lain.com> | 2025-03-01 17:45:28 +0400 |
|---|---|---|
| committer | Lain Soykaf <lain@lain.com> | 2025-03-01 17:45:28 +0400 |
| commit | 32acdf0936847870657fb265e02c56c1273378e0 (patch) | |
| tree | 6350d15a98b971d2c581c9d239d50617dd7be97a /lib/mix/tasks | |
| parent | a8e863e0d627b6ed9563d953ee2cc8c9f4c9ee7a (diff) | |
| parent | 13a88bd1a5a13c771d33d327d54125c68bbb9cb3 (diff) | |
| download | pleroma-32acdf0936847870657fb265e02c56c1273378e0.tar.gz pleroma-32acdf0936847870657fb265e02c56c1273378e0.zip | |
Merge branch 'security-2.9' into release/2.9.0
Diffstat (limited to 'lib/mix/tasks')
| -rw-r--r-- | lib/mix/tasks/pleroma/emoji.ex | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/lib/mix/tasks/pleroma/emoji.ex b/lib/mix/tasks/pleroma/emoji.ex index 8b9c921c8..b656f161f 100644 --- a/lib/mix/tasks/pleroma/emoji.ex +++ b/lib/mix/tasks/pleroma/emoji.ex @@ -93,6 +93,7 @@ defmodule Mix.Tasks.Pleroma.Emoji do ) files = fetch_and_decode!(files_loc) + files_to_unzip = for({_, f} <- files, do: f) IO.puts(IO.ANSI.format(["Unpacking ", :bright, pack_name])) @@ -103,17 +104,7 @@ defmodule Mix.Tasks.Pleroma.Emoji do pack_name ]) - files_to_unzip = - Enum.map( - files, - fn {_, f} -> to_charlist(f) end - ) - - {:ok, _} = - :zip.unzip(binary_archive, - cwd: String.to_charlist(pack_path), - file_list: files_to_unzip - ) + {:ok, _} = Pleroma.SafeZip.unzip_data(binary_archive, pack_path, files_to_unzip) IO.puts(IO.ANSI.format(["Writing pack.json for ", :bright, pack_name])) @@ -201,7 +192,7 @@ defmodule Mix.Tasks.Pleroma.Emoji do tmp_pack_dir = Path.join(System.tmp_dir!(), "emoji-pack-#{name}") - {:ok, _} = :zip.unzip(binary_archive, cwd: String.to_charlist(tmp_pack_dir)) + {:ok, _} = Pleroma.SafeZip.unzip_data(binary_archive, tmp_pack_dir) emoji_map = Pleroma.Emoji.Loader.make_shortcode_to_file_map(tmp_pack_dir, exts) |