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 f1a042ff46 Restrict OOXML signature reference dereferencing to the
package (#1233)
f1a042ff46 is described below
commit f1a042ff46f0c70665785ebf5901cb1923b315f1
Author: PJ Fanning <[email protected]>
AuthorDate: Mon Aug 31 17:44:48 2026 +0100
Restrict OOXML signature reference dereferencing to the package (#1233)
OOXMLURIDereferencer only resolves references to parts within the OPC
package
(and same-document references). When a reference could not be matched to a
part
it fell back to the default JSR-105 dereferencer, which will happily
resolve an
absolute URI. Signature references should never point outside the package,
so
reject absolute (scheme-bearing) URIs instead of delegating them.
Same-document
and package-relative references are unaffected. Added a test.
Co-authored-by: Claude Fable 5 <[email protected]>
---
.../poi/poifs/crypt/dsig/OOXMLURIDereferencer.java | 6 ++
.../poifs/crypt/dsig/TestOOXMLURIDereferencer.java | 84 ++++++++++++++++++++++
2 files changed, 90 insertions(+)
diff --git
a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java
b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java
index 1a53cd9236..2a2c1a461a 100644
---
a/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java
+++
b/poi-ooxml/src/main/java/org/apache/poi/poifs/crypt/dsig/OOXMLURIDereferencer.java
@@ -78,6 +78,12 @@ public class OOXMLURIDereferencer implements URIDereferencer
{
PackagePart part = findPart(uri);
if (part == null) {
+ // Signature references are expected to point at parts within the
package (or be
+ // same-document references). A URI that carries a scheme (i.e. an
absolute URI)
+ // refers to something outside the package and is not resolved
here.
+ if (uri.isAbsolute()) {
+ throw new URIReferenceException("only in-package references
are supported: " + uri);
+ }
LOG.atDebug().log("cannot resolve {}, delegating to base DOM URI
dereferencer", uri);
return baseUriDereferencer.dereference(uriReference, context);
}
diff --git
a/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestOOXMLURIDereferencer.java
b/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestOOXMLURIDereferencer.java
new file mode 100644
index 0000000000..122b7747cf
--- /dev/null
+++
b/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestOOXMLURIDereferencer.java
@@ -0,0 +1,84 @@
+/* ====================================================================
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+==================================================================== */
+
+package org.apache.poi.poifs.crypt.dsig;
+
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import javax.crypto.spec.SecretKeySpec;
+import javax.xml.crypto.URIReference;
+import javax.xml.crypto.URIReferenceException;
+import javax.xml.crypto.XMLCryptoContext;
+import javax.xml.crypto.dsig.XMLSignatureFactory;
+import javax.xml.crypto.dsig.dom.DOMValidateContext;
+
+import org.apache.commons.io.output.UnsynchronizedByteArrayOutputStream;
+import org.apache.poi.ooxml.util.DocumentHelper;
+import org.apache.poi.openxml4j.opc.OPCPackage;
+import org.junit.jupiter.api.Test;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+class TestOOXMLURIDereferencer {
+
+ private static URIReference uriRef(final String uri) {
+ return new URIReference() {
+ @Override
+ public String getURI() {
+ return uri;
+ }
+
+ @Override
+ public String getType() {
+ return null;
+ }
+ };
+ }
+
+ /**
+ * A signature reference is expected to resolve to a part inside the
package (or be a
+ * same-document reference). A reference whose URI carries a scheme points
outside the package
+ * and must not be resolved.
+ */
+ @Test
+ void absoluteUriIsNotResolved() throws Exception {
+ try (OPCPackage pkg =
OPCPackage.create(UnsynchronizedByteArrayOutputStream.builder().get())) {
+ SignatureInfo si = new SignatureInfo();
+ si.setOpcPackage(pkg);
+ si.setSignatureFactory(XMLSignatureFactory.getInstance("DOM"));
+
+ OOXMLURIDereferencer der = new OOXMLURIDereferencer();
+ der.setSignatureInfo(si);
+
+ Document doc = DocumentHelper.createDocument();
+ Element el = doc.createElement("r");
+ XMLCryptoContext ctx = new DOMValidateContext(new
SecretKeySpec(new byte[16], "AES"), el);
+
+ for (String uri : new String[]{
+ "http://poi.apache.org/",
+ "https://poi.apache.org/x",
+ "file:///etc/hostname",
+ "ftp://example.invalid/x"}) {
+ URIReference ref = uriRef(uri);
+ assertThrows(URIReferenceException.class, () ->
der.dereference(ref, ctx),
+ "reference outside the package should not be resolved:
" + uri);
+ }
+
+ pkg.revert();
+ }
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]