Skip to content

Potential XXE vulnerability fix on XML-parsing #1596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Thorium wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Potential XXE vulnerability fix on XML-parsing #1596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da72f22
Potential XXE vulnerability fix.
Thorium Oct 28, 2025
529c747
mandatory Fantomas commit
Thorium Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions src/AssemblyInfo.Csv.Core.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Auto-Generated by FAKE; do not edit
namespace System

open System.Reflection

[<assembly: AssemblyTitleAttribute("FSharp.Data.Csv.Core")>]
Expand All @@ -11,17 +10,8 @@ open System.Reflection
do ()

module internal AssemblyVersionInformation =
[<Literal>]
let AssemblyTitle = "FSharp.Data.Csv.Core"

[<Literal>]
let AssemblyProduct = "FSharp.Data"

[<Literal>]
let AssemblyDescription = "Library of F# type providers and data access tools"

[<Literal>]
let AssemblyVersion = "6.6.0.0"

[<Literal>]
let AssemblyFileVersion = "6.6.0.0"
let [<Literal>] AssemblyTitle = "FSharp.Data.Csv.Core"
let [<Literal>] AssemblyProduct = "FSharp.Data"
let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
let [<Literal>] AssemblyVersion = "6.6.0.0"
let [<Literal>] AssemblyFileVersion = "6.6.0.0"
20 changes: 5 additions & 15 deletions src/AssemblyInfo.DesignTime.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Auto-Generated by FAKE; do not edit
namespace System

open System.Reflection

[<assembly: AssemblyTitleAttribute("FSharp.Data.DesignTime")>]
Expand All @@ -11,17 +10,8 @@ open System.Reflection
do ()

module internal AssemblyVersionInformation =
[<Literal>]
let AssemblyTitle = "FSharp.Data.DesignTime"

[<Literal>]
let AssemblyProduct = "FSharp.Data"

[<Literal>]
let AssemblyDescription = "Library of F# type providers and data access tools"

[<Literal>]
let AssemblyVersion = "6.6.0.0"

[<Literal>]
let AssemblyFileVersion = "6.6.0.0"
let [<Literal>] AssemblyTitle = "FSharp.Data.DesignTime"
let [<Literal>] AssemblyProduct = "FSharp.Data"
let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
let [<Literal>] AssemblyVersion = "6.6.0.0"
let [<Literal>] AssemblyFileVersion = "6.6.0.0"
20 changes: 5 additions & 15 deletions src/AssemblyInfo.Html.Core.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Auto-Generated by FAKE; do not edit
namespace System

open System.Reflection

[<assembly: AssemblyTitleAttribute("FSharp.Data.Html.Core")>]
Expand All @@ -11,17 +10,8 @@ open System.Reflection
do ()

module internal AssemblyVersionInformation =
[<Literal>]
let AssemblyTitle = "FSharp.Data.Html.Core"

[<Literal>]
let AssemblyProduct = "FSharp.Data"

[<Literal>]
let AssemblyDescription = "Library of F# type providers and data access tools"

[<Literal>]
let AssemblyVersion = "6.6.0.0"

[<Literal>]
let AssemblyFileVersion = "6.6.0.0"
let [<Literal>] AssemblyTitle = "FSharp.Data.Html.Core"
let [<Literal>] AssemblyProduct = "FSharp.Data"
let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
let [<Literal>] AssemblyVersion = "6.6.0.0"
let [<Literal>] AssemblyFileVersion = "6.6.0.0"
20 changes: 5 additions & 15 deletions src/AssemblyInfo.Http.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Auto-Generated by FAKE; do not edit
namespace System

open System.Reflection

[<assembly: AssemblyTitleAttribute("FSharp.Data.Http")>]
Expand All @@ -11,17 +10,8 @@ open System.Reflection
do ()

module internal AssemblyVersionInformation =
[<Literal>]
let AssemblyTitle = "FSharp.Data.Http"

[<Literal>]
let AssemblyProduct = "FSharp.Data"

[<Literal>]
let AssemblyDescription = "Library of F# type providers and data access tools"

