Skip to content
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

Explicitly release bytebufs when reads are not propagated #1317

Merged
merged 2 commits into from
Oct 12, 2022
Merged

Explicitly release bytebufs when reads are not propagated #1317

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
6c04c76
explicitly release bytebufs when reads are not propagated
artgon Oct 12, 2022
cf6e8c6
simplify release for content length enforcement handler
artgon Oct 12, 2022
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: 2 additions & 0 deletions zuul-core/src/main/java/com/netflix/netty/common/throttle/MaxInboundConnectionsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import io.netty.util.AttributeKey;
import io.netty.util.ReferenceCountUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -78,6 +79,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
{
if (ctx.channel().attr(ATTR_CH_THROTTLED).get() != null) {
// Discard this msg as channel is in process of being closed.
ReferenceCountUtil.safeRelease(msg);
}
else {
super.channelRead(ctx, msg);
Expand Down
6 changes: 6 additions & 0 deletions ...src/main/java/com/netflix/zuul/netty/server/http2/Http2ContentLengthEnforcingHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import io.netty.handler.codec.http.LastHttpContent;
import io.netty.handler.codec.http2.DefaultHttp2ResetFrame;
import io.netty.handler.codec.http2.Http2Error;
import io.netty.util.ReferenceCountUtil;
import java.util.List;

/**
Expand Down Expand Up @@ -56,18 +57,21 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
List<String> lengthHeaders = req.headers().getAll(HttpHeaderNames.CONTENT_LENGTH);
if (lengthHeaders.size() > 1) {
ctx.writeAndFlush(new DefaultHttp2ResetFrame(Http2Error.PROTOCOL_ERROR));
ReferenceCountUtil.safeRelease(msg);
return;
} else if (lengthHeaders.size() == 1) {
expectedContentLength = Long.parseLong(lengthHeaders.get(0));
if (expectedContentLength < 0) {
// TODO(carl-mastrangelo): this is not right, but meh. Fix this to return a proper 400.
ctx.writeAndFlush(new DefaultHttp2ResetFrame(Http2Error.PROTOCOL_ERROR));
ReferenceCountUtil.safeRelease(msg);
return;
}
}
if (hasContentLength() && HttpUtil.isTransferEncodingChunked(req)) {
// TODO(carl-mastrangelo): this is not right, but meh. Fix this to return a proper 400.
ctx.writeAndFlush(new DefaultHttp2ResetFrame(Http2Error.PROTOCOL_ERROR));
ReferenceCountUtil.safeRelease(msg);
artgon marked this conversation as resolved.
Show resolved Hide resolved
return;
}
}
Expand All @@ -77,13 +81,15 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
if (hasContentLength() && seenContentLength > expectedContentLength) {
// TODO(carl-mastrangelo): this is not right, but meh. Fix this to return a proper 400.
ctx.writeAndFlush(new DefaultHttp2ResetFrame(Http2Error.PROTOCOL_ERROR));
ReferenceCountUtil.safeRelease(msg);
return;
}
}
if (msg instanceof LastHttpContent) {
if (hasContentLength() && seenContentLength != expectedContentLength) {
// TODO(carl-mastrangelo): this is not right, but meh. Fix this to return a proper 400.
ctx.writeAndFlush(new DefaultHttp2ResetFrame(Http2Error.PROTOCOL_ERROR));
ReferenceCountUtil.safeRelease(msg);
return;
}
}
Expand Down
2 changes: 2 additions & 0 deletions zuul-core/src/main/java/com/netflix/zuul/netty/server/http2/Http2ResetFrameHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import io.netty.channel.ChannelHandlerContext;
import io.netty.channel.ChannelInboundHandlerAdapter;
import io.netty.handler.codec.http2.Http2ResetFrame;
import io.netty.util.ReferenceCountUtil;

/**
* User: michaels@netflix.com
Expand All @@ -36,6 +37,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
if (msg instanceof Http2ResetFrame) {
// Inform zuul to cancel the request.
ctx.fireUserEventTriggered(new RequestCancelledEvent());
ReferenceCountUtil.safeRelease(msg);
}
else {
super.channelRead(ctx, msg);
Expand Down