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

Jump to bottom

Prevent stray chunks from reaching filter chain #1350

Merged
merged 3 commits into from Oct 20, 2022
+16 −2
Merged

Prevent stray chunks from reaching filter chain #1350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a2ba665
Prevent stray chunks from reaching filter chain
artgon Oct 20, 2022
5a563fe
ensure request is cancelled on error events
artgon Oct 20, 2022
5a75c00
don't log SSL exceptions
artgon Oct 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions zuul-core/src/main/java/com/netflix/zuul/filters/endpoint/ProxyEndpoint.java
View file
Open in desktop
Expand Up @@ -348,6 +348,14 @@ public void invokeNext(final HttpContent chunk) {
}

private void filterResponseChunk(final HttpContent chunk) {
if (context.isCancelled() || !channelCtx.channel().isActive()) {
SpectatorUtils.newCounter("zuul.origin.strayChunk",
origin == null ? "none" : origin.getName().getMetricId()).increment();
unlinkFromOrigin();
ReferenceCountUtil.safeRelease(chunk);
return;
}

if (chunk instanceof LastHttpContent) {
unlinkFromOrigin();
}
Expand Down
2 changes: 2 additions & 0 deletions zuul-core/src/main/java/com/netflix/zuul/netty/filter/ZuulFilterChainHandler.java
View file
Open in desktop
Expand Up @@ -98,6 +98,7 @@ else if (evt instanceof IdleStateEvent) {
}
else if (evt instanceof RequestCancelledEvent) {
if (zuulRequest != null) {
zuulRequest.getContext().cancel();
StatusCategoryUtils.storeStatusCategoryIfNotAlreadyFailure(zuulRequest.getContext(), FAILURE_CLIENT_CANCELLED);
}
fireEndpointFinish(true);
Expand All @@ -112,6 +113,7 @@ private void sendResponse(final StatusCategory statusCategory, final int status,
}
else {
final SessionContext zuulCtx = zuulRequest.getContext();
zuulRequest.getContext().cancel();
StatusCategoryUtils.storeStatusCategoryIfNotAlreadyFailure(zuulCtx, statusCategory);
final HttpResponseMessage zuulResponse = new HttpResponseMessageImpl(zuulCtx, zuulRequest, status);
final Headers headers = zuulResponse.getHeaders();
Expand Down
8 changes: 6 additions & 2 deletions zuul-core/src/main/java/com/netflix/zuul/netty/server/ClientRequestReceiver.java
View file
Open in desktop
Expand Up @@ -71,6 +71,7 @@
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import javax.net.ssl.SSLException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -458,11 +459,14 @@ private void fireWriteError(String requestPart, Throwable cause, ChannelHandlerC
final String errMesg = String.format("Error writing %s to client", requestPart);

if (cause instanceof java.nio.channels.ClosedChannelException ||
cause instanceof Errors.NativeIoException) {
cause instanceof Errors.NativeIoException ||
cause instanceof SSLException ||
(cause.getCause() != null && cause.getCause() instanceof SSLException)) {
LOG.debug(errMesg + " - client connection is closed.");
if (zuulRequest != null) {
zuulRequest.getContext().cancel();
StatusCategoryUtils.storeStatusCategoryIfNotAlreadyFailure(zuulRequest.getContext(), ZuulStatusCategory.FAILURE_CLIENT_CANCELLED);
StatusCategoryUtils.storeStatusCategoryIfNotAlreadyFailure(zuulRequest.getContext(),
ZuulStatusCategory.FAILURE_CLIENT_CANCELLED);
}
}
else {
Expand Down