This is an automated email from the ASF dual-hosted git repository. mraible pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/roller.git
commit 8ce8b804859942f13024aab25ae92e32cab109d1 Merge: b8dabb72a 93ff6eb23 Author: Matt Raible <[email protected]> AuthorDate: Mon Oct 19 09:23:20 2026 -0600 Merge pull request #216 from mraible/feature/oidc-login Replace OpenID 2.0 with OAuth 2.0/OIDC login (move #155 to master) docker/entry-point.sh => .dockerignore | 21 +- Dockerfile | 20 +- app/pom.xml | 18 + .../apache/roller/weblogger/config/AuthMethod.java | 22 +- .../roller/weblogger/ui/core/RollerContext.java | 21 +- .../roller/weblogger/ui/core/RollerSession.java | 12 + .../ui/core/filters/BootstrapSecurityFilter.java | 5 +- .../weblogger/ui/core/security/LogoutRedirect.java | 84 +++ .../RollerClientRegistrationRepository.java | 235 +++++++++ .../ui/core/security/RollerOidcUserService.java | 297 +++++++++++ .../ui/core/security/RollerUserDetailsService.java | 9 + .../weblogger/ui/struts2/admin/UserEdit.java | 10 +- .../roller/weblogger/ui/struts2/core/Login.java | 52 +- .../roller/weblogger/ui/struts2/core/Profile.java | 8 +- .../weblogger/ui/struts2/core/ProfileBean.java | 17 +- .../roller/weblogger/ui/struts2/core/Register.java | 11 +- .../main/resources/ApplicationResources.properties | 30 +- .../roller/weblogger/config/roller.properties | 48 +- .../main/webapp/WEB-INF/jsps/admin/UserEdit.jsp | 12 +- app/src/main/webapp/WEB-INF/jsps/core/Login.jsp | 72 +-- app/src/main/webapp/WEB-INF/jsps/core/Profile.jsp | 11 +- app/src/main/webapp/WEB-INF/jsps/core/Register.jsp | 35 +- app/src/main/webapp/WEB-INF/security.xml | 40 +- app/src/main/webapp/WEB-INF/web.xml | 21 +- app/src/main/webapp/roller-ui/logout-redirect.jsp | 12 +- .../core/filters/BootstrapSecurityFilterTest.java | 77 +++ .../ui/core/security/LogoutRedirectTest.java | 131 +++++ .../RollerClientRegistrationRepositoryTest.java | 156 ++++++ .../core/security/RollerOidcUserServiceTest.java | 583 +++++++++++++++++++++ app/src/test/resources/roller-custom.properties | 3 + app/src/test/resources/roller-jettyrun.properties | 10 + docker-compose.yml | 41 +- docker/entry-point.sh | 14 + .../keycloak-health-check.sh} | 25 +- docker/realm-config/roller-realm.json | 524 ++++++++++++++++++ 35 files changed, 2456 insertions(+), 231 deletions(-)
