Merge remote-tracking branch 'origin/gradle_final' into gradle_ci

# Conflicts:
#	.github/workflows/docker_publish.yml
#	api/build.gradle
#	build.gradle
#	contract/build.gradle
#	e2e-tests/build.gradle
#	frontend/build.gradle
#	frontend/vite.config.ts
#	gradle/libs.versions.toml
#	serde-api/build.gradle

Author: Haarolean

.dev/dev.yaml

@@ -27,7 +27,6 @@ services:
 
   kafka0:
     image: confluentinc/cp-kafka:7.8.0
-    user: "0:0"
     hostname: kafka0
     container_name: kafka0
     ports:

.github/FUNDING.yml

@@ -1 +1,2 @@
 github: [kafbat]
+open_collective: kafka-ui

.github/workflows/frontend_tests.yml

@@ -23,7 +23,7 @@ jobs:
 
       - uses: pnpm/[email protected]
         with:
-          version: 9.15.0
+          version: 9.15.4
 
       - name: Install node
         uses: actions/[email protected]

.gitignore

@@ -46,3 +46,6 @@ out/
 node_modules/
 .gradle
 /e2e-tests/allure-results/
+out/
+node_modules/
+.gradle

README.md

@@ -18,6 +18,7 @@ Versatile, fast and lightweight web UI for managing Apache Kafka® clusters.
     <a href="https://ui.docs.kafbat.io/quick-start/demo-run">Quick Start</a> • 
     <a href="https://discord.gg/4DWzD7pGE5">Community</a>
     <br/>
+    <a href="https://aws.amazon.com/marketplace/pp/prodview-6tdqqzzjwmejq">AWS Marketplace</a>  •
     <a href="https://www.producthunt.com/products/ui-for-apache-kafka/reviews/new">ProductHunt</a>
 </p>
 

api/pom.xml

