Skip to content

Commit 0b5629c

Browse files
CVE fixes, Feb 2024 (#174)
Co-authored-by: Roman Zabaluev <gpg@haarolean.dev>
1 parent 407d678 commit 0b5629c

File tree

6 files changed

+40
-12
lines changed

6 files changed

+40
-12
lines changed

.github/workflows/cve.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CVE checks docker main
1+
name: "Infra: CVE checks"
22
on:
33
workflow_dispatch:
44
schedule:

api/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#FROM azul/zulu-openjdk-alpine:17-jre-headless
2-
FROM azul/zulu-openjdk-alpine@sha256:a36679ac0d28cb835e2a8c00e1e0d95509c6c51c5081c7782b85edb1f37a771a
2+
FROM azul/zulu-openjdk-alpine@sha256:d59f1266db40341318e563fd76c21b2880ffa5d371f0c097c29d33f89c3a0010
33

44
RUN apk add --no-cache \
55
# snappy codec

api/pom.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,30 @@
253253
<groupId>dev.cel</groupId>
254254
<artifactId>cel</artifactId>
255255
</dependency>
256+
<!-- CVE fixes -->
257+
<dependency>
258+
<groupId>ch.qos.logback</groupId>
259+
<artifactId>logback-classic</artifactId>
260+
<version>1.4.12</version>
261+
</dependency>
262+
<!-- CVE fixes -->
263+
<dependency>
264+
<groupId>ch.qos.logback</groupId>
265+
<artifactId>logback-core</artifactId>
266+
<version>1.4.12</version>
267+
</dependency>
268+
<!-- CVE fixes -->
269+
<dependency>
270+
<groupId>com.squareup.okhttp3</groupId>
271+
<artifactId>logging-interceptor</artifactId>
272+
<version>4.12.0</version>
273+
</dependency>
274+
<!-- CVE fixes -->
275+
<dependency>
276+
<groupId>org.apache.commons</groupId>
277+
<artifactId>commons-compress</artifactId>
278+
<version>1.26.0</version>
279+
</dependency>
256280

257281
</dependencies>
258282

api/src/main/java/io/kafbat/ui/serdes/builtin/ProtobufFileSerde.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,8 @@ private Map<String, ProtoFile> knownProtoFiles() {
365365
loadKnownProtoFile("google/protobuf/struct.proto", StructProto.getDescriptor()),
366366
loadKnownProtoFile("google/protobuf/timestamp.proto", TimestampProto.getDescriptor()),
367367
loadKnownProtoFile("google/protobuf/type.proto", TypeProto.getDescriptor()),
368-
loadKnownProtoFile("google/protobuf/wrappers.proto", WrappersProto.getDescriptor())
368+
loadKnownProtoFile("google/protobuf/wrappers.proto", WrappersProto.getDescriptor()),
369+
loadKnownProtoFile("wire/extensions.proto")
369370
).collect(Collectors.toMap(p -> p.getLocation().getPath(), p -> p));
370371
}
371372

@@ -382,6 +383,10 @@ private ProtoFile loadKnownProtoFile(String path, Descriptors.FileDescriptor fil
382383
return ProtoFile.Companion.get(ProtoParser.Companion.parse(Location.get(path), protoFileString));
383384
}
384385

386+
private ProtoFile loadKnownProtoFile(String path) {
387+
return ProtoFile.Companion.get(ProtoFileElement.empty(path));
388+
}
389+
385390
private Loader createFilesLoader(Map<String, ProtoFile> files) {
386391
return new Loader() {
387392
@Override

documentation/compose/postgres/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ ARG image
22

33
FROM ${image}
44

5-
MAINTAINER Kafbat Team
5+
LABEL maintainer="Kafbat Team"
66

7-
ADD data.sql /docker-entrypoint-initdb.d
7+
COPY data.sql /docker-entrypoint-initdb.d
88

99
EXPOSE 5432

pom.xml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,30 +32,29 @@
3232
<antlr4-maven-plugin.version>4.12.0</antlr4-maven-plugin.version>
3333
<apache.commons.version>2.12.0</apache.commons.version>
3434
<assertj.version>3.25.3</assertj.version>
35-
<avro.version>1.11.1</avro.version>
35+
<avro.version>1.11.3</avro.version>
3636
<byte-buddy.version>1.12.19</byte-buddy.version>
37-
<confluent.version>7.4.0</confluent.version>
37+
<confluent.version>7.4.4</confluent.version>
3838
<datasketches-java.version>3.1.0</datasketches-java.version>
3939
<groovy.version>3.0.13</groovy.version>
4040
<jackson.version>2.14.0</jackson.version>
41-
<kafka-clients.version>3.5.0</kafka-clients.version>
41+
<kafka-clients.version>3.5.2</kafka-clients.version>
4242
<org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
4343
<org.projectlombok.version>1.18.30</org.projectlombok.version>
4444
<protobuf-java.version>3.23.3</protobuf-java.version>
4545
<scala-lang.library.version>2.13.9</scala-lang.library.version>
4646
<snakeyaml.version>2.0</snakeyaml.version>
47-
<spring-boot.version>3.1.3</spring-boot.version>
47+
<spring-boot.version>3.1.9</spring-boot.version>
4848
<serde-api.version>1.0.0</serde-api.version>
4949
<odd-oddrn-generator.version>0.1.17</odd-oddrn-generator.version>
5050
<odd-oddrn-client.version>0.1.39</odd-oddrn-client.version>
51-
<org.json.version>20230227</org.json.version>
51+
<org.json.version>20231013</org.json.version>
5252
<dev.cel.version>0.3.0</dev.cel.version>
5353
<guava.version>33.0.0-jre</guava.version>
54-
5554
<!-- Test dependency versions -->
5655
<junit.version>5.9.1</junit.version>
5756
<mockito.version>5.3.1</mockito.version>
58-
<okhttp3.mockwebserver.version>4.10.0</okhttp3.mockwebserver.version>
57+
<okhttp3.mockwebserver.version>4.12.0</okhttp3.mockwebserver.version>
5958
<testcontainers.version>1.19.5</testcontainers.version>
6059

6160
<!-- Frontend dependency versions -->

0 commit comments

Comments
 (0)