Skip to content

Conversation

@michaelsembwever
Copy link
Member

@michaelsembwever michaelsembwever commented Dec 3, 2025

https://github.com/riptano/cndb/issues/16021

Port into main-5.0 commit 4517338

Will be merged to main-5.0 after mck-cndb-15760-main-5.0 is merged.

CNDB-16021: CNDB-15280: Remove user data from AbstractReadQuery.toCQLString

Replace column values by '?' when converting internal read queries to CQL's SELECT queries, so user data don't end up in logs or any other unprotected place.

CQL queries printed in tracing and user-facing errors still expose the unredacted data.

@github-actions
Copy link

github-actions bot commented Dec 3, 2025

Checklist before you submit for review

  • This PR adheres to the Definition of Done
  • Make sure there is a PR in the CNDB project updating the Converged Cassandra version
  • Use NoSpamLogger for log lines that may appear frequently in the logs
  • Verify test results on Butler
  • Test coverage for new/modified code is > 80%
  • Proper code formatting
  • Proper title for each commit staring with the project-issue number, like CNDB-1234
  • Each commit has a meaningful description
  • Each commit is not very long and contains related changes
  • Renames, moves and reformatting are in distinct commits
  • All new files should contain the DataStax copyright header instead of the Apache License one

@michaelsembwever michaelsembwever marked this pull request as ready for review December 3, 2025 20:58
@adelapena
Copy link

Overall looks good, but it seems the new SlowQueryLoggerTest is failing.

@michaelsembwever michaelsembwever force-pushed the mck-cndb-16021-main-5.0 branch 2 times, most recently from 7917017 to d544dba Compare December 5, 2025 18:23
Base automatically changed from mck-cndb-15760-main-5.0 to main-5.0 December 7, 2025 16:38
Copy link

@adelapena adelapena left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, +1.

…String (#2038)

Replace column values by '?' when converting internal read queries to CQL's SELECT queries,
so user data don't end up in logs or any other unprotected place.

CQL queries printed in tracing and user-facing errors still expose the unredacted data.
@michaelsembwever
Copy link
Member Author

failed tests not reproduced locally. ninja fix squashed in for check failure on SAICodecUtils

@sonarqubecloud
Copy link

sonarqubecloud bot commented Dec 8, 2025

@michaelsembwever michaelsembwever merged commit 3df2541 into main-5.0 Dec 9, 2025
582 of 593 checks passed
@michaelsembwever michaelsembwever deleted the mck-cndb-16021-main-5.0 branch December 9, 2025 09:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants