Skip to content

Keep the OIDC identity off account forms, protect weblog admins, and limit search queries - #322

Open
mraible wants to merge 7 commits into
masterfrom
account-and-search-hardening
Open

mraible wants to merge 7 commits into
masterfrom
account-and-search-hardening

Conversation

@mraible

@mraible mraible commented Nov 18, 2026 •

Copy link
Copy Markdown
Contributor

Four smaller fixes:

  • OIDC identity on the profile and registration forms. Profile.save keeps the stored openIdUrl (the OIDC issuer#sub Roller uses to find an account at OIDC login), ProfileBean.copyTo no longer writes it, Register.save no longer takes it from the form, and the hidden field is gone from Profile.jsp. Only Roller's OIDC code sets it now. Admin UserEdit is unchanged. Test: FederatedIdentityFormTest.
  • Weblog membership. Declining an invitation only removes a pending permission, and a weblog's only administrator can't resign from it (new message yourWebsites.resign.lastAdmin). Resigning and saving the Members page go through a new UserManager.updateWeblogMembership(), which locks the weblog's row, reads its memberships again and applies the changes in the same transaction only if an enabled administrator remains, so concurrent changes run one after the other and can't leave a weblog without an administrator, and a disabled user with ADMIN doesn't count as one. Removing a weblog or a user also removes its pending invitations, so a weblog or user created later with the same name doesn't inherit them. Tests: WeblogMembershipTest, new cases in PermissionTest.
  • LDAP comment authenticator. The commenter's user name is escaped with javax.naming.ldap.Rdn.escapeValue before it goes into the bind DN. Test: new cases in LdapCommentAuthenticatorTest.
  • Search. The search query (q) is capped at 256 characters, without splitting a surrogate pair, in search and feed requests. When the cap ends inside a quoted phrase, that phrase's opening quote is dropped so the rest of the query still parses. SearchOperation treats any runtime exception while parsing or searching as a query error: no results, a logged warning. Tests: SearchMalformedQueryTest, SearchQueryLengthTest.

mvn test passes, and the Playwright database-login suite passes (20 run, 3 OIDC tests skipped).

CHANGES entries for this and the related fixes will come in one PR.

The profile and registration forms no longer set User.openIdUrl, which holds the issuer#subject that an OIDC login uses to find its account. Only Roller's OIDC login code sets it. Profile.save uses the stored value for its checks, whatever the request carries, so OIDC and DB_OIDC users still save their profiles; Register ignores it; and the profile page no longer posts it as a hidden field.
…resigning

Declining a weblog invitation now removes the permission only while it is still pending, so it can no longer remove an accepted membership. Resigning from a weblog is refused, with a message, when the user is the weblog's only admin; pending invitations do not count as another admin.
…bind name

LdapCommentAuthenticator now escapes the submitted user name with Rdn.escapeValue before putting it in the uid part of the bind DN, so characters such as commas, plus signs and equals signs stay part of the user name.
…ing nothing

WeblogSearchRequest and WeblogFeedRequest now keep only the first 256 characters of the q parameter, without splitting a surrogate pair. SearchOperation now catches runtime exceptions that Lucene throws for queries that parse but cannot be built or run, such as an unfinished regular expression or a negative phrase slop. It logs them as a warning and handles them the same way as a query that does not parse.

@snoopdave snoopdave 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.

Review of e153a6961: The shared fix hunks match #334; the differences are explained by master’s OIDC code and the javax/jakarta split. One membership consistency gap remains.

…ed operation

Resigning from a weblog and saving the Members page now go through UserManager.updateWeblogMembership(), which locks the weblog's row, reads its memberships again, and applies the changes in the same transaction only if an enabled administrator remains. Concurrent membership changes for a weblog therefore run one after the other and can't leave it without an administrator, and a disabled user who holds ADMIN no longer counts as one.
Removing a weblog or a user now also removes its pending invitations, so a weblog or user created later with the same name doesn't inherit them.
When the 256-character limit ends inside a quoted phrase, the search and feed requests now drop that phrase's opening quote, so the rest of the query still parses and finds entries instead of nothing.
@mraible

mraible commented Nov 18, 2026

Copy link
Copy Markdown
Contributor Author

A second review raised a few more points, now addressed in the latest commits:

  • A disabled user who holds ADMIN no longer counts as the weblog's remaining administrator when resigning or saving members, covered by a new WeblogMembershipTest case.
  • Removing a weblog or a user now also removes its pending invitations, so a weblog or user created again with the same name starts without them; PermissionTest covers both.
  • When the 256-character limit cuts a quoted phrase, the search request now drops that phrase's opening quote so the rest of the query still parses; a query Lucene can't parse was already caught and finds nothing. SearchQueryLengthTest covers both a cut and an intact phrase.
  • No change here for DB_OIDC profile saves: replacing the stored password of an account with a federated identity predates this PR, which only takes that identity from the stored user instead of the form, and keeping the stored password on Profile and UserEdit saves is handled in End a user's other sessions when their password changes or they're disabled #321.

@mraible
mraible requested a review from snoopdave November 18, 2026 04:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants