Backport to branch(3.12) : Fix CVE-2024-7254, CVE-2024-25638, and CVE…

…-2024-34156 (#2278) Co-authored-by: Toshihiro <[email protected]>
scalar-labs · Oct 11, 2024 · 5386ddf · 5386ddf
1 parent b1639eb
commit 5386ddf
Show file tree

Hide file tree

Showing 108 changed files with 849 additions and 724 deletions.
diff --git a/build.gradle b/build.gradle
@@ -34,11 +34,11 @@ subprojects {
         oracleDriverVersion = '21.11.0.0'
         sqlserverDriverVersion = '11.2.3.jre8'
         sqliteDriverVersion = '3.45.1.0'
-        grpcVersion = '1.60.0'
-        protobufVersion = '3.21.12'
+        grpcVersion = '1.67.1'
+        protobufVersion = '3.25.5'
         annotationVersion = '1.3.2'
         picocliVersion = '4.7.5'
-        scalarAdminVersion = '2.1.2'
+        scalarAdminVersion = '2.2.1'
         dropwizardMetricsVersion = '4.2.25'
         prometheusVersion = '0.16.0'
         commonsTextVersion = '1.11.0'

diff --git a/rpc/build.gradle b/rpc/build.gradle
@@ -10,6 +10,7 @@ dependencies {
     api "io.grpc:grpc-protobuf:${grpcVersion}"
     api "io.grpc:grpc-stub:${grpcVersion}"
     api "io.grpc:grpc-services:${grpcVersion}"
+    implementation "com.google.protobuf:protobuf-java:${protobufVersion}"
     implementation "javax.annotation:javax.annotation-api:${annotationVersion}"
 }
 

diff --git a/rpc/src/main/grpc/com/scalar/db/rpc/DistributedStorageAdminGrpc.java b/rpc/src/main/grpc/com/scalar/db/rpc/DistributedStorageAdminGrpc.java
@@ -5,7 +5,7 @@
 /**
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.60.0)",
+    value = "by gRPC proto compiler (version 1.67.1)",
     comments = "Source: scalardb.proto")
 @io.grpc.stub.annotations.GrpcGenerated
 public final class DistributedStorageAdminGrpc {

diff --git a/rpc/src/main/grpc/com/scalar/db/rpc/DistributedStorageGrpc.java b/rpc/src/main/grpc/com/scalar/db/rpc/DistributedStorageGrpc.java
@@ -5,7 +5,7 @@
 /**
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.60.0)",
+    value = "by gRPC proto compiler (version 1.67.1)",
     comments = "Source: scalardb.proto")
 @io.grpc.stub.annotations.GrpcGenerated
 public final class DistributedStorageGrpc {

diff --git a/rpc/src/main/grpc/com/scalar/db/rpc/DistributedTransactionAdminGrpc.java b/rpc/src/main/grpc/com/scalar/db/rpc/DistributedTransactionAdminGrpc.java
@@ -5,7 +5,7 @@
 /**
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.60.0)",
+    value = "by gRPC proto compiler (version 1.67.1)",
     comments = "Source: scalardb.proto")
 @io.grpc.stub.annotations.GrpcGenerated
 public final class DistributedTransactionAdminGrpc {

diff --git a/rpc/src/main/grpc/com/scalar/db/rpc/DistributedTransactionGrpc.java b/rpc/src/main/grpc/com/scalar/db/rpc/DistributedTransactionGrpc.java
@@ -5,7 +5,7 @@
 /**
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.60.0)",
+    value = "by gRPC proto compiler (version 1.67.1)",
     comments = "Source: scalardb.proto")
 @io.grpc.stub.annotations.GrpcGenerated
 public final class DistributedTransactionGrpc {

diff --git a/rpc/src/main/grpc/com/scalar/db/rpc/TwoPhaseCommitTransactionGrpc.java b/rpc/src/main/grpc/com/scalar/db/rpc/TwoPhaseCommitTransactionGrpc.java
@@ -5,7 +5,7 @@
 /**
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.60.0)",
+    value = "by gRPC proto compiler (version 1.67.1)",
     comments = "Source: scalardb.proto")
 @io.grpc.stub.annotations.GrpcGenerated
 public final class TwoPhaseCommitTransactionGrpc {

diff --git a/rpc/src/main/java/com/scalar/db/rpc/AbortRequest.java b/rpc/src/main/java/com/scalar/db/rpc/AbortRequest.java
diff --git a/rpc/src/main/java/com/scalar/db/rpc/AbortRequestOrBuilder.java b/rpc/src/main/java/com/scalar/db/rpc/AbortRequestOrBuilder.java
diff --git a/rpc/src/main/java/com/scalar/db/rpc/AbortResponse.java b/rpc/src/main/java/com/scalar/db/rpc/AbortResponse.java
diff --git a/rpc/src/main/java/com/scalar/db/rpc/AbortResponseOrBuilder.java b/rpc/src/main/java/com/scalar/db/rpc/AbortResponseOrBuilder.java
diff --git a/rpc/src/main/java/com/scalar/db/rpc/AddNewColumnToTableRequest.java b/rpc/src/main/java/com/scalar/db/rpc/AddNewColumnToTableRequest.java
diff --git a/rpc/src/main/java/com/scalar/db/rpc/AddNewColumnToTableRequestOrBuilder.java b/rpc/src/main/java/com/scalar/db/rpc/AddNewColumnToTableRequestOrBuilder.java
diff --git a/rpc/src/main/java/com/scalar/db/rpc/Column.java b/rpc/src/main/java/com/scalar/db/rpc/Column.java
diff --git a/rpc/src/main/java/com/scalar/db/rpc/ColumnOrBuilder.java b/rpc/src/main/java/com/scalar/db/rpc/ColumnOrBuilder.java