Skip to content

Stable 25.8 Backport of #131963 - Clear --jwt and the other credential options from the command line of clickhouse-client and clickhouse-keeper-client - #2936

Draft
blau-ai wants to merge 2 commits into
stable-25.8from
backports/stable-25.8/131963
Draft

blau-ai wants to merge 2 commits into
stable-25.8from
backports/stable-25.8/131963

Conversation

@blau-ai

@blau-ai blau-ai commented Nov 20, 2026

Copy link
Copy Markdown
Collaborator

Changelog category (leave one):

  • Improvement

Changelog entry (a user-readable short description of the changes that goes to CHANGELOG.md):

clickhouse-client now clears the values of --jwt, --ssh-key-passphrase, --one-time-password and --oauth-client-secret from its command line, as it already did for --password, so they are no longer visible in ps and /proc/<pid>/cmdline. clickhouse-keeper-client now does the same for --password and --identity. Closes ClickHouse#131191. (ClickHouse#131963 by @groeneai)

Documentation entry for user-facing changes

...

CI/CD Options

Exclude tests:

  • Fast test
  • Integration Tests
  • Stateless tests
  • Stateful tests
  • Unit tests
  • Performance tests
  • Aarch64 tests
  • All with ASAN
  • All with TSAN
  • All with MSAN
  • All with UBSAN
  • All with Coverage
  • All Regression
  • Disable CI Cache

Regression jobs to run:

  • Fast suites (mostly <1h)
  • Aggregate Functions (2h)
  • Alter (1.5h)
  • Benchmark (30m)
  • CAS (content-addressed storage; Antalya only)
  • ClickHouse Keeper (1h)
  • Iceberg (2h)
  • LDAP (1h)
  • OAuth (5m)
  • Parquet (1.5h)
  • RBAC (1.5h)
  • SSL Server (1h)
  • S3 (2h)
  • S3 Export (2h)
  • Swarms (30m)
  • Tiered Storage (2h)

PedroTadim and others added 2 commits November 20, 2026 12:53
…ptions-from-command-line

Clear `--jwt` and the other credential options from the command line of `clickhouse-client` and `clickhouse-keeper-client`

Conflicts committed as-is, conflict markers included:
- programs/keeper-client/KeeperClient.cpp (both modified)
Kept the minimal `KeeperClient.cpp` include and call; reduced the test and reference to options that exist in stable-25.8.
@blau-ai blau-ai added 25.8 25.8 Altinity Stable backport Backport stable stable-25.8 labels Nov 20, 2026
@blau-ai

blau-ai commented Nov 20, 2026

Copy link
Copy Markdown
Collaborator Author

Port-AL: cherry-pick conflicts resolved by AI

Conflicted files:

  • programs/keeper-client/KeeperClient.cpp (both modified)

Commits:

  • 4a00a87: cherry-pick with the conflicts committed as-is

  • 5351183: resolution

  • programs/keeper-client/KeeperClient.cpp conflicted because the surrounding includes differ in stable-25.8. The resolution adds only Common/clearPasswordFromCommandLine.h and the clearPasswordFromCommandLine(argc, argv) call after client.init.

  • The test 05813_clear_credentials_from_command_line.sh and its reference no longer use --one-time-password and --oauth-client-secret, which stable-25.8's clickhouse-client does not have.

  • The helper's secret_options list keeps the two missing names. They are harmless there and avoid drift from master.

  • I could not run the test or check stable-25.8 for another test numbered 05813.

@github-actions

Copy link
Copy Markdown

Workflow [PR], commit [5351183]

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

25.8 25.8 Altinity Stable backport Backport stable stable-25.8

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants