[SANTUARIO-615] Implements secure digest algorithm validation for XAdES

Author: Joze RIHTARSIC

src/main/java/org/apache/xml/security/extension/xades/XAdESBBValidator.java

@@ -18,7 +18,7 @@
  */
 package org.apache.xml.security.extension.xades;
 
-import org.apache.xml.security.algorithms.JCEMapper;
+import org.apache.xml.security.algorithms.MessageDigestAlgorithm;
 import org.apache.xml.security.exceptions.XMLSecurityException;
 import org.apache.xml.security.signature.Reference;
 import org.apache.xml.security.signature.SignedInfo;
@@ -40,8 +40,6 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
@@ -87,7 +85,9 @@
  */
 public final class XAdESBBValidator {
 
-    private static final String XADES_SCHEMA_RESOURCE ="bindings/schemas/XAdES01903v141-202107.xsd";
+    private static final String XADES_SCHEMA_RESOURCE =
+            "bindings/schemas/XAdES01903v132-201601.xsd";
+
 
     /**
      * Schema is thread-safe once constructed; load once and share.
@@ -106,7 +106,7 @@ private static Schema loadSchema() {
                     XADES_SCHEMA_RESOURCE, XAdESBBValidator.class)) {
                 return sf.newSchema(new StreamSource(xadesIs, xadesUri));
             }
-        } catch (SAXException | IOException  e) {
+        } catch (SAXException | IOException e) {
             // Logged here; validate() reports the violation rather than crashing callers
             System.getLogger(XAdESBBValidator.class.getName())
                     .log(System.Logger.Level.ERROR,
@@ -123,6 +123,17 @@ private static String resourceUri(String path) {
         return url.toExternalForm();
     }
 
+
+    private final boolean secureValidation;
+
+    public XAdESBBValidator() {
+        this(true);
+    }
+
+    public XAdESBBValidator(boolean secureValidation) {
+        this.secureValidation = secureValidation;
+    }
+
     /**
      * Validates XAdES-B-B properties in {@code signature}.
      *
@@ -259,9 +270,8 @@ private void validateCertDigest(Element qualifyingProps,
             return;
         }
 
-        String jceAlgorithm = JCEMapper.translateURItoJCEID(algorithmURI);
-        if (jceAlgorithm == null) {
-            violations.add("Unknown digest algorithm URI in CertDigest: " + algorithmURI);
+        if (secureValidation && !XAdESConstants.APPROVED_CERT_DIGEST_ALGORITHM_URIS.contains(algorithmURI)) {
+            violations.add("CertDigest uses a weak or disallowed digest algorithm: " + algorithmURI);
             return;
         }
 
@@ -276,8 +286,8 @@ private void validateCertDigest(Element qualifyingProps,
         byte[] actualDigest;
         try {
             byte[] certDer = signingCertificate.getEncoded();
-            actualDigest = MessageDigest.getInstance(jceAlgorithm).digest(certDer);
-        } catch (CertificateEncodingException | NoSuchAlgorithmException e) {
+            actualDigest = MessageDigestAlgorithm.getDigestInstance(algorithmURI).digest(certDer);
+        } catch (CertificateEncodingException | XMLSecurityException e) {
             violations.add("Cannot compute signing certificate digest: " + e.getMessage());
             return;
         }

src/main/java/org/apache/xml/security/extension/xades/XAdESConstants.java

@@ -18,8 +18,12 @@
  */
 package org.apache.xml.security.extension.xades;
 
+import org.apache.xml.security.algorithms.MessageDigestAlgorithm;
+
+import java.util.Set;
+
 /**
- * Namespace URIs, prefixes, and element tag constants for XAdES v1.3.2 and v1.4.1.
+ * Namespace URIs, prefixes, element tag constants, and approved algorithm sets for XAdES v1.3.2 and v1.4.1.
  *
  * @see <a href="https://www.etsi.org/deliver/etsi_en/319100_319199/31913201/01.03.01_60/en_31913201v010301p.pdf">
  *      ETSI EN 319 132-1 (XAdES)</a>
@@ -29,6 +33,20 @@ public final class XAdESConstants {
     private XAdESConstants() {
     }
 
+    /**
+     * Algorithm URIs accepted for certificate digest in XAdES {@code CertDigest}.
+     * Only SHA-2 and SHA-3 variants with at least 256-bit output are permitted;
+     * MD5, SHA-1, SHA-224, and other weak/deprecated algorithms are rejected.
+     * Used by both {@link XAdESSignatureProcessor} (signing) and {@link XAdESBBValidator} (validation)
+     */
+    public static final Set<String> APPROVED_CERT_DIGEST_ALGORITHM_URIS = Set.of(
+            MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA256,
+            MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA384,
+            MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA512,
+            MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA3_256,
+            MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA3_384,
+            MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA3_512);
+
     public static final String XADES_V132_NS = "http://uri.etsi.org/01903/v1.3.2#";
     public static final String XADES_V141_NS = "http://uri.etsi.org/01903/v1.4.1#";
 

src/main/java/org/apache/xml/security/extension/xades/XAdESSignatureProcessor.java

@@ -18,8 +18,9 @@
  */
 package org.apache.xml.security.extension.xades;
 
-import org.apache.xml.security.algorithms.JCEMapper;
+import org.apache.xml.security.algorithms.MessageDigestAlgorithm;
 import org.apache.xml.security.encryption.XMLCipher;
+import org.apache.xml.security.exceptions.XMLSecurityException;
 import org.apache.xml.security.extension.SignatureExtensionException;
 import org.apache.xml.security.extension.SignatureProcessor;
 import org.apache.xml.security.signature.ObjectContainer;
@@ -30,8 +31,6 @@
 import org.apache.xml.security.transforms.Transforms;
 import org.w3c.dom.Document;
 
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.security.cert.CertificateEncodingException;
 import java.security.cert.X509Certificate;
 import java.time.OffsetDateTime;
@@ -143,12 +142,6 @@ private SignedSignatureProperties buildSignedSignatureProperties(Document doc)
     }
 
     private SigningCertificate buildSigningCertificate(Document doc) throws XMLSignatureException {
-        String jceAlgorithm = JCEMapper.translateURItoJCEID(certificateDigestAlgorithmURI);
-        if (jceAlgorithm == null) {
-            throw new SignatureExtensionException(
-                    "Unknown digest algorithm URI: " + certificateDigestAlgorithmURI);
-        }
-
         byte[] certDer;
         try {
             certDer = certificate.getEncoded();
@@ -158,8 +151,8 @@ private SigningCertificate buildSigningCertificate(Document doc) throws XMLSigna
 
         byte[] digest;
         try {
-            digest = MessageDigest.getInstance(jceAlgorithm).digest(certDer);
-        } catch (NoSuchAlgorithmException e) {
+            digest = MessageDigestAlgorithm.getDigestInstance(certificateDigestAlgorithmURI).digest(certDer);
+        } catch (XMLSecurityException e) {
             throw new SignatureExtensionException(
                     "Digest algorithm not available: " + certificateDigestAlgorithmURI, e);
         }
@@ -175,13 +168,13 @@ private SigningCertificate buildSigningCertificate(Document doc) throws XMLSigna
         return sc;
     }
 
-    private void ensureSignatureId(XMLSignature signature) throws XMLSignatureException {
+    private void ensureSignatureId(XMLSignature signature) {
         if (isBlank(signature.getId())) {
             signature.setId(IDGenerator.generateID(ID_PREFIX_SIG));
         }
     }
 
-    private void ensureSignatureValueId(XMLSignature signature) throws XMLSignatureException {
+    private void ensureSignatureValueId(XMLSignature signature){
         if (isBlank(signature.getSignatureValueId())) {
             signature.setSignatureValueId(IDGenerator.generateID(ID_PREFIX_SIG_VAL));
         }
@@ -220,6 +213,7 @@ private static boolean isBlank(String value) {
      */
     public static final class Builder {
 
+        private boolean allowWeakAlgorithms = false;
         private final X509Certificate certificate;
         private String certificateDigestAlgorithmURI = XMLCipher.SHA256;
         private boolean signaturePolicyImplied = false;
@@ -261,6 +255,12 @@ public Builder withSignatureCountryName(String countryName) {
             return this;
         }
 
+        /** When {@code true}, allows weak digest algorithms (e.g. SHA-1) to be used for certificate digest. */
+        public Builder withAllowWeakAlgorithms(boolean allowWeakAlgorithms) {
+            this.allowWeakAlgorithms = allowWeakAlgorithms;
+            return this;
+        }
+
         /**
          * Adds a canonicalization or transform algorithm URI to apply to the
          * {@code SignedProperties} reference before digesting. Algorithms are applied in
@@ -273,6 +273,11 @@ public Builder addReferenceTransformAlgorithm(String algorithm) {
 
         public XAdESSignatureProcessor build() {
             Objects.requireNonNull(certificateDigestAlgorithmURI, "certificateDigestAlgorithmURI");
+            if (!this.allowWeakAlgorithms && !XAdESConstants.APPROVED_CERT_DIGEST_ALGORITHM_URIS.contains(certificateDigestAlgorithmURI)) {
+                throw new IllegalArgumentException(
+                        "certificateDigestAlgorithmURI uses a weak or disallowed digest algorithm: "
+                                + certificateDigestAlgorithmURI);
+            }
             return new XAdESSignatureProcessor(this);
         }
     }