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

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new fe201b44df7f CAMEL-24416: camel-core - upgrade guide notes for the 
XmlConverter SAX parser factory in 4.22.3 and 4.18.6 (#30180)
fe201b44df7f is described below

commit fe201b44df7f4f91e3b4608664a4c5a240051497
Author: Claus Ibsen <[email protected]>
AuthorDate: Mon Nov 16 16:07:58 2026 +0100

    CAMEL-24416: camel-core - upgrade guide notes for the XmlConverter SAX 
parser factory in 4.22.3 and 4.18.6 (#30180)
    
    The upgrade guides of all release lines live on `main`. This PR adds the 
note for the camel-4.22.x and camel-4.18.x backports of #25594 (CAMEL-24416: 
the XmlConverter SAX parser factory also disables external parameter entities 
and external DTD loading):
    
    - `camel-4x-upgrade-guide-4_22.adoc`, section "Upgrading from 4.22.2 to 
4.22.3"
    - `camel-4x-upgrade-guide-4_18.adoc`, section "Upgrading from 4.18.5 to 
4.18.6"
    
    _Claude Code on behalf of davsclaus_
    
    Co-Authored-By: Claude Opus 5.5 <[email protected]>
---
 .../modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc  | 16 ++++++++++++++++
 .../modules/ROOT/pages/camel-4x-upgrade-guide-4_22.adoc  | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git 
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc 
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc
index a3f44d146e5e..d0e08af5357e 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_18.adoc
@@ -91,6 +91,22 @@ at `DEBUG` level with the message only. Checkpoint failures 
triggered by batch s
 The webhook consumer still logs the body it validates at `DEBUG`, but no 
longer the signature from the `X-Signature` header, nor the signature it 
calculates.
 The `InvalidMessageSignatureException` of a failed check no longer carries the 
calculated signature: `getCalculatedSignature()` returns `null` and is 
deprecated, as is the constructor that takes it.
 
+=== camel-core - XmlConverter SAX parser factory
+
+`XmlConverter.createSAXParserFactory()` now also disables external parameter 
entities and external
+DTD loading:
+
+* `http://xml.org/sax/features/external-parameter-entities` = `false`
+* `http://apache.org/xml/features/nonvalidating/load-external-dtd` = `false`
+
+It previously set only `FEATURE_SECURE_PROCESSING` and 
`external-general-entities=false`, while
+`createDocumentBuilderFactory()` in the same class already blocked external 
resource resolution more
+thoroughly.
+
+Documents carrying an internal DTD subset still parse. Routes that genuinely 
need to resolve
+an external DTD or parameter entity through this converter must supply their 
own
+`SAXParserFactory`.
+
 === camel-file - idempotent consumer with an idempotent read lock
 
 With `idempotent=true` (or `noop=true`) and `readLock=idempotent`, 
`idempotent-changed` or `idempotent-rename`, the
diff --git 
a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_22.adoc 
b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_22.adoc
index 210a74b9feca..2248d2a052e3 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_22.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_22.adoc
@@ -124,6 +124,22 @@ sources must set the new `allowUrlCopySource=true` or 
`allowGlobCopySource=true`
 The new `copyBaseDirectory` option sets the directory that a local source must 
be inside, after resolving symbolic
 links.
 
+=== camel-core - XmlConverter SAX parser factory
+
+`XmlConverter.createSAXParserFactory()` now also disables external parameter 
entities and external
+DTD loading:
+
+* `http://xml.org/sax/features/external-parameter-entities` = `false`
+* `http://apache.org/xml/features/nonvalidating/load-external-dtd` = `false`
+
+It previously set only `FEATURE_SECURE_PROCESSING` and 
`external-general-entities=false`, while
+`createDocumentBuilderFactory()` in the same class already blocked external 
resource resolution more
+thoroughly.
+
+Documents carrying an internal DTD subset still parse. Routes that genuinely 
need to resolve
+an external DTD or parameter entity through this converter must supply their 
own
+`SAXParserFactory`.
+
 === camel-file - idempotent consumer with an idempotent read lock
 
 With `idempotent=true` (or `noop=true`) and `readLock=idempotent`, 
`idempotent-changed` or `idempotent-rename`, the

Reply via email to