Skip to content

ZOOKEEPER-4281: Allow packet of max packet length to be deserialized #1683

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

Closed
wants to merge 2 commits into from
Closed

ZOOKEEPER-4281: Allow packet of max packet length to be deserialized #1683

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
b097a69
Allow packet of max packet length to be deserialized
huizhilu Apr 13, 2021
d0eaf78
Add unit test
huizhilu Apr 16, 2021
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
2 changes: 1 addition & 1 deletion zookeeper-server/src/main/java/org/apache/zookeeper/ClientCnxnSocket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ void updateLastSendAndHeard() {

void readLength() throws IOException {
int len = incomingBuffer.getInt();
if (len < 0 || len >= packetLen) {
if (len < 0 || len > packetLen) {
throw new IOException("Packet len " + len + " is out of range!");
}
incomingBuffer = ByteBuffer.allocate(len);
Expand Down
27 changes: 27 additions & 0 deletions zookeeper-server/src/test/java/org/apache/zookeeper/ClientCnxnSocketTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package org.apache.zookeeper;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
Expand Down Expand Up @@ -63,4 +64,30 @@ public void testWhenInvalidJuteMaxBufferIsConfiguredIOExceptionIsThrown() {

}

/*
* Tests readLength():
* 1. successfully read packet if length == jute.maxbuffer;
* 2. IOException is thrown if packet length is greater than jute.maxbuffer.
*/
@Test
public void testIOExceptionIsThrownWhenPacketLenExceedsJuteMaxBuffer() throws IOException {
ClientCnxnSocket clientCnxnSocket = new ClientCnxnSocketNIO(new ZKClientConfig());

// Should successfully read packet length == jute.maxbuffer
int length = ZKClientConfig.CLIENT_MAX_PACKET_LENGTH_DEFAULT;
clientCnxnSocket.incomingBuffer.putInt(length);
clientCnxnSocket.incomingBuffer.rewind();
clientCnxnSocket.readLength();

// Failed to read packet length > jute.maxbuffer
length = ZKClientConfig.CLIENT_MAX_PACKET_LENGTH_DEFAULT + 1;
clientCnxnSocket.incomingBuffer.putInt(length);
clientCnxnSocket.incomingBuffer.rewind();
try {
clientCnxnSocket.readLength();
fail("IOException is expected.");
} catch (IOException e) {
assertEquals("Packet len " + length + " is out of range!", e.getMessage());
}
}
}