Repository navigation
Conversation
Map /roller-services/app/* to a small RollerAtomServlet that extends Propono's AtomServlet: - Answer 404 while webservices.enableAtomPub is off, matching the XML-RPC endpoint. Previously only the service document checked the setting. - Read Atom entry bodies (POST of Atom content, PUT to an entry URI) with Roller's standard XML parser configuration, cap them at 10 MB, and hand Propono a buffered copy. Unparseable entries get 400; oversized ones 413. RollerAtomHandler's entry-URI test moves into a static helper so the servlet and handler use the same rule.
snoopdave
commented
Oct 3, 2026
snoopdave
left a comment
Contributor
Author
There was a problem hiding this comment.
PR-Review: 1 inline comment posted.
Contributor
Author
|
🐞Claude Issue: PR-Review: General Issues The following issues were found but cannot be attached to a specific line in the diff:
|
This was referenced Oct 3, 2026
Contributor
Author
|
🤖Claude:
|
RollerAtomServlet now creates the AtomPub handler first and answers 401 when no user is authenticated, before buffering or parsing the entry. The handler is passed to Propono through a request attribute, which RollerAtomHandlerFactory returns, so authentication runs once per request. Add a 6.1.7 CHANGES.md section for the AtomPub behaviour changes.
…al entity in user-controlled data' Co-authored-by: Copilot Autofix powered by AI <62310815+github-advanced-security[bot]@users.noreply.github.com>
Fold the disabled-service read check into the write check, and drop the media PUT, unauthenticated PUT and entry-path cases, which repeat paths the remaining tests already cover.
Contributor
Author
|
With those fixes, I think this PR is ready for merge. |
This was referenced Oct 4, 2026
Contributor
Author
|
Manually tested on the 6.1.7 integration build (Tomcat 9, JDK 11, MySQL 8) with curl and basic auth. Pass.
Testing found some old |
ppkarwasz
reviewed
Oct 5, 2026
Contributor
Author
|
@ppkarwasz thanks for the review! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Maps
/roller-services/app/*to a newRollerAtomServlet, a small subclass of Propono'sAtomServlet, so Roller controls how AtomPub requests are handled before Propono sees them.webservices.enableAtomPubon every request. Until now only the service document checked the setting. With AtomPub off, the endpoint now answers 404, the same way the XML-RPC endpoint does.SafeSAXBuildersettings Roller uses elsewhere, and hands Propono a buffered copy. An entry that does not parse gets 400; an oversized one gets 413. Media uploads and reads are unchanged.RollerAtomHandler's entry-URI rule moves into a staticisEntryPathhelper, so the servlet and the handler use the same test.Testing
RollerAtomServletTest(10 tests): disabled service, pass-through of reads and media, buffered forwarding of a normal entry, refused entries on POST and PUT, size limit, and the shared entry-path rule.mvn -pl app teston JDK 11: 335 tests, 0 failures, 1 skipped.Targets
roller-6.1.xfor 6.1.7. It will be cherry-picked tomasterafter the 6.1.7 release.