GEODE-10559: Upgrade Apache Shiro to 2.1.0 (CVE-2026-23903 remediation)#7986
Open
JinwooHwang wants to merge 1 commit intoapache:developfrom
Open
GEODE-10559: Upgrade Apache Shiro to 2.1.0 (CVE-2026-23903 remediation)#7986JinwooHwang wants to merge 1 commit intoapache:developfrom
JinwooHwang wants to merge 1 commit intoapache:developfrom
Conversation
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
This PR upgrades Apache Shiro from 1.13.0 to 2.1.0 to remediate CVE-2026-23903. The upgrade required API migrations where Shiro moved/removed common exception types and some providers. The changes update production code, tests, and build configuration to use Shiro 2.1.0 and restore a clean build and test pass.
Jira: GEODE-10559
CVE: CVE-2026-23903
Key Changes
shiro.versionto2.1.0in the dependency constraints.IntegratedSecurityServiceandSecurityManagerProviderto catch and use the specific Shiro exceptions available in 2.1.0 (e.g.,AuthenticationException,AuthorizationException,ConfigurationException) instead of the removed/relocatedShiroException.Files Modified (high level)
build-tools/geode-dependency-management/.../DependencyConstraints.groovy—shiro.version->2.1.0geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.javageode-core/src/main/java/org/apache/geode/internal/security/SecurityManagerProvider.javageode-core/src/test/java/org/apache/geode/internal/InternalDataSerializerShiroAcceptListTest.javageode-core/src/test/java/org/apache/geode/internal/security/IntegratedSecurityServiceTest.javaMigration Notes
Shiro 2.1.0 removed or relocated some common exception classes (notably
ShiroException). Where code previously caught or referenced the genericShiroException, it has been updated to catch the more specific exceptions that match actual failure modes:org.apache.shiro.authc.AuthenticationExceptionorg.apache.shiro.authz.AuthorizationExceptionorg.apache.shiro.config.ConfigurationExceptionTests were updated to assert against these available exceptions where the original, removed types were referenced. No tests were removed; tests that had been accidentally deleted were restored and corrected.
Testing performed
spotlessApply)../gradlew compileTestJavasuccessfully../gradlew test— BUILD SUCCESSFUL. All modified modules passed unit tests.Risk and Compatibility
ShiroException(if any external code did so) may need to adjust to the more specific exceptions. Internal code now uses specific Shiro exceptions aligned with the 2.1.0 API.Release notes (suggested)
Rollback / mitigation
IntegratedSecurityServiceandSecurityManagerProviderand restore the test updates. A rollback branch or tag should be prepared if needed.Checklist
2.1.0Reviewers / Suggested reviewers
If you want, I can also add a short changelog entry and create a rollback tag. Which should I do next?
For all changes, please confirm:
develop)?gradlew buildrun cleanly?