Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'disable-xml-entities-completely' into 'develop'

Browse Source 
Completely disable xml entity resolution

See merge request pleroma/pleroma!3932
This commit is contained in:
Haelwenn 2023-08-06 08:27:27 +00:00
commit 4e355b8595
4 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/disable-xml-entity-resolution.security Normal file
View File

@ -0,0 +1 @@
Disable XML entity resolution completely to fix a dos vulnerability

2
lib/pleroma/web/xml.ex
View File

@ -31,7 +31,7 @@ defmodule Pleroma.Web.XML do
|> :binary.bin_to_list() |> :binary.bin_to_list()
|> :xmerl_scan.string( |> :xmerl_scan.string(
quiet: true, quiet: true,
fetch_fun: fn _, _ -> raise "Resolving external entities not supported" end allow_entities: false
) )
{:ok, doc} {:ok, doc}

15
test/fixtures/xml_billion_laughs.xml vendored Normal file
View File

@ -0,0 +1,15 @@
<?xml version="1.0"?>
<!DOCTYPE lolz [
<!ENTITY lol "lol">
<!ELEMENT lolz (#PCDATA)>
<!ENTITY lol1 "&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;&lol;">
<!ENTITY lol2 "&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;&lol1;">
<!ENTITY lol3 "&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;&lol2;">
<!ENTITY lol4 "&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;&lol3;">
<!ENTITY lol5 "&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;&lol4;">
<!ENTITY lol6 "&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;&lol5;">
<!ENTITY lol7 "&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;&lol6;">
<!ENTITY lol8 "&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;&lol7;">
<!ENTITY lol9 "&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;&lol8;">
]>
<lolz>&lol9;</lolz>

5
test/pleroma/web/xml_test.exs
View File

@ -3,6 +3,11 @@ defmodule Pleroma.Web.XMLTest do
alias Pleroma.Web.XML alias Pleroma.Web.XML
test "refuses to parse any entities from XML" do
data = File.read!("test/fixtures/xml_billion_laughs.xml")
assert(:error == XML.parse_document(data))
end
test "refuses to load external entities from XML" do test "refuses to load external entities from XML" do
data = File.read!("test/fixtures/xml_external_entities.xml") data = File.read!("test/fixtures/xml_external_entities.xml")
assert(:error == XML.parse_document(data)) assert(:error == XML.parse_document(data))