diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-08-05 08:12:25 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-08-05 08:12:25 +0000 |
| commit | 1f4be2b3495b6df03843f923a53aff5913e1ef0d (patch) | |
| tree | 55a72082c7776290cdbbbd16fbf043f9c6fc4bb5 /lib | |
| parent | ff2f3862abd4a9eabc0440999337a2d44c8b797e (diff) | |
| parent | b631180b38ac63029f08bef137b13231bcf57b59 (diff) | |
| download | pleroma-1f4be2b3495b6df03843f923a53aff5913e1ef0d.tar.gz pleroma-1f4be2b3495b6df03843f923a53aff5913e1ef0d.zip | |
Merge branch 'releases/2.5.4' into 'stable'
Release 2.5.4
See merge request pleroma/pleroma!3929
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/xml.ex | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/pleroma/web/xml.ex b/lib/pleroma/web/xml.ex index b699446b0..380a80ab8 100644 --- a/lib/pleroma/web/xml.ex +++ b/lib/pleroma/web/xml.ex @@ -29,7 +29,10 @@ defmodule Pleroma.Web.XML do {doc, _rest} = text |> :binary.bin_to_list() - |> :xmerl_scan.string(quiet: true) + |> :xmerl_scan.string( + quiet: true, + fetch_fun: fn _, _ -> raise "Resolving external entities not supported" end + ) {:ok, doc} rescue |