Repository navigation
make the SAMLSSOResponseValidator replay check atomic - #3625
Merged
Merged
Conversation
SAMLSSOResponseValidator.validateSubjectConfirmation guarded a POST binding assertion against replay with contains() followed by putId() on the TokenReplayCache, so concurrent submissions of the same captured response all passed the lookup before any of them was cached, and were all accepted. Add TokenReplayCache.putIdIfAbsent, backed by the atomic putIfAbsent of Ehcache and JCache (with a synchronized default for custom caches), and use it in the validator. This is the JAX-RS SAML SSO counterpart of the WS-Security JCacheReplayCache change in apache#3622.
Member
|
@rootvector2 isn't it the same as #3622 ? (CC @coheigea )? |
Contributor
Author
|
Not the same code path. #3622 only touched the WS-Security |
…to the cache concurrency test
coheigea
approved these changes
Oct 25, 2026
coheigea
pushed a commit
that referenced
this pull request
Oct 26, 2026
* make the SAMLSSOResponseValidator replay check atomic SAMLSSOResponseValidator.validateSubjectConfirmation guarded a POST binding assertion against replay with contains() followed by putId() on the TokenReplayCache, so concurrent submissions of the same captured response all passed the lookup before any of them was cached, and were all accepted. Add TokenReplayCache.putIdIfAbsent, backed by the atomic putIfAbsent of Ehcache and JCache (with a synchronized default for custom caches), and use it in the validator. This is the JAX-RS SAML SSO counterpart of the WS-Security JCacheReplayCache change in #3622. * reject null and empty ids in the default putIdIfAbsent, add timeouts to the cache concurrency test (cherry picked from commit d27cfb0)
coheigea
pushed a commit
that referenced
this pull request
Oct 26, 2026
* make the SAMLSSOResponseValidator replay check atomic SAMLSSOResponseValidator.validateSubjectConfirmation guarded a POST binding assertion against replay with contains() followed by putId() on the TokenReplayCache, so concurrent submissions of the same captured response all passed the lookup before any of them was cached, and were all accepted. Add TokenReplayCache.putIdIfAbsent, backed by the atomic putIfAbsent of Ehcache and JCache (with a synchronized default for custom caches), and use it in the validator. This is the JAX-RS SAML SSO counterpart of the WS-Security JCacheReplayCache change in #3622. * reject null and empty ids in the default putIdIfAbsent, add timeouts to the cache concurrency test (cherry picked from commit d27cfb0)
Contributor
Author
|
Thanks for the review and merge, glad the SSO side is covered too. |
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.
SAMLSSOResponseValidator.validateSubjectConfirmationreplay-checks a POST binding assertion with a non-atomiccontainsthenputIdon theTokenReplayCache, so concurrent submissions of one captured response all pass the lookup before any of them is cached and are all accepted (reproducer: 8 concurrent submissions of the same assertion id, accepted 8 times against bothEHCacheTokenReplayCacheandJCacheTokenReplayCache), found while reviewing the JAX-RS SAML SSO side of #3622, and fixed by addingTokenReplayCache.putIdIfAbsentbacked by the atomicputIfAbsentof Ehcache and JCache (synchronized default for custom caches) and using it in the validator, with regression tests for both caches and the validator.