Antalya 26.5: address OAuth security audit#1958
Open
zvonand wants to merge 2 commits into
Open
Conversation
…next commit) --- Original cherry-pick message follows: Merge pull request #1777 from Altinity/fix/antalya-26.3/oauth-address-audit Antalya 26.3: address OAuth security audit # Conflicts: # src/Access/AccessControl.cpp # src/Access/AuthenticationData.cpp # src/Access/Common/JWKSProvider.cpp # src/Access/Common/JWKSProvider.h # src/Access/ExternalAuthenticators.cpp # src/Access/ExternalAuthenticators.h # src/Access/TokenAccessStorage.cpp # src/Access/TokenAccessStorage.h # src/Access/TokenProcessors.h # src/Access/TokenProcessorsJWT.cpp # src/Access/TokenProcessorsOpaque.cpp # src/Access/TokenProcessorsParse.cpp # src/Parsers/Access/ASTAuthenticationData.cpp # src/Parsers/Access/ParserCreateUserQuery.cpp # src/Server/HTTP/authenticateUserByHTTP.cpp # src/Server/TCPHandler.cpp # tests/integration/test_jwt_auth/test.py # tests/integration/test_keycloak_auth/configs/validators.xml
Cherry-pick of PR #1777 ("Antalya 26.3: address OAuth security audit") from commit 52e87d7. Conflict resolution strategy (forward_port): - Bucket 1: conflict "theirs" blocks taken as-is from PR #1777 - Bucket 2: minimal adaptations for missing prerequisites from PR #1658 (token auth infrastructure not yet on antalya-26.5) Bucket-2 adaptations: - `Credentials.h`: add `TokenCredentials` class (missing from PR #1658) - `AuthenticationData.h`: add `token_processor_name`, `jwt_claims` fields and their accessors (referenced by auto-merged `operator==`) - `ExternalAuthenticators.h`: update `setConfiguration` to 3-param form, add `isTokenAuthEnabled` declaration - `ExternalAuthenticators.cpp`: wire `token_auth_enabled_` and `token_processors_config` into `setConfiguration` body - `AccessControl.cpp`: adapt `isTokenAuthEnabled`/`setTokenAuthEnabled` calls (absent on `AccessControl` in 26.5) to pass config value directly - `authenticateUserByHTTP.cpp`: add `bearer_token` extraction from "Bearer" HTTP Authorization scheme; adapt `isTokenAuthEnabled()` call to `getExternalAuthenticators().isTokenAuthEnabled()` - `TCPHandler.h`/`TCPHandler.cpp`: add `is_jwt_based_auth` member and `JWT_AUTHENTICAION_MARKER` detection; adapt `isTokenAuthEnabled()` call Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
zvonand
added
releasy
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
1 participant
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.
Changelog category (leave one):
Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
Address OAuth security audit (#1777 by @zvonand).
CI/CD Options
Exclude tests:
Regression jobs to run:
Cherry-picked from #1777.
Follow-up for #1658