Conversation
…next commit) --- Original cherry-pick message follows: Merge pull request #2140 from Altinity/feature/antalya-26.6/auto-grp-pr-1658 Antalya 26.6: Token authentication/authorization + OAuth client login # Conflicts: # docs/concepts/features/interfaces/client.mdx # docs/concepts/features/security/external-authenticators/tokens.md # docs/en/operations/external-authenticators/index.md # programs/client/Client.cpp # src/Access/AccessControl.h # src/Access/ExternalAuthenticators.cpp # src/Common/ShellCommand.h # src/Core/ServerSettings.cpp # src/Interpreters/Context.cpp # src/Parsers/Access/ASTAuthenticationData.h # src/Parsers/Access/ParserCreateUserQuery.cpp # src/Server/HTTP/authenticateUserByHTTP.cpp
Kept the port's additions (token auth, --jwt-command / --login OAuth client options, enable_token_auth server setting, Bearer token HTTP auth, JWT PROCESSOR/CLAIMS parser clauses) on top of antalya-26.8's own changes in the same regions. Adapted: parseValidUntil/setValidUntil - antalya-26.8 re-signatured parseValidUntil (extra valid_until_is_interval out-param) and routes the AST through ASTAuthenticationData::setValidUntil, so the port's `parseValidUntil(pos, expected, auth_data->valid_until)` was translated to the new form. Adapted: formatValidUntil in ASTAuthenticationData.cpp - antalya-26.8 added the `is_interval` parameter, so the port's JWT case passes valid_until_is_interval. Adapted: docs - antalya-26.8 moved docs/en/operations/external-authenticators/index.md to docs/concepts/features/security/external-authenticators/index.mdx, so the port's single added bullet was applied there (with the new absolute link form) instead of resurrecting the deleted old-path file. Adapted: src/Core/ServerSettings.cpp - antalya-26.8 de-indented the setting docstrings, so the added enable_token_auth docstring is de-indented to match.
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.
Changelog category (leave one):
Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):
Add token-based authentication and authorization, with a new Entra processor type that validates Entra ID tokens locally through the OIDC flow using published JWKS (the tenant ID must now be set in the configuration, and the older azure type remains as an alias). Extend clickhouse-client with OAuth2 login, including browser and device code flows, and with an option to obtain a JWT from an external command, re-invoked on every reconnect.
Add token-based authentication and authorization, with a new Entra processor type that validates Entra ID tokens locally through the OIDC flow using published JWKS (the tenant ID must now be set in the configuration, and the older azure type remains as an alias). Extend clickhouse-client with OAuth2 login, including browser and device code flows, and with an option to obtain a JWT from an external command, re-invoked on every reconnect (#1658 by @zvonand, #1749 by @zvonand, #1777 by @zvonand, #1784 by @zvonand, #1799 by @zvonand, #1809 by @zvonand, #2086 by @zvonand, #2114 by @zvonand) (#2140 by @zvonand).
CI/CD Options
Exclude tests:
Regression jobs to run:
Cherry-picked from #2140.