Redact sensitive information in catalog queries #23104
Closed
+1,043
−8
Conversation
This file contains 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
The SPI will be used by the engine to mask security-sensitive information in statements that manage catalogs. It has been added at the connector factory level, rather than the connector level, to allow more flexibility in retrieving properties. In some cases, we want to perform masking before a connector is initiated. For example, when we create a new catalog by issuing the CREATE CATALOG statement.
The purpose of the included test is to identify security-sensitive properties that may be used by the connector. It uses the output generated by the maven-dependency-plugin, configured in the connector's pom.xml file. This output contains the connector's runtime classpath, which is then scanned to identify all property names annotated with @ConfigSecuritySensitive. Scanning the classpath ensures that all configuration classes are included, even those used conditionally.
piotrrzysko
force-pushed
the
piotrrzysko/redact-catalog-queries
branch
from
1f8a715 to
83b91cd
Compare
This commit introduces redacting of security-sensitive information in statements containing connector properties, specifically: * CREATE CATALOG * EXPLAIN CREATE CATALOG * EXPLAIN ANALYZE CREATE CATALOG The current approach is as follows: * For syntactically valid statements, only properties containing sensitive information are masked. * If a valid query references a nonexistent connector, all properties are masked. * For queries that fail before or during parsing and contain the word 'catalog,' we attempt to find and mask property assignments using a regular expression. This is a best-effort approach. The redacted form is created in DispatchManager and is propagated to all places that create QueryInfo and BasicQueryInfo. Before this change, QueryInfo/BasicQueryInfo stored the raw query text received from the end user. From now on, the text will be altered for the cases listed above.
@JsonConstructor for TrimmedBasicQueryInfo was introduced to facilitate the deserialization of server responses in tests.
piotrrzysko
force-pushed
the
piotrrzysko/redact-catalog-queries
branch
from
83b91cd to
c444c3e
Compare
|
Closing in favour of #24563 |
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.
Description
This a follow-up to #23103 that introduces redacting of security-sensitive information in statements containing connector properties, specifically:
CREATE CATALOGEXPLAIN CREATE CATALOGEXPLAIN ANALYZE CREATE CATALOGThe current approach is as follows:
Redacted queries are returned through the REST API, the
system.runtime.queriestable, and query events (QueryCreatedEventandQueryCompletedEvent).Notice that currently this PR includes two commits from #23103.
Additional context and related issues
Release notes
( ) This is not user-visible or is docs only, and no release notes are required.
( ) Release notes are required. Please propose a release note for me.
(x) Release notes are required, with the following suggested text: