diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2024-02-20 08:43:07 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2024-02-20 08:43:07 +0000 |
| commit | fb4aa9f7250ecfcbd506f70cf8ac6732564a6b26 (patch) | |
| tree | 5997090e10f3b9d337ea557de21e96a0b9a3e992 /lib | |
| parent | 6722b7f395f7da629d9c39b8c6eeb18ac8f500bc (diff) | |
| parent | be075a43363519505dcfe2dba1fbb19e0326b668 (diff) | |
| download | pleroma-fb4aa9f7250ecfcbd506f70cf8ac6732564a6b26.tar.gz pleroma-fb4aa9f7250ecfcbd506f70cf8ac6732564a6b26.zip | |
Merge branch 'release/2.6.2' into 'stable'
Security Release 2.6.2
See merge request pleroma/pleroma!4074
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex b/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex index f66c379b5..12accfadd 100644 --- a/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex +++ b/lib/pleroma/web/activity_pub/mrf/steal_emoji_policy.ex @@ -34,6 +34,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy do |> Path.basename() |> Path.extname() + shortcode = Path.basename(shortcode) file_path = Path.join(emoji_dir_path, shortcode <> (extension || ".png")) case File.write(file_path, response.body) do @@ -76,6 +77,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.StealEmojiPolicy do new_emojis = foreign_emojis |> Enum.reject(fn {shortcode, _url} -> shortcode in installed_emoji end) + |> Enum.reject(fn {shortcode, _url} -> String.contains?(shortcode, ["/", "\\"]) end) |> Enum.filter(fn {shortcode, _url} -> reject_emoji? = [:mrf_steal_emoji, :rejected_shortcodes] |