Skip to content

Document location restrictions on Log4j 1 external entities - #4265

Merged
ramanathan1504 merged 2 commits into
2.xfrom
fix/2.x/xml-entity-restrictions-docs
Sep 17, 2026
Merged

ramanathan1504 merged 2 commits into
2.xfrom
fix/2.x/xml-entity-restrictions-docs

Conversation

@ppkarwasz

Copy link
Copy Markdown
Member

Stacked on #4264; only the last commit belongs to this PR.

Documents the behavior introduced by #4198, which first ships in 2.27.0: the external subset and other external entities in Log4j 1 XML configuration files are resolved through ConfigurationSource, so they can only be retrieved from locations allowed by the log4j2.configurationAllowedProtocols property. Adds a note to the migration guide and a paragraph to the Javadoc of the bridge XmlConfiguration.

Kept separate from #4264 so that the documentation of unreleased behavior can be merged (or held back) independently. After #4264 merges, the base can be retargeted to 2.x.

🤖 Generated with Claude Code

https://claude.ai/code/session_01LNsw2hhNuJ6tjsEU2tChnn

@ppkarwasz
ppkarwasz force-pushed the fix/2.x/xml-entity-restrictions-docs branch from c05fd82 to 5278cc6 Compare August 30, 2026 09:54
@ppkarwasz
ppkarwasz force-pushed the fix/2.x/xml-entity-restrictions-docs branch 2 times, most recently from 4d7131e to ceaeeb4 Compare August 30, 2026 15:16

@ramanathan1504 ramanathan1504 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ppkarwasz Changelog is missing

Comment thread log4j-1.2-api/src/main/java/org/apache/log4j/xml/XmlConfiguration.java Outdated
Comment thread src/site/antora/modules/ROOT/pages/migrate-from-log4j1.adoc Outdated
@ppkarwasz

Copy link
Copy Markdown
Member Author

Changelog is missing

This is documentation only, so I wouldn't add any changelog. For me a changelog is necessary, so users can rapidly find a change that might have broken their application. In this case, no code changes are present.

@ramanathan1504

Copy link
Copy Markdown
Contributor

Changelog is missing

This is documentation only, so I wouldn't add any changelog. For me a changelog is necessary, so users can rapidly find a change that might have broken their application. In this case, no code changes are present.

ok understood👍

@ramanathan1504 ramanathan1504 added this to the 2.27.0 milestone Sep 14, 2026
@ppkarwasz ppkarwasz added the port-done No further port needed: all required ports are merged, or none was needed label Sep 15, 2026
@ppkarwasz
ppkarwasz force-pushed the fix/2.x/xml-entity-restrictions-docs branch from 3e70cc9 to f33fbeb Compare September 15, 2026 19:41
Base automatically changed from fix/2.x/xml-parser-docs to 2.x September 17, 2026 07:11
ppkarwasz and others added 2 commits September 17, 2026 12:41
Since version 2.27.0 (#4198), the external subset and other external
entities in Log4j 1 XML configuration files are resolved through
`ConfigurationSource`, so they can only be retrieved from locations
allowed by the `log4j2.configurationAllowedProtocols` property.
Document this in the migration guide and in the Javadoc of the bridge
`XmlConfiguration`.

Assisted-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LNsw2hhNuJ6tjsEU2tChnn
Co-authored-by: Ramanathan <ramanathanbscmca@gmail.com>
@ramanathan1504
ramanathan1504 force-pushed the fix/2.x/xml-entity-restrictions-docs branch from a80b994 to 893d8d0 Compare September 17, 2026 07:11
@ramanathan1504
ramanathan1504 merged commit 858d7eb into 2.x Sep 17, 2026
7 checks passed
@ramanathan1504
ramanathan1504 deleted the fix/2.x/xml-entity-restrictions-docs branch September 17, 2026 07:29
@github-project-automation github-project-automation Bot moved this from Approved to Merged in Log4j pull request tracker Sep 17, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

port-done No further port needed: all required ports are merged, or none was needed

Projects

Development

Successfully merging this pull request may close these issues.

3 participants