Repository navigation
Conversation
Backport to main of the CVE-2026-93998 fix released in 26.8.2, 26.6.8 and 26.4.17. Closes keycloak#54703 Signed-off-by: Bruno Oliveira da Silva <bruno@abstractj.com>
Move CVE-2026-93998 issuer validation test from the deprecated testsuite/ (Arquillian adapter test) to the new tests/ framework (broker-based test) to comply with the testsuite deprecation check. - Remove SamlIssuerValidationTest from old testsuite - Revert ModifySamlResponseStepBuilder signing additions (only needed by removed test) - Add issuer mutation helpers to SamlResponseDocument - Create KcSamlBrokerIssuerValidationTest exercising the broker-side issuer validation against the configured IdP entity ID Signed-off-by: Bruno Oliveira da Silva <bruno@abstractj.com>
abstractj
force-pushed
the
issue-54703-backport-cve-2026-93998
branch
from
November 10, 2026 18:14
8857567 to
ef0e7cc
Compare
Unreported flaky test detectedIf the flaky tests below are affected by the changes, please review and update the changes accordingly. Otherwise, a maintainer should report the flaky tests prior to merging the PR. org.keycloak.testsuite.adapter.servlet.SAMLServletAdapterTest#salesPostSigEmailTestorg.keycloak.testsuite.adapter.servlet.SAMLServletAdapterTest#testReloginWithInvalidAuthSessionCookie |
The broker requires a non-null response issuer when idpEntityId is configured, unlike the adapter which treats it as optional. Update the test to expect rejection when the response-level issuer is removed. Signed-off-by: Bruno Oliveira da Silva <bruno@abstractj.com>
abstractj
force-pushed
the
issue-54703-backport-cve-2026-93998
branch
from
November 10, 2026 20:33
a52851f to
b3522ed
Compare
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.
Backport to
mainof the CVE-2026-93998 fix released in 26.8.2, 26.6.8 and 26.4.17.The SAML adapter verified signatures, audience, recipient, and time conditions but never
checked whether the assertion actually came from the expected identity provider. When distinct
IdP issuers share a signing key, an attacker controlling one issuer could forge assertions
selecting arbitrary principals and roles.
This commit adds issuer validation in
AbstractSamlAuthenticationHandler.handleLoginResponse()and on the
LogoutRequestpath, and updates the adapter installation endpoints to generatethe actual realm URL as the IdP entity ID instead of the hardcoded placeholder
idp.Closes #54703