[ISSUE #10791] Reject empty proxy heartbeat bodies - #10792
Open
Aias00 wants to merge 2 commits into
Open
Conversation
There was a problem hiding this comment.
Pull request overview
Note
Copilot couldn't run its full agentic review because it didn't start before the timeout. Make sure your repository has a runner available, or add a copilot-code-review.yml file specifying one with the runs-on attribute. See the docs for more details.
This PR hardens proxy remoting heartbeat handling by explicitly rejecting malformed/empty heartbeat payloads with INVALID_PARAMETER, preventing client registration side effects.
Changes:
- Add validation in
ClientManagerActivity#heartBeatfor empty/undecodable bodies and null producer/consumer datasets. - Add
ClientManagerActivityTestcoverage to ensure malformed heartbeats do not register producers/consumers or touch channel management.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| proxy/src/main/java/org/apache/rocketmq/proxy/remoting/activity/ClientManagerActivity.java | Adds early validation and returns INVALID_PARAMETER for empty heartbeat / null datasets. |
| proxy/src/test/java/org/apache/rocketmq/proxy/remoting/activity/ClientManagerActivityTest.java | Adds tests asserting malformed heartbeats are rejected and do not register clients. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+81
to
+87
| if (heartbeatData == null) { | ||
| return RemotingCommand.buildErrorResponse(ResponseCode.INVALID_PARAMETER, "heartbeat data is empty"); | ||
| } | ||
| if (heartbeatData.getProducerDataSet() == null || heartbeatData.getConsumerDataSet() == null) { | ||
| return RemotingCommand.buildErrorResponse(ResponseCode.INVALID_PARAMETER, | ||
| "heartbeat producerDataSet and consumerDataSet are required"); | ||
| } |
Comment on lines
+66
to
+77
| @Test | ||
| public void testHeartbeatShouldRejectNullDataSets() { | ||
| RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.HEART_BEAT, null); | ||
| request.setBody("{\"clientID\":\"client-a\",\"producerDataSet\":null,\"consumerDataSet\":[]}" | ||
| .getBytes(StandardCharsets.UTF_8)); | ||
|
|
||
| RemotingCommand response = clientManagerActivity.heartBeat(null, request, ProxyContext.create()); | ||
|
|
||
| assertThat(response.getCode()).isEqualTo(ResponseCode.INVALID_PARAMETER); | ||
| assertThat(response.getRemark()).isEqualTo("heartbeat producerDataSet and consumerDataSet are required"); | ||
| verifyNoClientRegistration(); | ||
| } |
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #10792 +/- ##
=============================================
- Coverage 48.34% 48.27% -0.08%
+ Complexity 13527 13499 -28
=============================================
Files 1380 1380
Lines 101104 101142 +38
Branches 13107 13122 +15
=============================================
- Hits 48882 48827 -55
- Misses 46267 46328 +61
- Partials 5955 5987 +32 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
INVALID_PARAMETERinstead of falling into NPE handlingClientManagerActivityTestcoverage to ensure malformed heartbeats do not register clientsTests
mvn -pl proxy -Dtest=ClientManagerActivityTest testCloses #10791