fix: ksql.service.id should not be usable as a query parameter #7192
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
|
@confluentinc It looks like @tolgadur just signed our Contributor License Agreement. 👍 Always at your service, clabot |
agavra
reviewed
Mar 10, 2021
| @@ -618,6 +618,7 @@ public static KsqlRestApplication buildApplication(final KsqlRestConfig restConf | |||
| final String ksqlServerId = ksqlConfig.getString(KsqlConfig.KSQL_SERVICE_ID_CONFIG); | |||
| updatedRestProps.putAll( | |||
| MetricCollectors.addConfluentMetricsContextConfigs(ksqlServerId, kafkaClusterId)); | |||
| updatedRestProps.put(KsqlConfig.KSQL_PROPERTIES_OVERRIDES_DENYLIST, "ksql.service.id"); | |||
There was a problem hiding this comment.
if this was already specified, wouldn't this overwrite the previous value?
There was a problem hiding this comment.
Yes, you are right 😅. I changed it.
tolgadur
force-pushed
the
fix-ksql.service.id-should-not-be-usable-as-a-query-parameter
branch
2 times, most recently
from
2c612e3 to
40023c2
Compare
agavra
approved these changes
Mar 10, 2021
| this.immutableProps = ImmutableSet.copyOf( | ||
| Objects.requireNonNull(immutableProps, "immutableProps")); | ||
| this.immutableProps = ImmutableSet.<String>builder().addAll( | ||
| Objects.requireNonNull(immutableProps, "immutableProps")).add("ksql.service.id").build(); |
There was a problem hiding this comment.
I think you should be able to specify KsqlConfig.KSQL_SERVICE_ID_CONFIG here instead of hardcoding the property
stevenpyzhang
approved these changes
Mar 10, 2021
tolgadur
force-pushed
the
fix-ksql.service.id-should-not-be-usable-as-a-query-parameter
branch
from
40023c2 to
60a5cc3
Compare
tolgadur
force-pushed
the
fix-ksql.service.id-should-not-be-usable-as-a-query-parameter
branch
from
60a5cc3 to
7dc5b9d
Compare
tolgadur
deleted the
fix-ksql.service.id-should-not-be-usable-as-a-query-parameter
branch
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.
Issue: #6869
ksql.service.id was settable as a query-level parameter but it should only be settable as a server-level parameter.
Description
The query-parameters that aren't allowed to be set are defined in the denylist that is imported from the ksql-server.properties. I hardcoded the 'ksql.servier.id' in the denylist as I wasn't sure if I should edit the config files. Hence, alternative to my approach we could edit the config files from where the denylist is imported.
Testing done
Just made sure that all tests run as there were already tests checking whether the properties set in the denylist actually are actually denied from query-level parameter setting.
Reviewer checklist