From 2c612e3868fc9bba6ed35bd6bbe0d786a3f403f1 Mon Sep 17 00:00:00 2001
From: Tolga Dur <mail@tolgadur.com>
Date: Tue, 9 Mar 2021 18:21:54 +0000
Subject: [PATCH] fix: ksql.service.id should not be usable as a query
 parameter

---
 ksqldb-cli/src/main/java/io/confluent/ksql/cli/Cli.java       | 1 -
 .../confluent/ksql/properties/DenyListPropertyValidator.java  | 4 ++--
 .../io/confluent/ksql/rest/server/KsqlRestApplication.java    | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ksqldb-cli/src/main/java/io/confluent/ksql/cli/Cli.java b/ksqldb-cli/src/main/java/io/confluent/ksql/cli/Cli.java
index 66c0b65896a7..4bfe7ed5187b 100644
--- a/ksqldb-cli/src/main/java/io/confluent/ksql/cli/Cli.java
+++ b/ksqldb-cli/src/main/java/io/confluent/ksql/cli/Cli.java
@@ -521,7 +521,6 @@ private void setPropertyFromCtxt(
 
   private void setProperty(final String property, final String value) {
     final Object priorValue = restClient.setProperty(property, value);
-
     terminal.writer().printf(
         "Successfully changed local property '%s'%s to '%s'.%s%n",
         property,
diff --git a/ksqldb-common/src/main/java/io/confluent/ksql/properties/DenyListPropertyValidator.java b/ksqldb-common/src/main/java/io/confluent/ksql/properties/DenyListPropertyValidator.java
index 5d6dde7f503a..cbd599fe9be0 100644
--- a/ksqldb-common/src/main/java/io/confluent/ksql/properties/DenyListPropertyValidator.java
+++ b/ksqldb-common/src/main/java/io/confluent/ksql/properties/DenyListPropertyValidator.java
@@ -32,8 +32,8 @@ public class DenyListPropertyValidator {
   private final Set<String> immutableProps;
 
   public DenyListPropertyValidator(final Collection<String> immutableProps) {
-    this.immutableProps = ImmutableSet.copyOf(
-        Objects.requireNonNull(immutableProps, "immutableProps"));
+    this.immutableProps = ImmutableSet.<String>builder().addAll(
+        Objects.requireNonNull(immutableProps, "immutableProps")).add("ksql.service.id").build();
   }
 
   /**
diff --git a/ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/server/KsqlRestApplication.java b/ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/server/KsqlRestApplication.java
index 4e78a282c9df..3943ea48b65d 100644
--- a/ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/server/KsqlRestApplication.java
+++ b/ksqldb-rest-app/src/main/java/io/confluent/ksql/rest/server/KsqlRestApplication.java
@@ -729,6 +729,7 @@ static KsqlRestApplication buildApplication(
     final RateLimiter pullQueryRateLimiter = RateLimiter.create(
         ksqlConfig.getInt(KsqlConfig.KSQL_QUERY_PULL_MAX_QPS_CONFIG));
 
+
     final DenyListPropertyValidator denyListPropertyValidator = new DenyListPropertyValidator(
         ksqlConfig.getList(KsqlConfig.KSQL_PROPERTIES_OVERRIDES_DENYLIST));