Pull from upstream 0.23 (#11)

* fix(topicdata): handle unsupported DescribeLogDirs  for MSK Serverless (tchiotludo#1113)

close tchiotludo#1112

* chore(deps): upgrade aws-msk-iam-auth to 1.1.4 to avoid vulnerability (tchiotludo#1114)

https://github.com/aws/aws-msk-iam-auth/releases/tag/v1.1.4 shows several fixes for CVEs

* chore(docs): add tui to usage list (tchiotludo#1118)

* chore(docs): update alt text for tui (tchiotludo#1119)

* chore(docs): add tui logo to public assets (tchiotludo#1120)

* feat(topicdata): adding serializer for protobuf schema registry (tchiotludo#1117)

* feat(topicdata): allow integer/long to be serialized as float/double when using AVRO schema. (tchiotludo#1123)

close tchiotludo#1122

* feat(ui): add pagination size of topic list (tchiotludo#1109)

relate tchiotludo#1051

* feat(acsl): add  Pattern Type to ACLs Panel Information (tchiotludo#1125)

close tchiotludo#1115

* fix(docker): run upgrade in order to reduce CVEs (tchiotludo#1134)

libssl1.1
dpkg
libldap-common

close tchiotludo#1132

* feat(docker): add healthcheck (tchiotludo#1136)


Co-authored-by: Ludovic DEHON <[email protected]>

* fix(ui): handle consumer group with slash (tchiotludo#1143)

close tchiotludo#1101

* Revert "chore(readme): add redpanda sponsors"

This reverts commit ab9a444.

* fix(helm): adding namespace to kubectl port-forward Helm Chart NOTES (tchiotludo#1171)

Co-authored-by: rogerio <[email protected]>

* fix(helm): correct port for port-forward is 8080 (tchiotludo#1178)

Fix port displayed at the end of the helm release.

It displays `{{ .Values.service.port }}` which is `80` per default, it should be `8080`.

* feat(docker): change upstream image from openjdk to eclipse-temurin (tchiotludo#1179)


Signed-off-by: Erik Godding Boye <[email protected]>

* fix(core): close consumer when returning null after calculating offset for newest sort (tchiotludo#1069)

fix a memory leak 

Co-authored-by: Neeraj.singh <[email protected]>

* fix(ui): load, display and store settings on settings screen if no settings have been stored yet (tchiotludo#1161)

Co-authored-by: David Müller <[email protected]>

* feat(docs): update vuepress to last versions

* chore(docs): add Fresha to whos using (tchiotludo#1111)

* chore(version): update to 0.22.0

* fix(ui): showing protobuf schema in versions tab crash (tchiotludo#1189)

Fixes tchiotludo#1188

* feat(docs): helm example with basic auth and aws msk (tchiotludo#1192)


Co-authored-by: Ludovic DEHON <[email protected]>

* feat(helm): add networkpolicy (tchiotludo#1193)

Signed-off-by: Quan TRAN <[email protected]>

* feat(helm): add configuration for readiness & livenessProbe

* chore(deps) add missing scala dependent modules (tchiotludo#1223)

* feat(docs): add a Kestra banner

* fix(topicdata): protection against tombstone message and headers

close tchiotludo#1210

* feat(webserver): add custom headers configuration (tchiotludo#1235)


Co-authored-by: Ludovic DEHON <[email protected]>

* chore(docs): fix typo (tchiotludo#1240)

* chore(cicd): update slack channel

* fix(ui): decimals are not parsed correctl (tchiotludo#1246)

replaced 'json-bigint' parser with 'lossless-json', this replacement allows for pretty-printing the json data, but still keeping the original values especially for floating numbers and bigints.

fix tchiotludo#1006

* core(deps): Updated micronaut to latest version (tchiotludo#1247)

and fixes to tests to have a successful build

close tchiotludo#1215

* fix(ui): Disabled edit access topic configs when role has reader mode (tchiotludo#1237)

close tchiotludo#1219

* fix(ui): encode groupId to allow '&' as part of the name of a consumer group (tchiotludo#1184)


relate to tchiotludo#1143

* feat(ui): faster topic-data search & sorting (tchiotludo#1209)


Co-authored-by: Max Bebök <[email protected]>

* feat(topicdata): added fix for incorrect datatype and missing fields in the json while producing to topic (tchiotludo#1233)

* feat(ui): Use `set INLINE_RUNTIME_CHUNK=false&& ` in react build. (tchiotludo#1238)

See also https://drag13.io/posts/react-inline-runtimer-chunk/index.html. This is to make _Content-Security-Policy_ work when `unsafe-inline` is not set.

Co-authored-by: Ludovic DEHON <[email protected]>

* fix(node):  fix nullpointer when trying to view cluster information in MSK Serverless (tchiotludo#1227)

close tchiotludo#1226

Co-authored-by: Ludovic DEHON <[email protected]>

* chore(deps): update all java deps

* feat(ui): optimze svgs with https://jakearchibald.github.io/svgomg/ (tchiotludo#1252)

In preparation for a React upgrade, see tchiotludo#1243

* feat(topicdata): support duplicate header keys (tchiotludo#1258)

close tchiotludo#1257 

Co-authored-by: rafanyan <[email protected]>

* chore(deps): update codeql actions to supported version (tchiotludo#1253)

See
https://github.blog/changelog/2022-04-27-code-scanning-deprecation-of-codeql-action-v1/
for context

* chore(version): update to 0.23.0

* feat(ui): update node to the latest lts version (tchiotludo#1251)

* Update node to the latest LTS version
* Replace node-sass with sass
* Also use the correct version of react-test-renderer.
* Update react scripts so we don't use insecure hashing functions
* Do not check eslint for production build

See tchiotludo#1243 for more information.

* fix(topicdata): fix null key and value (tchiotludo#1261)

Co-authored-by: alozano3 <[email protected]>

* feat(ui): fix eslint warnings (tchiotludo#1254)


Co-authored-by: Ludovic DEHON <[email protected]>

* fix(topci): create topics with configuration in one call (tchiotludo#1273)

close tchiotludo#1272

Signed-off-by: Erik Godding Boye <[email protected]>
Signed-off-by: Quan TRAN <[email protected]>
Co-authored-by: Mitsuaki Ito <[email protected]>
Co-authored-by: tooptoop4 <[email protected]>
Co-authored-by: Steven Masala <[email protected]>
Co-authored-by: Steven Masala <[email protected]>
Co-authored-by: Andrei Strelnikov <[email protected]>
Co-authored-by: Marcello <[email protected]>
Co-authored-by: 10xtechie <[email protected]>
Co-authored-by: ThomasSanson <[email protected]>
Co-authored-by: Ludovic DEHON <[email protected]>
Co-authored-by: Rodrigo Rodriguez Ramos <[email protected]>
Co-authored-by: Rogério Fonseca <[email protected]>
Co-authored-by: rogerio <[email protected]>
Co-authored-by: Thomas <[email protected]>
Co-authored-by: Erik Godding Boye <[email protected]>
Co-authored-by: neeraj-singh47 <[email protected]>
Co-authored-by: Neeraj.singh <[email protected]>
Co-authored-by: sam0r040 <[email protected]>
Co-authored-by: David Müller <[email protected]>
Co-authored-by: Piotr Rybarczyk <[email protected]>
Co-authored-by: Ali Akhtari <[email protected]>
Co-authored-by: Alex Vaque <[email protected]>
Co-authored-by: Quan TRAN <[email protected]>
Co-authored-by: Adi Wehrli <[email protected]>
Co-authored-by: lucapette <[email protected]>
Co-authored-by: tristanessquare <[email protected]>
Co-authored-by: meeraj257 <[email protected]>
Co-authored-by: Gnana_Jeyam <[email protected]>
Co-authored-by: owidder <[email protected]>
Co-authored-by: Stuff is on GitLab <[email protected]>
Co-authored-by: Max Bebök <[email protected]>
Co-authored-by: Raphael <[email protected]>
Co-authored-by: rafanyan <[email protected]>
Co-authored-by: Albert <[email protected]>
Co-authored-by: alozano3 <[email protected]>
Co-authored-by: Emmanuel <[email protected]>

.github/workflows/codeql-analysis.yml

@@ -42,11 +42,11 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file. 
+        # By default, queries listed here will override any specified in a config file.
         # Prefix the list here with "+" to use these queries and those in the config file.
         # queries: ./path/to/local/query, your-org/your-repo/queries@main
     - name: Set up JDK
@@ -57,7 +57,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -71,4 +71,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/docs.yml

@@ -71,8 +71,8 @@ jobs:
         with:
           status: ${{ job.status }}
           username: Github Actions
-          icon_emoji: ':octocat:'
-          channel: '#akhq'
+          icon_emoji: ':github-actions:'
+          channel: 'C03H9CEBGS2'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

.github/workflows/main.yml

@@ -160,8 +160,8 @@ jobs:
         with:
           status: ${{ job.status }}
           username: Github Actions
-          icon_emoji: ':octocat:'
-          channel: '#akhq'
+          icon_emoji: ':github-actions:'
+          channel: 'C03H9CEBGS2'
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}

Dockerfile

@@ -1,12 +1,16 @@
-FROM openjdk:11-jre-slim
+FROM eclipse-temurin:11-jre
 
 # install curl
 RUN apt-get update && \
     apt-get install -y \
       curl && \
+    apt-get upgrade -y &&\
     rm -rf /var/lib/apt/lists/* && \
     apt-get clean
 
+HEALTHCHECK --interval=1m --timeout=30s --retries=3 \
+  CMD curl --fail http://localhost:8080/health || exit 1
+
 WORKDIR /app
 COPY docker /
 ENV MICRONAUT_CONFIG_FILES=/app/application.yml

README.md

@@ -40,27 +40,6 @@
 </td>
 </tr>
 </table>
-<table>
-<tr>
-<td>
-  <img width="1000" height="0">
-    <a href="https://redpanda.com/?utm_source=AKHQ" >
-
-  <img style="background-color: #FFF;padding:10px" src="https://user-images.githubusercontent.com/2064609/164302508-76ac1dfb-6c50-43d4-a092-ff275b25a032.svg" alt="Upstash" width="260" align="right">
-  </a>
-
-<h3>Redpanda</h3>
-
-  <ul>
-    <li>Redpanda is a streaming data platform for developers.</li>
-    <li>Kafka API compatible.</li>
-    <li>10x faster. No ZooKeeper. No JVM!</li>
-  </ul>
-
-[redpanda.com](https://redpanda.com/?utm_source=AKHQ)
-</td>
-</tr>
-</table>
 
 ## From AKHQ project creator
 <table>
@@ -96,6 +75,7 @@ Kestra is an infinitely scalable orchestration and scheduling platform, creating
 * [BPCE-IT](https://www.bpce-it.fr/)
 * [Decathlon](https://www.decathlon.fr/)
 * [Depop](https://www.depop.com)
+* [Fresha](https://www.fresha.com/)
 * [Galeries Lafayette](https://www.galerieslafayette.com/)
 * [GetYourGuide](https://www.getyourguide.com)
 * [Kitopi](https://kitopi.com)
@@ -105,6 +85,7 @@ Kestra is an infinitely scalable orchestration and scheduling platform, creating
 * [NEXT Technologies](https://www.nextapp.co/)
 * [Nuxeo](https://www.nuxeo.com/)
 * [Pipedrive](https://www.pipedrive.com)
+* [TUI](https://www.tui.com)
 * [TVG](https://www.tvg.com)
 * [Vodeno](https://www.vodeno.com/)
 

application.example.yml

@@ -40,6 +40,12 @@ akhq:
       enabled: true # true by default
       name: org.akhq.log.access # Logger name
       format: "[Date: {}] [Duration: {} ms] [Url: {} {}] [Status: {}] [Ip: {}] [User: {}]" # Logger format
+    # Custom HTTP response headers configuration
+    customHttpResponseHeaders:
+      - name: "Content-Security-Policy"
+        value: "default-src 'none'; frame-src 'self'; script-src 'self'; connect-src 'self'; img-src 'self'; style-src 'self'; frame-ancestors 'self'; form-action 'self'; upgrade-insecure-requests"
+      - name: "X-Permitted-Cross-Domain-Policies"
+        value: "none"
 
   # default kafka properties for each clients, available for admin / producer / consumer (optional)
   clients-defaults:
@@ -289,3 +295,4 @@ akhq:
         - username: header-admin
           groups:
             - admin
+

build.gradle

@@ -1,19 +1,19 @@
 plugins {
     // micronaut
-    id "com.github.johnrengelman.shadow" version "7.1.0"
-    id "io.micronaut.application" version "3.0.1"
+    id "com.github.johnrengelman.shadow" version "7.1.2"
+    id "io.micronaut.application" version "3.6.3"
 
     // akhq
-    id "com.gorylenko.gradle-git-properties" version "2.3.2"
+    id "com.gorylenko.gradle-git-properties" version "2.4.1"
     id 'com.adarshr.test-logger' version '3.1.0'
-    id 'org.gradle.test-retry' version '1.3.1'
-    id 'com.github.psxpaul.execfork' version '0.1.15'
-    id "com.github.ben-manes.versions" version "0.39.0"
-    id "com.github.davidmc24.gradle.plugin.avro" version "1.3.0"
+    id 'org.gradle.test-retry' version '1.4.1'
+    id 'com.github.psxpaul.execfork' version '0.2.1'
+    id "com.github.ben-manes.versions" version "0.43.0"
+    id "com.github.davidmc24.gradle.plugin.avro" version "1.5.0"
 }
 
 group "org.akhq"
-version "0.21.0"
+version "0.23.0"
 mainClassName = "org.akhq.App"
 sourceCompatibility = 11
 
@@ -34,11 +34,13 @@ configurations.all {
     resolutionStrategy {
         force("org.apache.kafka:kafka-clients:" + kafkaVersion)
         force("org.apache.kafka:kafka-streams:" + kafkaVersion)
+        force("org.apache.kafka:kafka-server-common:" + kafkaVersion)
         force("org.apache.kafka:kafka_" + kafkaScalaVersion + ":" + kafkaVersion)
 
         force("org.slf4j:slf4j-api:1.7.32")
         force("org.slf4j:jul-to-slf4j:1.7.32")
         force("org.slf4j:log4j-over-slf4j:1.7.32")
+        force("com.google.protobuf:protobuf-java:3.20.3")
     }
 }
 
@@ -71,7 +73,7 @@ dependencies {
     implementation "io.micronaut:micronaut-runtime"
     implementation "io.micronaut:micronaut-http-server-netty"
     implementation "io.swagger.core.v3:swagger-annotations"
-    runtimeOnly 'ch.qos.logback:logback-classic:1.2.9'
+    runtimeOnly 'ch.qos.logback:logback-classic'
     implementation "io.micronaut.security:micronaut-security-annotations"
     implementation "io.micronaut.security:micronaut-security-jwt"
     implementation "io.micronaut.security:micronaut-security-ldap"
@@ -91,11 +93,11 @@ dependencies {
     implementation group: "io.confluent", name: "kafka-json-schema-serializer", version: confluentVersion
     implementation group: "io.confluent", name: "kafka-protobuf-serializer", version: confluentVersion
     implementation group: "io.confluent", name: "kafka-client-plugins", version: confluentVersion + "-ce"
-    implementation 'org.sourcelab:kafka-connect-client:4.0.0'
+    implementation 'org.sourcelab:kafka-connect-client:4.0.2'
 
     // strimzi
-    implementation group: 'io.strimzi', name: 'kafka-oauth-common', version: '0.9.0'
-    implementation group: 'io.strimzi', name: 'kafka-oauth-client', version: '0.9.0'
+    implementation group: 'io.strimzi', name: 'kafka-oauth-common', version: '0.11.0'
+    implementation group: 'io.strimzi', name: 'kafka-oauth-client', version: '0.11.0'
 
     // log
     implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.0-alpha5'
@@ -104,30 +106,32 @@ dependencies {
 
     // utils
     implementation group: 'org.codehaus.httpcache4j.uribuilder', name: 'uribuilder', version: '2.0.0'
-    implementation 'com.google.guava:guava:31.0.1-jre'
-    implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'com.google.guava:guava:31.1-jre'
+    implementation 'com.google.code.gson:gson:2.10'
     implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jdk8'
 
     // avro
-    implementation 'org.apache.avro:avro:1.11.0'
+    implementation 'org.apache.avro:avro:1.11.1'
 
+    // jackson-module-scala
+    implementation group: 'com.fasterxml.jackson.module', name: 'jackson-module-scala_2.13', version: '2.13.4'
 
     // protobuf
-    implementation group: "com.google.protobuf", name: "protobuf-java", version: '3.19.2'
-    implementation group: "com.google.protobuf", name: "protobuf-java-util", version: '3.19.2'
+    implementation group: "com.google.protobuf", name: "protobuf-java", version: '3.21.9'
+    implementation group: "com.google.protobuf", name: "protobuf-java-util", version: '3.21.9'
 
     // Password hashing
     implementation group: "org.mindrot", name: "jbcrypt", version: "0.4"
 
     // https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-all
-    implementation group: 'org.codehaus.groovy', name: 'groovy-all', version: '3.0.9'
+    implementation group: 'org.codehaus.groovy', name: 'groovy-all', version: '3.0.13'
     // api
 
     // client
     implementation project(":client")
 
     //AWS MSK IAM Auth
-    implementation group: 'software.amazon.msk', name: 'aws-msk-iam-auth', version: '1.1.1'
+    implementation group: 'software.amazon.msk', name: 'aws-msk-iam-auth', version: '1.1.5'
 }
 
 /**********************************************************************************************************************\
@@ -155,9 +159,9 @@ dependencies {
 
     testAnnotationProcessor "io.micronaut:micronaut-inject-java"
     testImplementation "io.micronaut.test:micronaut-test-junit5"
-    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.8.2"
-    testImplementation "org.junit.jupiter:junit-jupiter-api:5.8.2"
-    testImplementation "org.junit.jupiter:junit-jupiter-params:5.8.2"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
+    testImplementation "org.junit.jupiter:junit-jupiter-api"
+    testImplementation "org.junit.jupiter:junit-jupiter-params"
     testImplementation "io.micronaut:micronaut-http-client"
     testImplementation "io.micronaut.rxjava2:micronaut-rxjava2-http-client"
 
@@ -176,8 +180,8 @@ dependencies {
     testImplementation group: 'commons-codec', name: 'commons-codec', version: '1.15'
     testImplementation 'org.hamcrest:hamcrest:2.2'
     testImplementation 'org.hamcrest:hamcrest-library:2.2'
-    testImplementation 'org.mockito:mockito-junit-jupiter:4.1.0'
-    testImplementation 'com.salesforce.kafka.test:kafka-junit5:3.2.3'
+    testImplementation 'org.mockito:mockito-junit-jupiter:4.8.1'
+    testImplementation 'com.salesforce.kafka.test:kafka-junit5:3.2.4'
     testImplementation 'com.fasterxml.jackson.core:jackson-core:'
     testImplementation 'com.fasterxml.jackson.core:jackson-annotations'
     testImplementation 'com.fasterxml.jackson.core:jackson-databind'

client/.prettierignore

@@ -0,0 +1,2 @@
+build
+node_modules

client/build.gradle

@@ -8,7 +8,7 @@ repositories {
 }
 
 frontend {
-    nodeVersion = '14.8.0'
+    nodeVersion = '18.12.1'
     assembleScript = 'run build'
 }