Skip to content

Block implicit network-file access in XML resource resolution #544

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
Will Portnoy (willportnoy) wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Block implicit network-file access in XML resource resolution #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c853ac4
Add mocked regressions for network schema loading
willportnoy Oct 27, 2026
cd7aa08
Block network-file access in external XML resource resolution
willportnoy Oct 30, 2026
f24f9c0
Close XML resource resolution review gaps
willportnoy Oct 30, 2026
6b402ab
Use explicit temporary filename APIs in resource tests
willportnoy Nov 1, 2026
f8441e1
Reserve virtual document names without path combination
willportnoy Nov 1, 2026
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
5 changes: 5 additions & 0 deletions .github/workflows/dotnet-desktop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,8 @@ jobs:
msbuild ./src/XmlNotepad.sln /p:Configuration=$env:Configuration "/p:Platform=Any CPU" /verbosity:minimal
env:
Configuration: ${{ matrix.configuration }}

- name: Run headless model regression tests
run: dotnet test .\src\Model.Tests\Model.Tests.csproj --configuration $env:Configuration --no-build --verbosity normal
env:
Configuration: ${{ matrix.configuration }}
13 changes: 8 additions & 5 deletions src/Application/XmlDiffWrapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,14 +70,14 @@ public void DoCompare(Form owner, XmlCache model, string otherXmlFile, XmlDiffOp
// diffView.Load call.
XmlDocument original = new XmlDocument();
XmlReaderSettings settings = model.GetReaderSettings();
using (XmlReader reader = XmlReader.Create(filename, settings))
using (XmlReader reader = XmlHelpers.ReadDocument(filename, settings))
{
original.Load(reader);
}

XmlDocument doc = new XmlDocument();
settings = model.GetReaderSettings();
using (XmlReader reader = XmlReader.Create(otherXmlFile, settings))
using (XmlReader reader = XmlHelpers.ReadDocument(otherXmlFile, settings))
{
doc.Load(reader);
}
Expand Down Expand Up @@ -111,10 +111,13 @@ public void DoCompare(Form owner, XmlCache model, string otherXmlFile, XmlDiffOp
using (XmlReader diffGram = XmlReader.Create(diffFile, settings))
{
XmlDiffView diffView = new XmlDiffView();
using (var reader = new XmlTextReader(filename))
var location = new Uri(filename);
// XmlDiffView requires XmlTextReader; only the selected root uses the unguarded transport.
using (var input = (Stream)new XmlUrlResolver().GetEntity(location, null, typeof(Stream)))
using (var reader = new XmlTextReader(location.AbsoluteUri, input))
{
var ignoreDtd = Settings.Instance.GetBoolean("IgnoreDTD");
reader.DtdProcessing = ignoreDtd ? DtdProcessing.Ignore : DtdProcessing.Parse;
reader.DtdProcessing = settings.DtdProcessing;
reader.XmlResolver = new XmlResourceResolver(model.Settings.Resolver ?? new XmlUrlResolver());
diffView.Load(reader, diffGram);
using (TextWriter htmlWriter = new StreamWriter(tempFile, false, Encoding.UTF8))
{
Expand Down
Loading