This is an automated email from the ASF dual-hosted git repository. lhotari pushed a commit to branch branch-4.0 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 27aad1c8c2a25b329ce4e7dd13e4034fb0416304 Author: Lari Hotari <[email protected]> AuthorDate: Tue Feb 17 15:46:10 2026 +0200 [fix][sec] Upgrade Python protobuf version to 6.33.5 to address CVE-2026-0994 (#25250) (cherry picked from commit 163b900cceab4c7ac0a1a4f91087387689d6dc17) --- bin/proto/MLDataFormats_pb2.py | 54 +++++------ docker/pulsar/Dockerfile | 4 +- .../instance/src/main/python/Function_pb2.py | 102 ++++++++++----------- .../src/main/python/InstanceCommunication_pb2.py | 2 +- .../main/python/InstanceCommunication_pb2_grpc.py | 2 +- src/update_python_protobuf_stubs.sh | 2 +- 6 files changed, 81 insertions(+), 85 deletions(-) diff --git a/bin/proto/MLDataFormats_pb2.py b/bin/proto/MLDataFormats_pb2.py index 90421b3a1f3..98543818190 100644 --- a/bin/proto/MLDataFormats_pb2.py +++ b/bin/proto/MLDataFormats_pb2.py @@ -2,7 +2,7 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # NO CHECKED-IN PROTOBUF GENCODE # source: MLDataFormats.proto -# Protobuf Python Version: 6.31.0 +# Protobuf Python Version: 6.31.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool @@ -16,7 +16,7 @@ _sym_db = _symbol_database.Default() -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x13MLDataFormats.proto\"&\n\x08KeyValue\x12\x0b\n\x03key\x18\x01 \x02(\t\x12\r\n\x05value\x18\x02 \x02(\t\"D\n\x15OffloadDriverMetadata\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\x1d\n\nproperties\x18\x02 \x03(\x0b\x32\t.KeyValue\"\xc9\x01\n\x0eOffloadContext\x12\x0e\n\x06uidMsb\x18\x01 \x01(\x03\x12\x0e\n\x06uidLsb\x18\x02 \x01(\x03\x12\x10\n\x08\x63omplete\x18\x03 \x01(\x08\x12\x19\n\x11\x62ookkeeperDeleted\x18\x04 \x01(\x08\x12 [...] +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x13MLDataFormats.proto\"&\n\x08KeyValue\x12\x0b\n\x03key\x18\x01 \x02(\t\x12\r\n\x05value\x18\x02 \x02(\t\"D\n\x15OffloadDriverMetadata\x12\x0c\n\x04name\x18\x01 \x02(\t\x12\x1d\n\nproperties\x18\x02 \x03(\x0b\x32\t.KeyValue\"\xc9\x01\n\x0eOffloadContext\x12\x0e\n\x06uidMsb\x18\x01 \x01(\x03\x12\x0e\n\x06uidLsb\x18\x02 \x01(\x03\x12\x10\n\x08\x63omplete\x18\x03 \x01(\x08\x12\x19\n\x11\x62ookkeeperDeleted\x18\x04 \x01(\x08\x12 [...] _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -26,8 +26,8 @@ if not _descriptor._USE_C_DESCRIPTORS: _globals['DESCRIPTOR']._serialized_options = b'\n#org.apache.bookkeeper.mledger.protoH\001' _globals['_MANAGEDCURSORINFO'].fields_by_name['lastActive']._loaded_options = None _globals['_MANAGEDCURSORINFO'].fields_by_name['lastActive']._serialized_options = b'\030\001' - _globals['_COMPRESSIONTYPE']._serialized_start=2008 - _globals['_COMPRESSIONTYPE']._serialized_end=2076 + _globals['_COMPRESSIONTYPE']._serialized_start=1976 + _globals['_COMPRESSIONTYPE']._serialized_end=2044 _globals['_KEYVALUE']._serialized_start=23 _globals['_KEYVALUE']._serialized_end=61 _globals['_OFFLOADDRIVERMETADATA']._serialized_start=63 @@ -37,27 +37,27 @@ if not _descriptor._USE_C_DESCRIPTORS: _globals['_OFFLOADSEGMENT']._serialized_start=338 _globals['_OFFLOADSEGMENT']._serialized_end=527 _globals['_MANAGEDLEDGERINFO']._serialized_start=530 - _globals['_MANAGEDLEDGERINFO']._serialized_end=835 - _globals['_MANAGEDLEDGERINFO_LEDGERINFO']._serialized_start=683 - _globals['_MANAGEDLEDGERINFO_LEDGERINFO']._serialized_end=835 - _globals['_POSITIONINFO']._serialized_start=838 - _globals['_POSITIONINFO']._serialized_end=1097 - _globals['_NESTEDPOSITIONINFO']._serialized_start=1099 - _globals['_NESTEDPOSITIONINFO']._serialized_end=1154 - _globals['_LONGLISTMAP']._serialized_start=1156 - _globals['_LONGLISTMAP']._serialized_end=1198 - _globals['_MESSAGERANGE']._serialized_start=1200 - _globals['_MESSAGERANGE']._serialized_end=1302 - _globals['_BATCHEDENTRYDELETIONINDEXINFO']._serialized_start=1304 - _globals['_BATCHEDENTRYDELETIONINDEXINFO']._serialized_end=1393 - _globals['_LONGPROPERTY']._serialized_start=1395 - _globals['_LONGPROPERTY']._serialized_end=1438 - _globals['_STRINGPROPERTY']._serialized_start=1440 - _globals['_STRINGPROPERTY']._serialized_end=1485 - _globals['_MANAGEDCURSORINFO']._serialized_start=1488 - _globals['_MANAGEDCURSORINFO']._serialized_end=1810 - _globals['_MANAGEDLEDGERINFOMETADATA']._serialized_start=1812 - _globals['_MANAGEDLEDGERINFOMETADATA']._serialized_end=1908 - _globals['_MANAGEDCURSORINFOMETADATA']._serialized_start=1910 - _globals['_MANAGEDCURSORINFOMETADATA']._serialized_end=2006 + _globals['_MANAGEDLEDGERINFO']._serialized_end=803 + _globals['_MANAGEDLEDGERINFO_LEDGERINFO']._serialized_start=682 + _globals['_MANAGEDLEDGERINFO_LEDGERINFO']._serialized_end=803 + _globals['_POSITIONINFO']._serialized_start=806 + _globals['_POSITIONINFO']._serialized_end=1065 + _globals['_NESTEDPOSITIONINFO']._serialized_start=1067 + _globals['_NESTEDPOSITIONINFO']._serialized_end=1122 + _globals['_LONGLISTMAP']._serialized_start=1124 + _globals['_LONGLISTMAP']._serialized_end=1166 + _globals['_MESSAGERANGE']._serialized_start=1168 + _globals['_MESSAGERANGE']._serialized_end=1270 + _globals['_BATCHEDENTRYDELETIONINDEXINFO']._serialized_start=1272 + _globals['_BATCHEDENTRYDELETIONINDEXINFO']._serialized_end=1361 + _globals['_LONGPROPERTY']._serialized_start=1363 + _globals['_LONGPROPERTY']._serialized_end=1406 + _globals['_STRINGPROPERTY']._serialized_start=1408 + _globals['_STRINGPROPERTY']._serialized_end=1453 + _globals['_MANAGEDCURSORINFO']._serialized_start=1456 + _globals['_MANAGEDCURSORINFO']._serialized_end=1778 + _globals['_MANAGEDLEDGERINFOMETADATA']._serialized_start=1780 + _globals['_MANAGEDLEDGERINFOMETADATA']._serialized_end=1876 + _globals['_MANAGEDCURSORINFOMETADATA']._serialized_start=1878 + _globals['_MANAGEDCURSORINFOMETADATA']._serialized_end=1974 # @@protoc_insertion_point(module_scope) diff --git a/docker/pulsar/Dockerfile b/docker/pulsar/Dockerfile index 2658d03fce0..fc38c14bbbe 100644 --- a/docker/pulsar/Dockerfile +++ b/docker/pulsar/Dockerfile @@ -111,8 +111,8 @@ RUN apk upgrade --no-cache ARG PULSAR_CLIENT_PYTHON_VERSION RUN pip3 install --break-system-packages --no-cache-dir \ --only-binary \ - grpcio==1.73.1 \ - protobuf==6.31.1 \ + grpcio==1.78.0 \ + protobuf==6.33.5 \ pulsar-client[all]==${PULSAR_CLIENT_PYTHON_VERSION} \ kazoo diff --git a/pulsar-functions/instance/src/main/python/Function_pb2.py b/pulsar-functions/instance/src/main/python/Function_pb2.py index c2e0122b692..493d6820527 100644 --- a/pulsar-functions/instance/src/main/python/Function_pb2.py +++ b/pulsar-functions/instance/src/main/python/Function_pb2.py @@ -2,7 +2,7 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # NO CHECKED-IN PROTOBUF GENCODE # source: Function.proto -# Protobuf Python Version: 6.31.0 +# Protobuf Python Version: 6.31.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool @@ -16,7 +16,7 @@ _sym_db = _symbol_database.Default() -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0e\x46unction.proto\x12\x05proto\"3\n\tResources\x12\x0b\n\x03\x63pu\x18\x01 \x01(\x01\x12\x0b\n\x03ram\x18\x02 \x01(\x03\x12\x0c\n\x04\x64isk\x18\x03 \x01(\x03\"B\n\x0cRetryDetails\x12\x19\n\x11maxMessageRetries\x18\x01 \x01(\x05\x12\x17\n\x0f\x64\x65\x61\x64LetterTopic\x18\x02 \x01(\t\"\xa6\x06\n\x0f\x46unctionDetails\x12\x0e\n\x06tenant\x18\x01 \x01(\t\x12\x11\n\tnamespace\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t [...] +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x0e\x46unction.proto\x12\x05proto\"3\n\tResources\x12\x0b\n\x03\x63pu\x18\x01 \x01(\x01\x12\x0b\n\x03ram\x18\x02 \x01(\x03\x12\x0c\n\x04\x64isk\x18\x03 \x01(\x03\"B\n\x0cRetryDetails\x12\x19\n\x11maxMessageRetries\x18\x01 \x01(\x05\x12\x17\n\x0f\x64\x65\x61\x64LetterTopic\x18\x02 \x01(\t\"\xa6\x06\n\x0f\x46unctionDetails\x12\x0e\n\x06tenant\x18\x01 \x01(\t\x12\x11\n\tnamespace\x18\x02 \x01(\t\x12\x0c\n\x04name\x18\x03 \x01(\t [...] _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -44,16 +44,16 @@ if not _descriptor._USE_C_DESCRIPTORS: _globals['_SINKSPEC_CONSUMERPROPERTIESENTRY']._serialized_options = b'8\001' _globals['_FUNCTIONMETADATA_INSTANCESTATESENTRY']._loaded_options = None _globals['_FUNCTIONMETADATA_INSTANCESTATESENTRY']._serialized_options = b'8\001' - _globals['_PROCESSINGGUARANTEES']._serialized_start=4243 - _globals['_PROCESSINGGUARANTEES']._serialized_end=4334 - _globals['_SUBSCRIPTIONTYPE']._serialized_start=4336 - _globals['_SUBSCRIPTIONTYPE']._serialized_end=4396 - _globals['_SUBSCRIPTIONPOSITION']._serialized_start=4398 - _globals['_SUBSCRIPTIONPOSITION']._serialized_end=4446 - _globals['_COMPRESSIONTYPE']._serialized_start=4448 - _globals['_COMPRESSIONTYPE']._serialized_end=4516 - _globals['_FUNCTIONSTATE']._serialized_start=4518 - _globals['_FUNCTIONSTATE']._serialized_end=4559 + _globals['_PROCESSINGGUARANTEES']._serialized_start=3856 + _globals['_PROCESSINGGUARANTEES']._serialized_end=3947 + _globals['_SUBSCRIPTIONTYPE']._serialized_start=3949 + _globals['_SUBSCRIPTIONTYPE']._serialized_end=4009 + _globals['_SUBSCRIPTIONPOSITION']._serialized_start=4011 + _globals['_SUBSCRIPTIONPOSITION']._serialized_end=4059 + _globals['_COMPRESSIONTYPE']._serialized_start=4061 + _globals['_COMPRESSIONTYPE']._serialized_end=4129 + _globals['_FUNCTIONSTATE']._serialized_start=4131 + _globals['_FUNCTIONSTATE']._serialized_end=4172 _globals['_RESOURCES']._serialized_start=25 _globals['_RESOURCES']._serialized_end=76 _globals['_RETRYDETAILS']._serialized_start=78 @@ -65,45 +65,41 @@ if not _descriptor._USE_C_DESCRIPTORS: _globals['_FUNCTIONDETAILS_COMPONENTTYPE']._serialized_start=889 _globals['_FUNCTIONDETAILS_COMPONENTTYPE']._serialized_end=953 _globals['_CONSUMERSPEC']._serialized_start=956 - _globals['_CONSUMERSPEC']._serialized_end=1532 - _globals['_CONSUMERSPEC_RECEIVERQUEUESIZE']._serialized_start=1382 - _globals['_CONSUMERSPEC_RECEIVERQUEUESIZE']._serialized_end=1416 - _globals['_CONSUMERSPEC_SCHEMAPROPERTIESENTRY']._serialized_start=1418 - _globals['_CONSUMERSPEC_SCHEMAPROPERTIESENTRY']._serialized_end=1473 - _globals['_CONSUMERSPEC_CONSUMERPROPERTIESENTRY']._serialized_start=1475 - _globals['_CONSUMERSPEC_CONSUMERPROPERTIESENTRY']._serialized_end=1532 - _globals['_PRODUCERSPEC']._serialized_start=1535 - _globals['_PRODUCERSPEC']._serialized_end=1807 - _globals['_CRYPTOSPEC']._serialized_start=1810 - _globals['_CRYPTOSPEC']._serialized_end=2125 - _globals['_CRYPTOSPEC_FAILUREACTION']._serialized_start=2064 - _globals['_CRYPTOSPEC_FAILUREACTION']._serialized_end=2125 - _globals['_MESSAGEPAYLOADPROCESSORSPEC']._serialized_start=2127 - _globals['_MESSAGEPAYLOADPROCESSORSPEC']._serialized_end=2192 - _globals['_BATCHINGSPEC']._serialized_start=2195 - _globals['_BATCHINGSPEC']._serialized_end=2396 - _globals['_SOURCESPEC']._serialized_start=2399 - _globals['_SOURCESPEC']._serialized_end=3031 - _globals['_SOURCESPEC_TOPICSTOSERDECLASSNAMEENTRY']._serialized_start=2898 - _globals['_SOURCESPEC_TOPICSTOSERDECLASSNAMEENTRY']._serialized_end=2959 - _globals['_SOURCESPEC_INPUTSPECSENTRY']._serialized_start=2961 - _globals['_SOURCESPEC_INPUTSPECSENTRY']._serialized_end=3031 - _globals['_SINKSPEC']._serialized_start=3034 - _globals['_SINKSPEC']._serialized_end=3510 - _globals['_SINKSPEC_SCHEMAPROPERTIESENTRY']._serialized_start=1418 - _globals['_SINKSPEC_SCHEMAPROPERTIESENTRY']._serialized_end=1473 - _globals['_SINKSPEC_CONSUMERPROPERTIESENTRY']._serialized_start=1475 - _globals['_SINKSPEC_CONSUMERPROPERTIESENTRY']._serialized_end=1532 - _globals['_PACKAGELOCATIONMETADATA']._serialized_start=3512 - _globals['_PACKAGELOCATIONMETADATA']._serialized_end=3584 - _globals['_FUNCTIONMETADATA']._serialized_start=3587 - _globals['_FUNCTIONMETADATA']._serialized_end=4029 - _globals['_FUNCTIONMETADATA_INSTANCESTATESENTRY']._serialized_start=3954 - _globals['_FUNCTIONMETADATA_INSTANCESTATESENTRY']._serialized_end=4029 - _globals['_FUNCTIONAUTHENTICATIONSPEC']._serialized_start=4031 - _globals['_FUNCTIONAUTHENTICATIONSPEC']._serialized_end=4091 - _globals['_INSTANCE']._serialized_start=4093 - _globals['_INSTANCE']._serialized_end=4174 - _globals['_ASSIGNMENT']._serialized_start=4176 - _globals['_ASSIGNMENT']._serialized_end=4241 + _globals['_CONSUMERSPEC']._serialized_end=1459 + _globals['_CONSUMERSPEC_RECEIVERQUEUESIZE']._serialized_start=1309 + _globals['_CONSUMERSPEC_RECEIVERQUEUESIZE']._serialized_end=1343 + _globals['_CONSUMERSPEC_SCHEMAPROPERTIESENTRY']._serialized_start=1345 + _globals['_CONSUMERSPEC_SCHEMAPROPERTIESENTRY']._serialized_end=1400 + _globals['_CONSUMERSPEC_CONSUMERPROPERTIESENTRY']._serialized_start=1402 + _globals['_CONSUMERSPEC_CONSUMERPROPERTIESENTRY']._serialized_end=1459 + _globals['_PRODUCERSPEC']._serialized_start=1462 + _globals['_PRODUCERSPEC']._serialized_end=1691 + _globals['_CRYPTOSPEC']._serialized_start=1694 + _globals['_CRYPTOSPEC']._serialized_end=2009 + _globals['_CRYPTOSPEC_FAILUREACTION']._serialized_start=1948 + _globals['_CRYPTOSPEC_FAILUREACTION']._serialized_end=2009 + _globals['_SOURCESPEC']._serialized_start=2012 + _globals['_SOURCESPEC']._serialized_end=2644 + _globals['_SOURCESPEC_TOPICSTOSERDECLASSNAMEENTRY']._serialized_start=2511 + _globals['_SOURCESPEC_TOPICSTOSERDECLASSNAMEENTRY']._serialized_end=2572 + _globals['_SOURCESPEC_INPUTSPECSENTRY']._serialized_start=2574 + _globals['_SOURCESPEC_INPUTSPECSENTRY']._serialized_end=2644 + _globals['_SINKSPEC']._serialized_start=2647 + _globals['_SINKSPEC']._serialized_end=3123 + _globals['_SINKSPEC_SCHEMAPROPERTIESENTRY']._serialized_start=1345 + _globals['_SINKSPEC_SCHEMAPROPERTIESENTRY']._serialized_end=1400 + _globals['_SINKSPEC_CONSUMERPROPERTIESENTRY']._serialized_start=1402 + _globals['_SINKSPEC_CONSUMERPROPERTIESENTRY']._serialized_end=1459 + _globals['_PACKAGELOCATIONMETADATA']._serialized_start=3125 + _globals['_PACKAGELOCATIONMETADATA']._serialized_end=3197 + _globals['_FUNCTIONMETADATA']._serialized_start=3200 + _globals['_FUNCTIONMETADATA']._serialized_end=3642 + _globals['_FUNCTIONMETADATA_INSTANCESTATESENTRY']._serialized_start=3567 + _globals['_FUNCTIONMETADATA_INSTANCESTATESENTRY']._serialized_end=3642 + _globals['_FUNCTIONAUTHENTICATIONSPEC']._serialized_start=3644 + _globals['_FUNCTIONAUTHENTICATIONSPEC']._serialized_end=3704 + _globals['_INSTANCE']._serialized_start=3706 + _globals['_INSTANCE']._serialized_end=3787 + _globals['_ASSIGNMENT']._serialized_start=3789 + _globals['_ASSIGNMENT']._serialized_end=3854 # @@protoc_insertion_point(module_scope) diff --git a/pulsar-functions/instance/src/main/python/InstanceCommunication_pb2.py b/pulsar-functions/instance/src/main/python/InstanceCommunication_pb2.py index e967a2e5ab4..29e5c02de06 100644 --- a/pulsar-functions/instance/src/main/python/InstanceCommunication_pb2.py +++ b/pulsar-functions/instance/src/main/python/InstanceCommunication_pb2.py @@ -2,7 +2,7 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # NO CHECKED-IN PROTOBUF GENCODE # source: InstanceCommunication.proto -# Protobuf Python Version: 6.31.0 +# Protobuf Python Version: 6.31.1 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool diff --git a/pulsar-functions/instance/src/main/python/InstanceCommunication_pb2_grpc.py b/pulsar-functions/instance/src/main/python/InstanceCommunication_pb2_grpc.py index b6135f36e8b..942fc7d447e 100644 --- a/pulsar-functions/instance/src/main/python/InstanceCommunication_pb2_grpc.py +++ b/pulsar-functions/instance/src/main/python/InstanceCommunication_pb2_grpc.py @@ -6,7 +6,7 @@ import warnings import InstanceCommunication_pb2 as InstanceCommunication__pb2 from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2 -GRPC_GENERATED_VERSION = '1.73.1' +GRPC_GENERATED_VERSION = '1.78.0' GRPC_VERSION = grpc.__version__ diff --git a/src/update_python_protobuf_stubs.sh b/src/update_python_protobuf_stubs.sh index 45190c2cd2f..d60e6d5e72f 100755 --- a/src/update_python_protobuf_stubs.sh +++ b/src/update_python_protobuf_stubs.sh @@ -20,7 +20,7 @@ # This script generates Python gRPC and Protobuf stubs from the .proto files # Set the version of PYTHON_GRPCIO_VERSION to the version which matches the version of grpcio in the Dockerfile -PYTHON_GRPCIO_VERSION=${PYTHON_GRPCIO_VERSION:-"1.73.1"} +PYTHON_GRPCIO_VERSION=${PYTHON_GRPCIO_VERSION:-"1.78.0"} set -euo pipefail
