Skip to content

Commit 40fc51e

Browse files
truncate Trino query error message to 2K (#210)
* truncate Trino query error message to 2K * fix vulnerabilities
1 parent 9e5f0e8 commit 40fc51e

File tree

6 files changed

+17
-12
lines changed

6 files changed

+17
-12
lines changed

owasp-suppressions.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@
1818
<cve>CVE-2020-13956</cve>
1919
</suppress>
2020

21-
<suppress until="2023-10-31Z">
21+
<suppress until="2023-11-30Z">
2222
<notes><![CDATA[
23-
file name: zookeeper-api-1.2.0.jar
23+
file name: zookeeper-api-1.3.0.jar
2424
]]></notes>
2525
<packageUrl regex="true">^pkg:maven/org\.apache\.helix/zookeeper\-api@.*$</packageUrl>
2626
<cve>CVE-2016-5017</cve>
2727
<cve>CVE-2018-8012</cve>
2828
<cve>CVE-2019-0201</cve>
29+
<cve>CVE-2023-44981</cve>
2930
</suppress>
3031
<suppress until="2023-10-31Z">
3132
<notes><![CDATA[

query-service-client/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ plugins {
77

88
dependencies {
99
api(project(":query-service-api"))
10-
implementation("org.hypertrace.core.grpcutils:grpc-client-utils:0.12.1")
10+
implementation("org.hypertrace.core.grpcutils:grpc-client-utils:0.12.6")
1111

1212
// Logging
1313
implementation("org.slf4j:slf4j-api:1.7.32")

query-service-factory/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
}
44

55
dependencies {
6-
api("org.hypertrace.core.serviceframework:platform-grpc-service-framework:0.1.60")
6+
api("org.hypertrace.core.serviceframework:platform-grpc-service-framework:0.1.62")
77

88
implementation(project(":query-service-impl"))
99
implementation("com.google.inject:guice:5.0.1")

query-service-impl/build.gradle.kts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,15 @@ dependencies {
5454
implementation("com.squareup.okio:okio:3.4.0") {
5555
because("CVE-2023-3635")
5656
}
57+
implementation("org.apache.zookeeper:zookeeper:3.7.2") {
58+
because("CVE-2023-44981")
59+
}
5760
}
5861
api(project(":query-service-api"))
5962
api("com.typesafe:config:1.4.1")
60-
implementation("org.hypertrace.core.grpcutils:grpc-context-utils:0.12.1")
61-
implementation("org.hypertrace.core.grpcutils:grpc-client-utils:0.12.1")
62-
implementation("org.hypertrace.core.grpcutils:grpc-server-rx-utils:0.12.1")
63+
implementation("org.hypertrace.core.grpcutils:grpc-context-utils:0.12.6")
64+
implementation("org.hypertrace.core.grpcutils:grpc-client-utils:0.12.6")
65+
implementation("org.hypertrace.core.grpcutils:grpc-server-rx-utils:0.12.6")
6366
implementation("org.hypertrace.core.attribute.service:attribute-service-api:0.14.26")
6467
implementation("org.hypertrace.core.attribute.service:attribute-projection-registry:0.14.26")
6568
implementation("org.hypertrace.core.attribute.service:caching-attribute-service-client:0.14.26")
@@ -71,7 +74,7 @@ dependencies {
7174
}
7275
implementation("org.slf4j:slf4j-api:1.7.32")
7376
implementation("commons-codec:commons-codec:1.15")
74-
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.60")
77+
implementation("org.hypertrace.core.serviceframework:platform-metrics:0.1.62")
7578
implementation("com.google.protobuf:protobuf-java-util:3.22.0")
7679
implementation("com.google.guava:guava:32.1.2-jre")
7780
implementation("io.reactivex.rxjava3:rxjava:3.0.11")

query-service-impl/src/main/java/org/hypertrace/core/query/service/trino/TrinoBasedRequestHandler.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,8 @@ public Observable<Row> handleRequest(QueryRequest request, ExecutionContext exec
130130

131131
return executeQuery(sql.getKey(), sql.getValue());
132132
} catch (Throwable t) {
133-
return Observable.error(t);
133+
String truncatedMessage = (t.getMessage() == null) ? null : t.getMessage().substring(0, 2048);
134+
return Observable.error(new Throwable(truncatedMessage));
134135
}
135136
}
136137

query-service/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ plugins {
1010

1111
dependencies {
1212
implementation(project(":query-service-factory"))
13-
implementation("org.hypertrace.core.grpcutils:grpc-server-utils:0.12.1")
14-
implementation("org.hypertrace.core.serviceframework:platform-grpc-service-framework:0.1.61")
13+
implementation("org.hypertrace.core.grpcutils:grpc-server-utils:0.12.6")
14+
implementation("org.hypertrace.core.serviceframework:platform-grpc-service-framework:0.1.62")
1515
implementation("org.slf4j:slf4j-api:1.7.32")
1616
implementation("com.typesafe:config:1.4.1")
1717

@@ -22,7 +22,7 @@ dependencies {
2222
integrationTestImplementation("org.testcontainers:testcontainers:1.16.2")
2323
integrationTestImplementation("org.testcontainers:junit-jupiter:1.16.2")
2424
integrationTestImplementation("org.testcontainers:kafka:1.16.2")
25-
integrationTestImplementation("org.hypertrace.core.serviceframework:integrationtest-service-framework:0.1.61")
25+
integrationTestImplementation("org.hypertrace.core.serviceframework:integrationtest-service-framework:0.1.62")
2626
integrationTestImplementation("com.github.stefanbirkner:system-lambda:1.2.0")
2727

2828
integrationTestImplementation("org.apache.kafka:kafka-clients:7.2.1-ccs")

0 commit comments

Comments
 (0)