[<Literal>]
let AssemblyVersion = "6.6.0.0"

[<Literal>]
let AssemblyFileVersion = "6.6.0.0"
let [<Literal>] AssemblyTitle = "FSharp.Data.Http"
let [<Literal>] AssemblyProduct = "FSharp.Data"
let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
let [<Literal>] AssemblyVersion = "6.6.0.0"
let [<Literal>] AssemblyFileVersion = "6.6.0.0"
20 changes: 5 additions & 15 deletions src/AssemblyInfo.Json.Core.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Auto-Generated by FAKE; do not edit
namespace System

open System.Reflection

[<assembly: AssemblyTitleAttribute("FSharp.Data.Json.Core")>]
Expand All @@ -11,17 +10,8 @@ open System.Reflection
do ()

module internal AssemblyVersionInformation =
[<Literal>]
let AssemblyTitle = "FSharp.Data.Json.Core"

[<Literal>]
let AssemblyProduct = "FSharp.Data"

[<Literal>]
let AssemblyDescription = "Library of F# type providers and data access tools"

[<Literal>]
let AssemblyVersion = "6.6.0.0"

[<Literal>]
let AssemblyFileVersion = "6.6.0.0"
let [<Literal>] AssemblyTitle = "FSharp.Data.Json.Core"
let [<Literal>] AssemblyProduct = "FSharp.Data"
let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
let [<Literal>] AssemblyVersion = "6.6.0.0"
let [<Literal>] AssemblyFileVersion = "6.6.0.0"
20 changes: 5 additions & 15 deletions src/AssemblyInfo.Runtime.Utilities.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Auto-Generated by FAKE; do not edit
namespace System

open System.Reflection

[<assembly: AssemblyTitleAttribute("FSharp.Data.Runtime.Utilities")>]
Expand All @@ -11,17 +10,8 @@ open System.Reflection
do ()

module internal AssemblyVersionInformation =
[<Literal>]
let AssemblyTitle = "FSharp.Data.Runtime.Utilities"

[<Literal>]
let AssemblyProduct = "FSharp.Data"

[<Literal>]
let AssemblyDescription = "Library of F# type providers and data access tools"

[<Literal>]
let AssemblyVersion = "6.6.0.0"

[<Literal>]
let AssemblyFileVersion = "6.6.0.0"
let [<Literal>] AssemblyTitle = "FSharp.Data.Runtime.Utilities"
let [<Literal>] AssemblyProduct = "FSharp.Data"
let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
let [<Literal>] AssemblyVersion = "6.6.0.0"
let [<Literal>] AssemblyFileVersion = "6.6.0.0"
20 changes: 5 additions & 15 deletions src/AssemblyInfo.WorldBank.Core.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Auto-Generated by FAKE; do not edit
namespace System

open System.Reflection

[<assembly: AssemblyTitleAttribute("FSharp.Data.WorldBank.Core")>]
Expand All @@ -11,17 +10,8 @@ open System.Reflection
do ()

module internal AssemblyVersionInformation =
[<Literal>]
let AssemblyTitle = "FSharp.Data.WorldBank.Core"

[<Literal>]
let AssemblyProduct = "FSharp.Data"

[<Literal>]
let AssemblyDescription = "Library of F# type providers and data access tools"

[<Literal>]
let AssemblyVersion = "6.6.0.0"

[<Literal>]
let AssemblyFileVersion = "6.6.0.0"
let [<Literal>] AssemblyTitle = "FSharp.Data.WorldBank.Core"
let [<Literal>] AssemblyProduct = "FSharp.Data"
let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
let [<Literal>] AssemblyVersion = "6.6.0.0"
let [<Literal>] AssemblyFileVersion = "6.6.0.0"
20 changes: 5 additions & 15 deletions src/AssemblyInfo.Xml.Core.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Auto-Generated by FAKE; do not edit
namespace System

open System.Reflection

[<assembly: AssemblyTitleAttribute("FSharp.Data.Xml.Core")>]
Expand All @@ -11,17 +10,8 @@ open System.Reflection
do ()

