diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-08-05 08:13:03 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2023-08-05 08:13:03 +0000 |
| commit | d0f7a5c4f53f631703cc108b95c52a934c122873 (patch) | |
| tree | 08a1a83efc47a77f2e44b16258e91b7a2b557b39 /lib | |
| parent | 1062185ba03ffa03f0dfcfc11f948285b2ffd610 (diff) | |
| parent | 4099ddb3dc5840fa10cff743d87464acf7898a80 (diff) | |
| download | pleroma-d0f7a5c4f53f631703cc108b95c52a934c122873.tar.gz pleroma-d0f7a5c4f53f631703cc108b95c52a934c122873.zip | |
Merge branch 'mergeback/2.5.4' into 'develop'
Mergeback: 2.5.4
See merge request pleroma/pleroma!3930
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 |