@@ -29,6 +29,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-actuator</artifactId>
@@ -212,6 +216,19 @@
             <version>${okhttp3.mockwebserver.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.kafka</groupId>
+            <artifactId>kafka-clients</artifactId>
+            <version>${confluent.version}-ccs</version>
+            <classifier>test</classifier>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk18on</artifactId>
+            <version>1.80</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -329,7 +346,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <argLine>@{argLine} --illegal-access=permit</argLine>
+                    <argLine>@{argLine}</argLine>
                 </configuration>
             </plugin>
             <plugin>

api/src/main/java/io/kafbat/ui/client/RetryingKafkaConnectClient.java

@@ -12,7 +12,7 @@
 import io.kafbat.ui.connect.model.ConnectorTopics;
 import io.kafbat.ui.connect.model.NewConnector;
 import io.kafbat.ui.connect.model.TaskStatus;
-import io.kafbat.ui.exception.KafkaConnectConflictReponseException;
+import io.kafbat.ui.exception.KafkaConnectConflictResponseException;
 import io.kafbat.ui.exception.ValidationException;
 import io.kafbat.ui.util.WebClientConfigurator;
 import jakarta.validation.constraints.NotNull;
@@ -48,7 +48,7 @@ private static Retry conflictCodeRetry() {
         .fixedDelay(MAX_RETRIES, RETRIES_DELAY)
         .filter(e -> e instanceof WebClientResponseException.Conflict)
         .onRetryExhaustedThrow((spec, signal) ->
-            new KafkaConnectConflictReponseException(
+            new KafkaConnectConflictResponseException(
                 (WebClientResponseException.Conflict) signal.failure()));
   }
 

api/src/main/java/io/kafbat/ui/config/ClustersProperties.java

@@ -2,6 +2,9 @@
 
 import io.kafbat.ui.model.MetricsConfig;
 import jakarta.annotation.PostConstruct;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -17,13 +20,15 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.util.StringUtils;
+import org.springframework.validation.annotation.Validated;
 
 @Configuration
 @ConfigurationProperties("kafka")
 @Data
+@Validated
 public class ClustersProperties {
 
-  List<Cluster> clusters = new ArrayList<>();
+  List<@Valid Cluster> clusters = new ArrayList<>();
 
   String internalTopicPrefix;
 
@@ -33,7 +38,9 @@ public class ClustersProperties {
 
   @Data
   public static class Cluster {
+    @NotBlank(message = "field name for for cluster could not be blank")
     String name;
+    @NotBlank(message = "field bootstrapServers for for cluster could not be blank")
     String bootstrapServers;
 
     TruststoreConfig ssl;
@@ -46,19 +53,21 @@ public static class Cluster {
     KsqldbServerAuth ksqldbServerAuth;
     KeystoreConfig ksqldbServerSsl;
 
-    List<ConnectCluster> kafkaConnect;
+    List<@Valid ConnectCluster> kafkaConnect;
 
-    List<SerdeConfig> serde;
+    List<@Valid SerdeConfig> serde;
     String defaultKeySerde;
     String defaultValueSerde;
 
     MetricsConfigData metrics;
     Map<String, Object> properties;
+    Map<String, Object> consumerProperties;
+    Map<String, Object> producerProperties;
     boolean readOnly = false;
 
     Long pollingThrottleRate;
 
-    List<Masking> masking;
+    List<@Valid Masking> masking;
 
     AuditProperties audit;
   }
@@ -88,7 +97,9 @@ public static class MetricsConfigData {
   @Builder(toBuilder = true)
   @ToString(exclude = {"password", "keystorePassword"})
   public static class ConnectCluster {
+    @NotBlank
     String name;
+    @NotBlank
     String address;
     String username;
     String password;
@@ -122,6 +133,7 @@ public static class KeystoreConfig {
 
   @Data
   public static class SerdeConfig {
+    @NotBlank
     String name;
     String className;
     String filePath;
@@ -139,6 +151,7 @@ public static class KsqldbServerAuth {
 
   @Data
   public static class Masking {
+    @NotNull
     Type type;
     List<String> fields;
     String fieldsNamePattern;
@@ -160,7 +173,7 @@ public static class AuditProperties {
     Integer auditTopicsPartitions;
     Boolean topicAuditEnabled;
     Boolean consoleAuditEnabled;
-    LogLevel level;
+    LogLevel level = LogLevel.ALTER_ONLY;
     Map<String, String> auditTopicProperties;
 
     public enum LogLevel {
@@ -189,6 +202,8 @@ private void setMetricsDefaults() {
   private void flattenClusterProperties() {
     for (Cluster cluster : clusters) {
       cluster.setProperties(flattenClusterProperties(null, cluster.getProperties()));
+      cluster.setConsumerProperties(flattenClusterProperties(null, cluster.getConsumerProperties()));
+      cluster.setProducerProperties(flattenClusterProperties(null, cluster.getProducerProperties()));
     }
   }
 

api/src/main/java/io/kafbat/ui/config/GeneralSecurityConfig.java

@@ -0,0 +1,17 @@
+package io.kafbat.ui.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.web.server.firewall.StrictServerWebExchangeFirewall;
+
+@Configuration
+public class GeneralSecurityConfig {
+
+  @Bean
+  public StrictServerWebExchangeFirewall strictServerWebExchangeFirewall() {
+    StrictServerWebExchangeFirewall firewall = new StrictServerWebExchangeFirewall();
+    firewall.setAllowUrlEncodedSlash(true);
+    return firewall;
+  }
+
+}

api/src/main/java/io/kafbat/ui/config/auth/BasicAuthSecurityConfig.java

@@ -1,8 +1,6 @@
 package io.kafbat.ui.config.auth;
 
-import io.kafbat.ui.util.EmptyRedirectStrategy;
 import io.kafbat.ui.util.StaticFileWebFilter;
-import java.net.URI;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
@@ -12,8 +10,6 @@
 import org.springframework.security.config.web.server.SecurityWebFiltersOrder;
 import org.springframework.security.config.web.server.ServerHttpSecurity;
 import org.springframework.security.web.server.SecurityWebFilterChain;
-import org.springframework.security.web.server.authentication.RedirectServerAuthenticationSuccessHandler;
-import org.springframework.security.web.server.authentication.logout.RedirectServerLogoutSuccessHandler;
 import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatchers;
 
 @Configuration