Merge branch 'main' into table_filters

Author: Vixtir

api/build.gradle

@@ -53,15 +53,13 @@ dependencies {
         exclude group: 'io.projectreactor.ipc', module: 'reactor-netty'
     }
 
-    runtimeOnly libs.micrometer.registry.prometheus
+    runtimeOnly(libs.micrometer.registry.prometheus) {
+        exclude group: 'com.google.protobuf', module: 'protobuf-java' because("Micrometer uses protobuf-java 4.x, which is incompatible with protobuf-java 3.x used by various dependencies of this project. See https://github.com/prometheus/client_java/issues/1431")
+    }
 
     // CVE Fixes
     implementation libs.apache.commons.compress
     implementation libs.okhttp3.logging.intercepter
-    implementation libs.json.smart
-    implementation libs.netty.common
-    implementation libs.netty.handler
-    implementation libs.spring.context
 
     implementation libs.modelcontextprotocol.spring.webflux
     implementation libs.victools.jsonschema.generator

api/src/main/java/io/kafbat/ui/controller/AclsController.java

@@ -68,6 +68,7 @@ public Mono<ResponseEntity<Flux<KafkaAclDTO>>> listAcls(String clusterName,
                                                           KafkaAclResourceTypeDTO resourceTypeDto,
                                                           String resourceName,
                                                           KafkaAclNamePatternTypeDTO namePatternTypeDto,
+                                                          String search,
                                                           ServerWebExchange exchange) {
     AccessContext context = AccessContext.builder()
         .cluster(clusterName)
@@ -88,7 +89,7 @@ public Mono<ResponseEntity<Flux<KafkaAclDTO>>> listAcls(String clusterName,
     return validateAccess(context).then(
         Mono.just(
             ResponseEntity.ok(
-                aclsService.listAcls(getCluster(clusterName), filter)
+                aclsService.listAcls(getCluster(clusterName), filter, search)
                     .map(ClusterMapper::toKafkaAclDto)))
     ).doOnEach(sig -> audit(context, sig));
   }

api/src/main/java/io/kafbat/ui/service/acl/AclsService.java

@@ -68,10 +68,11 @@ public Mono<Void> deleteAcl(KafkaCluster cluster, AclBinding aclBinding) {
         .doOnSuccess(v -> log.info("ACL DELETED: [{}]", aclString));
   }
 
-  public Flux<AclBinding> listAcls(KafkaCluster cluster, ResourcePatternFilter filter) {
+  public Flux<AclBinding> listAcls(KafkaCluster cluster, ResourcePatternFilter filter, String principalSearch) {
     return adminClientService.get(cluster)
         .flatMap(c -> c.listAcls(filter))
         .flatMapIterable(acls -> acls)
+        .filter(acl -> principalSearch == null || acl.entry().principal().contains(principalSearch))
         .sort(Comparator.comparing(AclBinding::toString));  //sorting to keep stable order on different calls
   }
 

contract/src/main/resources/swagger/kafbat-ui-api.yaml

@@ -1965,6 +1965,11 @@ paths:
           required: false
           schema:
             $ref: '#/components/schemas/KafkaAclNamePatternType'
+        - name: search
+          in: query
+          required: false
+          schema:
+            type: string
       responses:
         200:
           description: OK

frontend/src/components/ACLPage/List/List.tsx

@@ -1,4 +1,5 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
+import { useSearchParams } from 'react-router-dom';
 import { ColumnDef, Row } from '@tanstack/react-table';
 import Table from 'components/common/NewTable';
 import { useConfirm } from 'lib/hooks/useConfirm';
@@ -19,14 +20,18 @@ import { useTheme } from 'styled-components';
 import ACLFormContext from 'components/ACLPage/Form/AclFormContext';
 import PlusIcon from 'components/common/Icons/PlusIcon';
 import ActionButton from 'components/common/ActionComponent/ActionButton/ActionButton';
+import { ControlPanelWrapper } from 'components/common/ControlPanel/ControlPanel.styled';
+import Search from 'components/common/Search/Search';
 import ResourcePageHeading from 'components/common/ResourcePageHeading/ResourcePageHeading';
 import BreakableTextCell from 'components/common/NewTable/BreakableTextCell';
 
 import * as S from './List.styled';
 
 const ACList: React.FC = () => {
   const { clusterName } = useAppParams<{ clusterName: ClusterName }>();
-  const { data: aclList } = useAcls(clusterName);
+  const [searchParams, setSearchParams] = useSearchParams();
+  const [search, setSearch] = useState(searchParams.get('q') || '');
+  const { data: aclList } = useAcls({ clusterName, search });
   const { deleteResource } = useDeleteAcl(clusterName);
   const modal = useConfirm(true);
   const theme = useTheme();
@@ -37,6 +42,17 @@ const ACList: React.FC = () => {
   } = useBoolean();
   const [rowId, setRowId] = React.useState('');
 
+  useEffect(() => {
+    const params = new URLSearchParams(searchParams);
+    if (search) {
+      params.set('q', search);
+      params.set('page', '1'); // reset to first page on new search
+    } else {
+      params.delete('q');
+    }
+    setSearchParams(params, { replace: true });
+  }, [search]);
+
   const handleDeleteClick = (acl: KafkaAcl | null) => {
     if (acl) {
       modal('Are you sure want to delete this ACL record?', () =>
@@ -164,6 +180,13 @@ const ACList: React.FC = () => {
           <PlusIcon /> Create ACL
         </ActionButton>
       </ResourcePageHeading>
+      <ControlPanelWrapper hasInput>
+        <Search
+          placeholder="Search by Principal Name"
+          value={search}
+          onChange={setSearch}
+        />
+      </ControlPanelWrapper>
       <Table
         columns={columns}
         data={aclList ?? []}

frontend/src/components/ConsumerGroups/Details/ResetOffsets/Form.tsx

@@ -98,7 +98,7 @@ const Form: React.FC<FormProps> = ({ defaultValues, partitions, topics }) => {
 
   const onSubmit = async (data: ConsumerGroupOffsetsReset) => {
     await reset.mutateAsync(data);
-    navigate('../');
+    navigate(-1);
   };
 
   return (

frontend/src/lib/hooks/api/acl.ts

@@ -14,11 +14,22 @@ import {
   KafkaAcl,
 } from 'generated-sources';
 
-export function useAcls(clusterName: ClusterName) {
+export function useAcls({
+  clusterName,
+  search,
+}: {
+  clusterName: ClusterName;
+  search?: string;
+}) {
   return useQuery(
-    ['clusters', clusterName, 'acls'],
-    () => api.listAcls({ clusterName }),
+    ['clusters', clusterName, 'acls', { search }],
+    () =>
+      api.listAcls({
+        clusterName,
+        search,
+      }),
     {
+      keepPreviousData: true,
       suspense: false,
     }
   );

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-spring-boot = '3.4.5'
+spring-boot = '3.5.3'
 
 aws-msk-auth = '2.3.0'
 azure-identity = '1.15.4'
@@ -21,7 +21,9 @@ lombok = '1.18.34'
 odd-oddrn-generator = '0.1.17'
 odd-oddrn-client = '0.1.41'
 cel = '0.3.0'
-junit = '5.11.2'
+# This version should be compatible with the version used by spring-boot-starter-test to avoid conflicts
+# See https://github.com/spring-projects/spring-boot/blob/b6b570ebebb6ea233e00af5e554adcf40256f224/gradle.properties#L16C21-L16C27
+junit = '5.12.2'
 mockito = '5.16.0'
 okhttp3 = '4.12.0'
 testcontainers = '1.20.6'
@@ -126,12 +128,6 @@ aspectj = { module = 'org.aspectj:aspectjweaver', version.ref = 'aspectj' }
 bonigarcia-webdrivermanager = { module = 'io.github.bonigarcia:webdrivermanager', version.ref = 'bonigarcia-webdrivermanager' }
 netty-resolver-dns-native = { module = 'io.netty:netty-resolver-dns-native-macos' }
 
-# CVE fixes
-json-smart = { module = 'net.minidev:json-smart', version = '2.5.2' }
-netty-common = { module = 'io.netty:netty-common', version.ref = 'netty' }
-netty-handler = { module = 'io.netty:netty-handler', version.ref = 'netty' }
-spring-context = { module = 'org.springframework:spring-context', version = '6.2.7' }
-
 # test scope
 bouncycastle-bcpkix = { module = 'org.bouncycastle:bcpkix-jdk18on', version = '1.80' }