Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Backport to branch(3.10) : Fix CVE-2024-7254, CVE-2024-25638, and CVE-2024-34156 #2280

Merged
merged 2 commits into from
Oct 11, 2024
Merged

Backport to branch(3.10) : Fix CVE-2024-7254, CVE-2024-25638, and CVE-2024-34156 #2280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a70fb3
Empty commit [skip ci]
brfrn169 Oct 11, 2024
20f654d
Fix CVE-2024-7254, CVE-2024-25638, and CVE-2024-34156 (#2277)
brfrn169 Oct 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ subprojects {
oracleDriverVersion = '21.10.0.0'
sqlserverDriverVersion = '11.2.3.jre8'
sqliteDriverVersion = '3.42.0.0'
grpcVersion = '1.60.0'
protobufVersion = '3.21.12'
grpcVersion = '1.67.1'
protobufVersion = '3.25.5'
annotationVersion = '1.3.2'
picocliVersion = '4.7.4'
scalarAdminVersion = '2.1.2'
scalarAdminVersion = '2.2.1'
dropwizardMetricsVersion = '4.2.19'
prometheusVersion = '0.16.0'
commonsTextVersion = '1.10.0'
Expand Down
1 change: 1 addition & 0 deletions rpc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
}

Expand Down
2 changes: 1 addition & 1 deletion rpc/src/main/grpc/com/scalar/db/rpc/DistributedStorageAdminGrpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion rpc/src/main/grpc/com/scalar/db/rpc/DistributedStorageGrpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion rpc/src/main/grpc/com/scalar/db/rpc/DistributedTransactionAdminGrpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion rpc/src/main/grpc/com/scalar/db/rpc/DistributedTransactionGrpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion rpc/src/main/grpc/com/scalar/db/rpc/TwoPhaseCommitTransactionGrpc.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 3 additions & 5 deletions rpc/src/main/java/com/scalar/db/rpc/AbortRequest.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions rpc/src/main/java/com/scalar/db/rpc/AbortRequestOrBuilder.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions rpc/src/main/java/com/scalar/db/rpc/AbortResponse.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions rpc/src/main/java/com/scalar/db/rpc/AbortResponseOrBuilder.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 3 additions & 5 deletions rpc/src/main/java/com/scalar/db/rpc/AddNewColumnToTableRequest.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions rpc/src/main/java/com/scalar/db/rpc/AddNewColumnToTableRequestOrBuilder.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 9 additions & 10 deletions rpc/src/main/java/com/scalar/db/rpc/Column.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion rpc/src/main/java/com/scalar/db/rpc/ColumnOrBuilder.java
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading