Skip to content
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

Issue1069 check for model/gltf.binary content type and accept #1075

Merged
merged 13 commits into from
Nov 27, 2021
Merged

Issue1069 check for model/gltf.binary content type and accept #1075

Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
5483c14
check for gltf content type
tomjebo Nov 18, 2021
a7c0519
Merge branch 'main' into issue1069
tomjebo Nov 19, 2021
d6fd6da
Merge branch 'main' into issue1069
tomjebo Nov 23, 2021
81856c9
provide part specific virtual overrides for content-type checking.
tomjebo Nov 23, 2021
2f62931
changelog update
tomjebo Nov 23, 2021
7c73dec
various fixes
tomjebo Nov 24, 2021
34ca43f
added test (filenotfound currently)
tomjebo Nov 24, 2021
73e9b0a
fixed logic
tomjebo Nov 24, 2021
1f3b08e
simplify test
tomjebo Nov 24, 2021
d6ef4c1
added second package with dash form to test
tomjebo Nov 24, 2021
ed7a4c4
break out into separate tests
tomjebo Nov 25, 2021
a774bed
deal with SA1516 error
tomjebo Nov 25, 2021
227aa4e
assert content type of the model3dreferencerelationship part
tomjebo Nov 25, 2021
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
7 changes: 5 additions & 2 deletions src/DocumentFormat.OpenXml/Packaging/OpenXmlPart.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,16 @@ internal void Load(OpenXmlPackage? openXmlPackage, OpenXmlPart? parent, Uri uriT

if (IsContentTypeFixed && metroPart.ContentType != ContentType)
{
var errorMessage = SR.Format(
if (!((metroPart.ContentType == "model/gltf.binary") && (ContentType == "model/gltf-binary")))
twsouthwick marked this conversation as resolved.
Show resolved Hide resolved
{
var errorMessage = SR.Format(
ExceptionMessages.InvalidPartContentType,
metroPart.Uri.OriginalString,
metroPart.ContentType,
ContentType);

throw new OpenXmlPackageException(errorMessage);
throw new OpenXmlPackageException(errorMessage);
}
}

_packagePart = metroPart;
Expand Down