[fix][client] Fix consumer not returning encrypted messages on decryption failure with compression enabled #24356
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
There is a problem when a consumer tries to decrypt a compressed message. If a consumer fails to decrypt a compressed message, it also fails to decompress it, leading to the message being discarded. The user won't receive the message, even if using
CryptoFailureAction.CONSUME
, because the failure occurs during decompression, not decryption. This issue could be easily reproduced by the test added in this PR:testE2EEncryptionWithCompression
.We already have logic to skip decompression for messages that can't be decrypted:
pulsar/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
Lines 1439 to 1441 in 397b021
The main issue is if the consumer fails to decrypt the message here:
pulsar/pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
Line 1947 in 397b021
Modification
decryptPayloadIfNeeded
to return a clearer result,DecryptResult
, to guide the logic on whether the message was decrypted successfully or should be discarded.Verifying this change
This change added tests
Does this pull request potentially affect one of the following parts:
If the box was checked, please highlight the changes
Documentation
doc
doc-required
doc-not-needed
doc-complete
Matching PR in forked repository
PR in forked repository: