Skip to content

Commit 5c63735

Browse files
committed
Backport #3837 in 2.14(.3)
1 parent bcad78b commit 5c63735

File tree

3 files changed

+5
-0
lines changed

3 files changed

+5
-0
lines changed

release-notes/CREDITS-2.x

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1488,6 +1488,8 @@ PJ Fanning (pjfanning@github)
14881488
(2.14.0)
14891489
* Contributed #3530: Change LRUMap to just evict one entry when maxEntries reached
14901490
(2.14.0)
1491+
* Contributed #3837: Set transformer factory attributes to improve protection against XXE
1492+
(2.14.3)
14911493
14921494
Igor Shymko (ancane@github)
14931495
* Contributed #3500: Add optional explicit `JsonSubTypes` repeated names check

release-notes/VERSION-2.x

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ Project: jackson-databind
88

99
#3784: `PrimitiveArrayDeserializers$ByteDeser.deserialize` ignores
1010
`DeserializationProblemHandler` for invalid Base64 content
11+
#3837: Set transformer factory attributes to improve protection against XXE
12+
(contributed by @pjfanning)
1113

1214
2.14.2 (28-Jan-2023)
1315

src/main/java/com/fasterxml/jackson/databind/ext/DOMSerializer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public DOMSerializer() {
2828
try {
2929
transformerFactory = TransformerFactory.newInstance();
3030
transformerFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
31+
// 22-Mar-2023, tatu: [databind#3837] add these 2 settings further
3132
setTransformerFactoryAttribute(transformerFactory, XMLConstants.ACCESS_EXTERNAL_DTD, "");
3233
setTransformerFactoryAttribute(transformerFactory, XMLConstants.ACCESS_EXTERNAL_STYLESHEET, "");
3334
} catch (Exception e) {

0 commit comments

Comments
 (0)