This is an automated email from the ASF dual-hosted git repository.

pjfanning pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/poi.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 9d385077e5 Apply DEFAULT_XML_OPTIONS to remaining XMLBeans parses in 
xslf/xdgf (#1231)
9d385077e5 is described below

commit 9d385077e5cd9bd920097c4e6ff4e474197d1188
Author: PJ Fanning <[email protected]>
AuthorDate: Mon Aug 31 16:58:59 2026 +0100

    Apply DEFAULT_XML_OPTIONS to remaining XMLBeans parses in xslf/xdgf (#1231)
    
    A handful of Factory.parse(...) calls on untrusted document parts did not 
pass
    POIXMLTypeLoader.DEFAULT_XML_OPTIONS, unlike the rest of POI's OOXML 
parsing:
    XSLFDiagramDrawing, XSLFTableStyles and the five xdgf (Visio) readers
    (XmlVisioDocument, XDGFMasters, XDGFMasterContents, XDGFPageContents, 
XDGFPages).
    
    DEFAULT_XML_OPTIONS sets setDisallowDocTypeDeclaration(true) and
    setEntityExpansionLimit(1). This is defense-in-depth for consistency: 
xmlbeans
    5.x already blocks external entity resolution by default (empty-InputSource
    default entity resolver + secure processing), so this is not an 
external-entity
    XXE fix - it disallows DOCTYPE and tightens the internal entity-expansion 
bound
    on these parts to match every other OOXML parse in POI.
    
    Co-authored-by: Claude Fable 5 <[email protected]>
---
 .../main/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java    | 3 ++-
 poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java | 3 ++-
 .../src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java  | 3 ++-
 poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPages.java   | 3 ++-
 .../src/main/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java  | 3 ++-
 .../main/java/org/apache/poi/xslf/usermodel/XSLFDiagramDrawing.java    | 3 ++-
 .../src/main/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java   | 3 ++-
 7 files changed, 14 insertions(+), 7 deletions(-)

diff --git 
a/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java 
b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java
index b0f4d9def3..b8bf3f608a 100644
--- 
a/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java
+++ 
b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java
@@ -22,6 +22,7 @@ import java.io.InputStream;
 
 import com.microsoft.schemas.office.visio.x2012.main.MasterContentsDocument;
 import org.apache.poi.ooxml.POIXMLException;
+import org.apache.poi.ooxml.POIXMLTypeLoader;
 import org.apache.poi.openxml4j.opc.PackagePart;
 import org.apache.poi.xdgf.exceptions.XDGFException;
 import org.apache.xmlbeans.XmlException;
@@ -46,7 +47,7 @@ public class XDGFMasterContents extends XDGFBaseContents {
         try {
 
             try (InputStream stream = getPackagePart().getInputStream()) {
-                _pageContents = 
MasterContentsDocument.Factory.parse(stream).getMasterContents();
+                _pageContents = MasterContentsDocument.Factory.parse(stream, 
POIXMLTypeLoader.DEFAULT_XML_OPTIONS).getMasterContents();
             } catch (XmlException | IOException e) {
                 throw new POIXMLException(e);
             }
diff --git 
a/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java 
b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java
index f1e53cfb60..b2da77c15f 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java
@@ -31,6 +31,7 @@ import com.microsoft.schemas.office.visio.x2012.main.RelType;
 
 import org.apache.poi.ooxml.POIXMLDocumentPart;
 import org.apache.poi.ooxml.POIXMLException;
+import org.apache.poi.ooxml.POIXMLTypeLoader;
 import org.apache.poi.openxml4j.opc.PackagePart;
 import org.apache.poi.util.Internal;
 import org.apache.poi.xdgf.exceptions.XDGFException;
@@ -63,7 +64,7 @@ public class XDGFMasters extends XDGFXMLDocumentPart {
     protected void onDocumentRead() {
         try {
             try (InputStream stream = getPackagePart().getInputStream()) {
-                _mastersObject = 
MastersDocument.Factory.parse(stream).getMasters();
+                _mastersObject = MastersDocument.Factory.parse(stream, 
POIXMLTypeLoader.DEFAULT_XML_OPTIONS).getMasters();
             } catch (XmlException | IOException e) {
                 throw new POIXMLException(e);
             }
diff --git 
a/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java 
b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java
index 59b8c6a766..ec1ef5ceb7 100644
--- 
a/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java
+++ 
b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java
@@ -25,6 +25,7 @@ import java.util.Map;
 import com.microsoft.schemas.office.visio.x2012.main.PageContentsDocument;
 import org.apache.poi.ooxml.POIXMLDocumentPart;
 import org.apache.poi.ooxml.POIXMLException;
+import org.apache.poi.ooxml.POIXMLTypeLoader;
 import org.apache.poi.openxml4j.opc.PackagePart;
 import org.apache.poi.xdgf.exceptions.XDGFException;
 import org.apache.xmlbeans.XmlException;
@@ -45,7 +46,7 @@ public class XDGFPageContents extends XDGFBaseContents {
     protected void onDocumentRead() {
         try {
             try (InputStream stream = getPackagePart().getInputStream()) {
-                _pageContents = 
PageContentsDocument.Factory.parse(stream).getPageContents();
+                _pageContents = PageContentsDocument.Factory.parse(stream, 
POIXMLTypeLoader.DEFAULT_XML_OPTIONS).getPageContents();
             } catch (XmlException | IOException e) {
                 throw new POIXMLException(e);
             }
diff --git 
a/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPages.java 
b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPages.java
index b8b1e18b9c..de6a079e2e 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPages.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPages.java
@@ -29,6 +29,7 @@ import com.microsoft.schemas.office.visio.x2012.main.RelType;
 
 import org.apache.poi.ooxml.POIXMLDocumentPart;
 import org.apache.poi.ooxml.POIXMLException;
+import org.apache.poi.ooxml.POIXMLTypeLoader;
 import org.apache.poi.openxml4j.opc.PackagePart;
 import org.apache.poi.util.Internal;
 import org.apache.poi.xdgf.exceptions.XDGFException;
@@ -62,7 +63,7 @@ public class XDGFPages extends XDGFXMLDocumentPart {
     protected void onDocumentRead() {
         try {
             try (InputStream stream = getPackagePart().getInputStream()) {
-                _pagesObject = PagesDocument.Factory.parse(stream).getPages();
+                _pagesObject = PagesDocument.Factory.parse(stream, 
POIXMLTypeLoader.DEFAULT_XML_OPTIONS).getPages();
             } catch (XmlException | IOException e) {
                 throw new POIXMLException(e);
             }
diff --git 
a/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java 
b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java
index ed7825d31f..45fa8632bd 100644
--- 
a/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java
+++ 
b/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java
@@ -26,6 +26,7 @@ import java.util.List;
 import org.apache.poi.ooxml.POIXMLDocument;
 import org.apache.poi.ooxml.POIXMLDocumentPart;
 import org.apache.poi.ooxml.POIXMLException;
+import org.apache.poi.ooxml.POIXMLTypeLoader;
 import org.apache.poi.openxml4j.opc.OPCPackage;
 import org.apache.poi.openxml4j.opc.PackagePart;
 import org.apache.poi.openxml4j.opc.PackageRelationshipTypes;
@@ -70,7 +71,7 @@ public class XmlVisioDocument extends POIXMLDocument {
         VisioDocumentType document;
 
         try (InputStream stream = getPackagePart().getInputStream()){
-            document = 
VisioDocumentDocument1.Factory.parse(stream).getVisioDocument();
+            document = VisioDocumentDocument1.Factory.parse(stream, 
POIXMLTypeLoader.DEFAULT_XML_OPTIONS).getVisioDocument();
         } catch (XmlException | IOException e) {
             throw new POIXMLException(e);
         }
diff --git 
a/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFDiagramDrawing.java 
b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFDiagramDrawing.java
index 014d7f26c3..0468858dae 100644
--- 
a/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFDiagramDrawing.java
+++ 
b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFDiagramDrawing.java
@@ -18,6 +18,7 @@ package org.apache.poi.xslf.usermodel;
 
 import com.microsoft.schemas.office.drawing.x2008.diagram.DrawingDocument;
 import org.apache.poi.ooxml.POIXMLDocumentPart;
+import org.apache.poi.ooxml.POIXMLTypeLoader;
 import org.apache.poi.openxml4j.opc.PackagePart;
 import org.apache.poi.util.Beta;
 import org.apache.xmlbeans.XmlException;
@@ -45,7 +46,7 @@ public class XSLFDiagramDrawing extends POIXMLDocumentPart {
 
     private static DrawingDocument readPackagePart(PackagePart part) throws 
IOException, XmlException {
         try (InputStream is = part.getInputStream()) {
-            return DrawingDocument.Factory.parse(is);
+            return DrawingDocument.Factory.parse(is, 
POIXMLTypeLoader.DEFAULT_XML_OPTIONS);
         }
     }
 
diff --git 
a/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java 
b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java
index 737a0d213c..3c35fa249d 100644
--- a/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java
+++ b/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFTableStyles.java
@@ -24,6 +24,7 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.apache.poi.ooxml.POIXMLDocumentPart;
+import org.apache.poi.ooxml.POIXMLTypeLoader;
 import org.apache.poi.openxml4j.opc.PackagePart;
 import org.apache.poi.util.Beta;
 import org.apache.xmlbeans.XmlException;
@@ -48,7 +49,7 @@ public class XSLFTableStyles extends POIXMLDocumentPart 
implements Iterable<XSLF
 
         TblStyleLstDocument styleDoc;
         try (InputStream is = getPackagePart().getInputStream()) {
-            styleDoc = TblStyleLstDocument.Factory.parse(is);
+            styleDoc = TblStyleLstDocument.Factory.parse(is, 
POIXMLTypeLoader.DEFAULT_XML_OPTIONS);
         }
         _tblStyleLst = styleDoc.getTblStyleLst();
         List<CTTableStyle> tblStyles = _tblStyleLst.getTblStyleList();


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to