module internal AssemblyVersionInformation =
[<Literal>]
let AssemblyTitle = "FSharp.Data.Xml.Core"

[<Literal>]
let AssemblyProduct = "FSharp.Data"

[<Literal>]
let AssemblyDescription = "Library of F# type providers and data access tools"

[<Literal>]
let AssemblyVersion = "6.6.0.0"

[<Literal>]
let AssemblyFileVersion = "6.6.0.0"
let [<Literal>] AssemblyTitle = "FSharp.Data.Xml.Core"
let [<Literal>] AssemblyProduct = "FSharp.Data"
let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
let [<Literal>] AssemblyVersion = "6.6.0.0"
let [<Literal>] AssemblyFileVersion = "6.6.0.0"
20 changes: 5 additions & 15 deletions src/AssemblyInfo.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// Auto-Generated by FAKE; do not edit
namespace System

open System.Reflection

[<assembly: AssemblyTitleAttribute("FSharp.Data")>]
Expand All @@ -11,17 +10,8 @@ open System.Reflection
do ()

module internal AssemblyVersionInformation =
[<Literal>]
let AssemblyTitle = "FSharp.Data"

[<Literal>]
let AssemblyProduct = "FSharp.Data"

[<Literal>]
let AssemblyDescription = "Library of F# type providers and data access tools"

[<Literal>]
let AssemblyVersion = "6.6.0.0"

[<Literal>]
let AssemblyFileVersion = "6.6.0.0"
let [<Literal>] AssemblyTitle = "FSharp.Data"
let [<Literal>] AssemblyProduct = "FSharp.Data"
let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
let [<Literal>] AssemblyVersion = "6.6.0.0"
let [<Literal>] AssemblyFileVersion = "6.6.0.0"
30 changes: 27 additions & 3 deletions src/FSharp.Data.Xml.Core/XmlRuntime.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ namespace FSharp.Data.Runtime.BaseTypes

open System.ComponentModel
open System.IO
open System.Xml
open System.Xml.Linq

#nowarn "10001"
Expand Down Expand Up @@ -56,7 +57,16 @@ type XmlElement =
IsError = false)>]
static member Create(reader: TextReader) =
use reader = reader
let element = XDocument.Load(reader, LoadOptions.PreserveWhitespace).Root
// Secure XML parsing: disable DTD processing and external entities to prevent XXE attacks
let xmlReaderSettings =
new XmlReaderSettings(
DtdProcessing = DtdProcessing.Prohibit,
XmlResolver = null,
MaxCharactersFromEntities = 1024L * 1024L
) // 1MB limit

use xmlReader = XmlReader.Create(reader, xmlReaderSettings)
let element = XDocument.Load(xmlReader, LoadOptions.PreserveWhitespace).Root
{ XElement = element }

/// <exclude />
Expand All @@ -69,12 +79,26 @@ type XmlElement =
use reader = reader
let text = reader.ReadToEnd()

// Secure XML parsing: disable DTD processing and external entities to prevent XXE attacks
let xmlReaderSettings =
new XmlReaderSettings(
DtdProcessing = DtdProcessing.Prohibit,
XmlResolver = null,
MaxCharactersFromEntities = 1024L * 1024L
) // 1MB limit

try
XDocument.Parse(text, LoadOptions.PreserveWhitespace).Root.Elements()
use stringReader = new StringReader(text)
use xmlReader = XmlReader.Create(stringReader, xmlReaderSettings)

XDocument.Load(xmlReader, LoadOptions.PreserveWhitespace).Root.Elements()
|> Seq.map (fun value -> { XElement = value })
|> Seq.toArray
with _ when text.TrimStart().StartsWith "<" ->
XDocument.Parse("<root>" + text + "</root>", LoadOptions.PreserveWhitespace).Root.Elements()
use stringReader = new StringReader("<root>" + text + "</root>")
use xmlReader = XmlReader.Create(stringReader, xmlReaderSettings)

XDocument.Load(xmlReader, LoadOptions.PreserveWhitespace).Root.Elements()
|> Seq.map (fun value -> { XElement = value })
|> Seq.toArray

Expand Down
Loading