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

update SizeLimitHandler with fixes needed for appengine tests #11570

Merged
merged 2 commits into from
Apr 24, 2024
Merged

update SizeLimitHandler with fixes needed for appengine tests #11570

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e41b67
update SizeLimitHandler with fixes needed for appengine tests
lachlan-roberts Mar 26, 2024
c7f6dde
changes from review
lachlan-roberts Apr 9, 2024
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
14 changes: 11 additions & 3 deletions jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/SizeLimitHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ private class SizeLimitResponseWrapper extends Response.Wrapper
{
private final HttpFields.Mutable _httpFields;
private long _written = 0;
private HttpException.RuntimeException _failure;

public SizeLimitResponseWrapper(Request request, Response wrapped)
{
Expand All @@ -119,7 +120,7 @@ public SizeLimitResponseWrapper(Request request, Response wrapped)
@Override
public HttpField onAddField(HttpField field)
{
if (field.getHeader().is(HttpHeader.CONTENT_LENGTH.asString()))
if (field.getHeader() == HttpHeader.CONTENT_LENGTH)
{
long contentLength = field.getLongValue();
if (_responseLimit >= 0 && contentLength > _responseLimit)
Expand All @@ -139,12 +140,19 @@ public HttpFields.Mutable getHeaders()
@Override
public void write(boolean last, ByteBuffer content, Callback callback)
{
if (_failure != null)
{
callback.failed(_failure);
return;
}

if (content != null && content.remaining() > 0)
{
if (_responseLimit >= 0 && (_written + content.remaining()) > _responseLimit)
{
String message = "Response body is too large: %d>%d".formatted(_written + content.remaining(), _responseLimit);
callback.failed(new HttpException.RuntimeException(HttpStatus.INTERNAL_SERVER_ERROR_500, message));
_failure = new HttpException.RuntimeException(HttpStatus.INTERNAL_SERVER_ERROR_500,
"Response body is too large: %d>%d".formatted(_written + content.remaining(), _responseLimit));
callback.failed(_failure);
return;
}
_written += content.remaining();
Expand Down
Loading