diff --git a/ballerina-tests/tests/03_bidirectional_streaming_client.bal b/ballerina-tests/tests/03_bidirectional_streaming_client.bal index 621444cfa..26ff7ab01 100644 --- a/ballerina-tests/tests/03_bidirectional_streaming_client.bal +++ b/ballerina-tests/tests/03_bidirectional_streaming_client.bal @@ -250,6 +250,7 @@ isolated function testBidiStreamingDefaultHttpsPortWithNoService() returns grpc: string|grpc:Error? err = strClient->receiveString(); test:assertTrue(err is grpc:Error); - test:assertTrue((err).message().startsWith("Connection refused: ")); + test:assertTrue((err).message().startsWith("Connection refused: "), + msg = "Failed with error: " + (err).message()); } } diff --git a/ballerina-tests/tests/74_route_guide_with_reflection_client.bal b/ballerina-tests/tests/74_route_guide_with_reflection_client.bal index 28b4da952..8f8f4308f 100644 --- a/ballerina-tests/tests/74_route_guide_with_reflection_client.bal +++ b/ballerina-tests/tests/74_route_guide_with_reflection_client.bal @@ -49,21 +49,22 @@ function testRouteGuideFileByFilenameReflection() returns error? { }, "file_descriptor_response": { "file_descriptor_proto": [10,30,103,111,111,103,108,101,47,112,114,111,116,111,98,117,102,47,119,114,97,112, - 112,101,114,115,46,112,114,111,116,111,18,15,103,111,111,103,108,101,46,112,114,111,116,111,98,117,102, - 34,28,10,11,68,111,117,98,108,101,86,97,108,117,101,18,13,10,5,118,97,108,117,101,24,1,32,1,40,1,34,27, - 10,10,70,108,111,97,116,86,97,108,117,101,18,13,10,5,118,97,108,117,101,24,1,32,1,40,2,34,27,10,10,73, - 110,116,54,52,86,97,108,117,101,18,13,10,5,118,97,108,117,101,24,1,32,1,40,3,34,28,10,11,85,73,110,116, - 54,52,86,97,108,117,101,18,13,10,5,118,97,108,117,101,24,1,32,1,40,4,34,27,10,10,73,110,116,51,50,86,97, - 108,117,101,18,13,10,5,118,97,108,117,101,24,1,32,1,40,5,34,28,10,11,85,73,110,116,51,50,86,97,108,117, - 101,18,13,10,5,118,97,108,117,101,24,1,32,1,40,13,34,26,10,9,66,111,111,108,86,97,108,117,101,18,13,10, - 5,118,97,108,117,101,24,1,32,1,40,8,34,28,10,11,83,116,114,105,110,103,86,97,108,117,101,18,13,10,5,118, - 97,108,117,101,24,1,32,1,40,9,34,27,10,10,66,121,116,101,115,86,97,108,117,101,18,13,10,5,118,97,108,117, - 101,24,1,32,1,40,12,66,131,1,10,19,99,111,109,46,103,111,111,103,108,101,46,112,114,111,116,111,98,117, - 102,66,13,87,114,97,112,112,101,114,115,80,114,111,116,111,80,1,90,49,103,111,111,103,108,101,46,103,111, - 108,97,110,103,46,111,114,103,47,112,114,111,116,111,98,117,102,47,116,121,112,101,115,47,107,110,111, - 119,110,47,119,114,97,112,112,101,114,115,112,98,248,1,1,162,2,3,71,80,66,170,2,30,71,111,111,103,108, - 101,46,80,114,111,116,111,98,117,102,46,87,101,108,108,75,110,111,119,110,84,121,112,101,115,98,6,112, - 114,111,116,111,51] + 112,101,114,115,46,112,114,111,116,111,18,15,103,111,111,103,108,101,46,112,114,111,116,111,98,117,102,34, + 35,10,11,68,111,117,98,108,101,86,97,108,117,101,18,20,10,5,118,97,108,117,101,24,1,32,1,40,1,82,5,118,97, + 108,117,101,34,34,10,10,70,108,111,97,116,86,97,108,117,101,18,20,10,5,118,97,108,117,101,24,1,32,1,40,2,82, + 5,118,97,108,117,101,34,34,10,10,73,110,116,54,52,86,97,108,117,101,18,20,10,5,118,97,108,117,101,24,1,32,1, + 40,3,82,5,118,97,108,117,101,34,35,10,11,85,73,110,116,54,52,86,97,108,117,101,18,20,10,5,118,97,108,117, + 101,24,1,32,1,40,4,82,5,118,97,108,117,101,34,34,10,10,73,110,116,51,50,86,97,108,117,101,18,20,10,5,118,97, + 108,117,101,24,1,32,1,40,5,82,5,118,97,108,117,101,34,35,10,11,85,73,110,116,51,50,86,97,108,117,101,18,20, + 10,5,118,97,108,117,101,24,1,32,1,40,13,82,5,118,97,108,117,101,34,33,10,9,66,111,111,108,86,97,108,117,101, + 18,20,10,5,118,97,108,117,101,24,1,32,1,40,8,82,5,118,97,108,117,101,34,35,10,11,83,116,114,105,110,103,86, + 97,108,117,101,18,20,10,5,118,97,108,117,101,24,1,32,1,40,9,82,5,118,97,108,117,101,34,34,10,10,66,121,116, + 101,115,86,97,108,117,101,18,20,10,5,118,97,108,117,101,24,1,32,1,40,12,82,5,118,97,108,117,101,66,131,1,10, + 19,99,111,109,46,103,111,111,103,108,101,46,112,114,111,116,111,98,117,102,66,13,87,114,97,112,112,101,114, + 115,80,114,111,116,111,80,1,90,49,103,111,111,103,108,101,46,103,111,108,97,110,103,46,111,114,103,47,112, + 114,111,116,111,98,117,102,47,116,121,112,101,115,47,107,110,111,119,110,47,119,114,97,112,112,101,114,115, + 112,98,248,1,1,162,2,3,71,80,66,170,2,30,71,111,111,103,108,101,46,80,114,111,116,111,98,117,102,46,87,101, + 108,108,75,110,111,119,110,84,121,112,101,115,98,6,112,114,111,116,111,51] } }); check streamingClient->complete(); diff --git a/ballerina-tests/tests/75_packaging_with_reflection_client.bal b/ballerina-tests/tests/75_packaging_with_reflection_client.bal index 197849834..81e7657fd 100644 --- a/ballerina-tests/tests/75_packaging_with_reflection_client.bal +++ b/ballerina-tests/tests/75_packaging_with_reflection_client.bal @@ -50,21 +50,22 @@ function testPackagingFileByFilenameReflection() returns error? { }, "file_descriptor_response": { "file_descriptor_proto": [10,30,103,111,111,103,108,101,47,112,114,111,116,111,98,117,102,47,119,114,97,112, - 112,101,114,115,46,112,114,111,116,111,18,15,103,111,111,103,108,101,46,112,114,111,116,111,98,117,102, - 34,28,10,11,68,111,117,98,108,101,86,97,108,117,101,18,13,10,5,118,97,108,117,101,24,1,32,1,40,1,34,27, - 10,10,70,108,111,97,116,86,97,108,117,101,18,13,10,5,118,97,108,117,101,24,1,32,1,40,2,34,27,10,10,73, - 110,116,54,52,86,97,108,117,101,18,13,10,5,118,97,108,117,101,24,1,32,1,40,3,34,28,10,11,85,73,110,116, - 54,52,86,97,108,117,101,18,13,10,5,118,97,108,117,101,24,1,32,1,40,4,34,27,10,10,73,110,116,51,50,86,97, - 108,117,101,18,13,10,5,118,97,108,117,101,24,1,32,1,40,5,34,28,10,11,85,73,110,116,51,50,86,97,108,117, - 101,18,13,10,5,118,97,108,117,101,24,1,32,1,40,13,34,26,10,9,66,111,111,108,86,97,108,117,101,18,13,10, - 5,118,97,108,117,101,24,1,32,1,40,8,34,28,10,11,83,116,114,105,110,103,86,97,108,117,101,18,13,10,5,118, - 97,108,117,101,24,1,32,1,40,9,34,27,10,10,66,121,116,101,115,86,97,108,117,101,18,13,10,5,118,97,108,117, - 101,24,1,32,1,40,12,66,131,1,10,19,99,111,109,46,103,111,111,103,108,101,46,112,114,111,116,111,98,117, - 102,66,13,87,114,97,112,112,101,114,115,80,114,111,116,111,80,1,90,49,103,111,111,103,108,101,46,103,111, - 108,97,110,103,46,111,114,103,47,112,114,111,116,111,98,117,102,47,116,121,112,101,115,47,107,110,111, - 119,110,47,119,114,97,112,112,101,114,115,112,98,248,1,1,162,2,3,71,80,66,170,2,30,71,111,111,103,108, - 101,46,80,114,111,116,111,98,117,102,46,87,101,108,108,75,110,111,119,110,84,121,112,101,115,98,6,112, - 114,111,116,111,51] + 112,101,114,115,46,112,114,111,116,111,18,15,103,111,111,103,108,101,46,112,114,111,116,111,98,117,102, + 34,35,10,11,68,111,117,98,108,101,86,97,108,117,101,18,20,10,5,118,97,108,117,101,24,1,32,1,40,1,82,5,118, + 97,108,117,101,34,34,10,10,70,108,111,97,116,86,97,108,117,101,18,20,10,5,118,97,108,117,101,24,1,32,1,40,2, + 82,5,118,97,108,117,101,34,34,10,10,73,110,116,54,52,86,97,108,117,101,18,20,10,5,118,97,108,117,101,24,1, + 32,1,40,3,82,5,118,97,108,117,101,34,35,10,11,85,73,110,116,54,52,86,97,108,117,101,18,20,10,5,118,97,108, + 117,101,24,1,32,1,40,4,82,5,118,97,108,117,101,34,34,10,10,73,110,116,51,50,86,97,108,117,101,18,20,10,5, + 118,97,108,117,101,24,1,32,1,40,5,82,5,118,97,108,117,101,34,35,10,11,85,73,110,116,51,50,86,97,108,117,101, + 18,20,10,5,118,97,108,117,101,24,1,32,1,40,13,82,5,118,97,108,117,101,34,33,10,9,66,111,111,108,86,97,108, + 117,101,18,20,10,5,118,97,108,117,101,24,1,32,1,40,8,82,5,118,97,108,117,101,34,35,10,11,83,116,114,105,110, + 103,86,97,108,117,101,18,20,10,5,118,97,108,117,101,24,1,32,1,40,9,82,5,118,97,108,117,101,34,34,10,10,66, + 121,116,101,115,86,97,108,117,101,18,20,10,5,118,97,108,117,101,24,1,32,1,40,12,82,5,118,97,108,117,101,66, + 131,1,10,19,99,111,109,46,103,111,111,103,108,101,46,112,114,111,116,111,98,117,102,66,13,87,114,97,112,112, + 101,114,115,80,114,111,116,111,80,1,90,49,103,111,111,103,108,101,46,103,111,108,97,110,103,46,111,114,103, + 47,112,114,111,116,111,98,117,102,47,116,121,112,101,115,47,107,110,111,119,110,47,119,114,97,112,112,101, + 114,115,112,98,248,1,1,162,2,3,71,80,66,170,2,30,71,111,111,103,108,101,46,80,114,111,116,111,98,117,102,46, + 87,101,108,108,75,110,111,119,110,84,121,112,101,115,98,6,112,114,111,116,111,51] } }); } diff --git a/ballerina/Ballerina.toml b/ballerina/Ballerina.toml index 620b0555b..3fdb12112 100644 --- a/ballerina/Ballerina.toml +++ b/ballerina/Ballerina.toml @@ -1,7 +1,7 @@ [package] org = "ballerina" name = "grpc" -version = "1.12.0" +version = "1.12.1" distribution = "2201.10.0" authors = ["Ballerina"] keywords = ["network", "grpc", "protobuf", "server-streaming", "client-streaming", "bidirectional-streaming"] @@ -16,11 +16,11 @@ graalvmCompatible = true [[platform.java17.dependency]] groupId = "io.ballerina.stdlib" artifactId = "grpc-native" -version = "1.12.0" -path = "../native/build/libs/grpc-native-1.12.0.jar" +version = "1.12.1" +path = "../native/build/libs/grpc-native-1.12.1-SNAPSHOT.jar" [[platform.java17.dependency]] -path = "../test-utils/build/libs/grpc-test-utils-1.12.0.jar" +path = "../test-utils/build/libs/grpc-test-utils-1.12.1-SNAPSHOT.jar" scope = "testOnly" [[platform.java17.dependency]] diff --git a/ballerina/CompilerPlugin.toml b/ballerina/CompilerPlugin.toml index 0d3c063a2..ebfc76e9f 100644 --- a/ballerina/CompilerPlugin.toml +++ b/ballerina/CompilerPlugin.toml @@ -3,4 +3,4 @@ id = "grpc-compiler-plugin" class = "io.ballerina.stdlib.grpc.plugin.GrpcCompilerPlugin" [[dependency]] -path = "../compiler-plugin/build/libs/grpc-compiler-plugin-1.12.0.jar" +path = "../compiler-plugin/build/libs/grpc-compiler-plugin-1.12.1-SNAPSHOT.jar" diff --git a/ballerina/Dependencies.toml b/ballerina/Dependencies.toml index 0792d975d..064d095a6 100644 --- a/ballerina/Dependencies.toml +++ b/ballerina/Dependencies.toml @@ -68,7 +68,7 @@ dependencies = [ [[package]] org = "ballerina" name = "grpc" -version = "1.12.0" +version = "1.12.1" dependencies = [ {org = "ballerina", name = "auth"}, {org = "ballerina", name = "crypto"}, @@ -309,7 +309,7 @@ dependencies = [ [[package]] org = "ballerina" name = "protobuf" -version = "1.6.0" +version = "1.6.1" dependencies = [ {org = "ballerina", name = "jballerina.java"}, {org = "ballerina", name = "time"} diff --git a/changelog.md b/changelog.md index 5e267a93d..7912c1a47 100644 --- a/changelog.md +++ b/changelog.md @@ -4,6 +4,12 @@ This file contains all the notable changes done to the Ballerina gRPC package th The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.12.1] - 2024-09-26 + +### Fixed + +- [Address CVE-2024-7254 vulnerability](https://github.com/ballerina-platform/ballerina-library/issues/7013) + ## [1.11.1] - 2024-06-27 ### Fixed diff --git a/gradle.properties b/gradle.properties index c40daa3da..34a750d20 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ checkstylePluginVersion=10.12.0 commonsLang3Version=3.8.1 slf4jVersion=1.7.30 protoGoogleCommonsVersion=1.17.0 -protobufJavaVersion=3.20.3 +protobufJavaVersion=3.25.5 jknackHandlebarsVersion=4.0.6 nettyVersion=4.1.108.Final nettyTcnativeVersion=2.0.65.Final @@ -34,7 +34,7 @@ stdlibConstraintVersion=1.5.0 stdlibCryptoVersion=2.7.2 stdlibLogVersion=2.10.0 stdlibOsVersion=1.8.0 -stdlibProtobufVersion=1.6.0 +stdlibProtobufVersion=1.6.1 stdlibRandomVersion=1.5.0 stdlibTaskVersion=2.5.0