summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2023-08-06 08:27:27 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2023-08-06 08:27:27 +0000
commit4e355b8595a5c4ff7aaaa4c0755b3dc7a37c6b6c (patch)
tree623433efceefe6deead177525714b216f1610829 /lib
parent17c336de66b757ef90e9e229d086c7b83fb1573e (diff)
parent48b1e9bdc7382ec6ef33e95f2bd8674ae92f17b2 (diff)
downloadpleroma-4e355b8595a5c4ff7aaaa4c0755b3dc7a37c6b6c.tar.gz
pleroma-4e355b8595a5c4ff7aaaa4c0755b3dc7a37c6b6c.zip
Merge branch 'disable-xml-entities-completely' into 'develop'
Completely disable xml entity resolution See merge request pleroma/pleroma!3932
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/xml.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/xml.ex b/lib/pleroma/web/xml.ex
index 380a80ab8..64329e4ba 100644
--- a/lib/pleroma/web/xml.ex
+++ b/lib/pleroma/web/xml.ex
@@ -31,7 +31,7 @@ defmodule Pleroma.Web.XML do
|> :binary.bin_to_list()
|> :xmerl_scan.string(
quiet: true,
- fetch_fun: fn _, _ -> raise "Resolving external entities not supported" end
+ allow_entities: false
)
{:ok, doc}