diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2022-11-27 21:24:19 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2022-11-27 21:24:19 +0000 |
| commit | 76bdb01c1835085b25c333e9fc1cc012db571d86 (patch) | |
| tree | 00cfad81ec7d262090b4ae1a2ed378630e5e906a /priv | |
| parent | 59b8c920f62649b5b5902cf0e569749abe3d7991 (diff) | |
| parent | 2614f431b903065522e04b6bf1d32a2b79643139 (diff) | |
| download | pleroma-76bdb01c1835085b25c333e9fc1cc012db571d86.tar.gz pleroma-76bdb01c1835085b25c333e9fc1cc012db571d86.zip | |
Merge branch 'release/2.4.5' into 'stable'
Release 2.4.5
See merge request pleroma/pleroma!3793
Diffstat (limited to 'priv')
| -rw-r--r-- | priv/scrubbers/default.ex | 3 | ||||
| -rw-r--r-- | priv/scrubbers/twitter_text.ex | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/priv/scrubbers/default.ex b/priv/scrubbers/default.ex index 4694a92a5..d3561f169 100644 --- a/priv/scrubbers/default.ex +++ b/priv/scrubbers/default.ex @@ -64,13 +64,14 @@ defmodule Pleroma.HTML.Scrubber.Default do @allow_inline_images Pleroma.Config.get([:markup, :allow_inline_images]) if @allow_inline_images do + Meta.allow_tag_with_this_attribute_values(:img, "class", ["emoji"]) + # restrict img tags to http/https only, because of MediaProxy. Meta.allow_tag_with_uri_attributes(:img, ["src"], ["http", "https"]) Meta.allow_tag_with_these_attributes(:img, [ "width", "height", - "class", "title", "alt" ]) diff --git a/priv/scrubbers/twitter_text.ex b/priv/scrubbers/twitter_text.ex index c4e796cad..bb8f3bc50 100644 --- a/priv/scrubbers/twitter_text.ex +++ b/priv/scrubbers/twitter_text.ex @@ -41,13 +41,14 @@ defmodule Pleroma.HTML.Scrubber.TwitterText do # allow inline images for custom emoji if Pleroma.Config.get([:markup, :allow_inline_images]) do + Meta.allow_tag_with_this_attribute_values(:img, "class", ["emoji"]) + # restrict img tags to http/https only, because of MediaProxy. Meta.allow_tag_with_uri_attributes(:img, ["src"], ["http", "https"]) Meta.allow_tag_with_these_attributes(:img, [ "width", "height", - "class", "title", "alt" ]) |