Skip to content

Fix outbound message size checking #10739

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

Merged
YifeiZhuang merged 1 commit into from
Dec 18, 2023
Merged

Fix outbound message size checking #10739

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 10 additions & 7 deletions core/src/main/java/io/grpc/internal/MessageFramer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import io.grpc.Drainable;
import io.grpc.KnownLength;
import io.grpc.Status;
import io.grpc.StatusRuntimeException;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
Expand Down Expand Up @@ -147,6 +148,8 @@ public void writePayload(InputStream message) {
.withDescription("Failed to frame message")
.withCause(e)
.asRuntimeException();
} catch (StatusRuntimeException e) {
throw e;
} catch (RuntimeException e) {
throw Status.INTERNAL
.withDescription("Failed to frame message")
Expand All @@ -170,13 +173,6 @@ private int writeUncompressed(InputStream message, int messageLength) throws IOE
}
BufferChainOutputStream bufferChain = new BufferChainOutputStream();
int written = writeToOutputStream(message, bufferChain);
if (maxOutboundMessageSize >= 0 && written > maxOutboundMessageSize) {
throw Status.RESOURCE_EXHAUSTED
.withDescription(
String.format(
Locale.US, "message too large %d > %d", written , maxOutboundMessageSize))
.asRuntimeException();
}
writeBufferChain(bufferChain, false);
return written;
}
Expand Down Expand Up @@ -238,6 +234,13 @@ private int writeKnownLengthUncompressed(InputStream message, int messageLength)
*/
private void writeBufferChain(BufferChainOutputStream bufferChain, boolean compressed) {
int messageLength = bufferChain.readableBytes();
if (maxOutboundMessageSize >= 0 && messageLength > maxOutboundMessageSize) {
throw Status.RESOURCE_EXHAUSTED
.withDescription(
String.format(
Locale.US, "message too large %d > %d", messageLength , maxOutboundMessageSize))
.asRuntimeException();
}
headerScratch.clear();
headerScratch.put(compressed ? COMPRESSED : UNCOMPRESSED).putInt(messageLength);
WritableBuffer writeableHeader = bufferAllocator.allocate(HEADER_LENGTH);
Expand Down