Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #2679 - h2spec compliance. 

Fixed content-length compliance.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
This commit is contained in:
Simone Bordet 2018-07-21 12:52:44 +02:00
parent 4ace2e4d8d
commit 4b0becbbe0
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Stream.java
View File

@ -28,6 +28,9 @@ import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
import org.eclipse.jetty.http.HttpFields;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.MetaData;
import org.eclipse.jetty.http2.api.Stream; import org.eclipse.jetty.http2.api.Stream;
import org.eclipse.jetty.http2.frames.DataFrame; import org.eclipse.jetty.http2.frames.DataFrame;
import org.eclipse.jetty.http2.frames.FailureFrame; import org.eclipse.jetty.http2.frames.FailureFrame;
@ -59,9 +62,10 @@ public class HTTP2Stream extends IdleTimeout implements IStream, Callback, Dumpa
private final ISession session; private final ISession session;
private final int streamId; private final int streamId;
private final boolean local; private final boolean local;
private volatile Listener listener; private boolean localReset;
private volatile boolean localReset; private Listener listener;
private volatile boolean remoteReset; private boolean remoteReset;
private long dataLength;
public HTTP2Stream(Scheduler scheduler, ISession session, int streamId, boolean local) public HTTP2Stream(Scheduler scheduler, ISession session, int streamId, boolean local)
{ {
@ -69,6 +73,7 @@ public class HTTP2Stream extends IdleTimeout implements IStream, Callback, Dumpa
this.session = session; this.session = session;
this.streamId = streamId; this.streamId = streamId;
this.local = local; this.local = local;
this.dataLength = Long.MIN_VALUE;
} }
@Override @Override
@ -272,6 +277,15 @@ public class HTTP2Stream extends IdleTimeout implements IStream, Callback, Dumpa
{ {
if (updateClose(frame.isEndStream(), CloseState.Event.RECEIVED)) if (updateClose(frame.isEndStream(), CloseState.Event.RECEIVED))
session.removeStream(this); session.removeStream(this);
MetaData metaData = frame.getMetaData();
if (metaData.isRequest() || metaData.isResponse())
{
HttpFields fields = metaData.getFields();
long length = -1;
if (fields != null)
length = fields.getLongField(HttpHeader.CONTENT_LENGTH.asString());
dataLength = length >= 0 ? length : Long.MIN_VALUE;
}
callback.succeeded(); callback.succeeded();
} }
@ -301,8 +315,20 @@ public class HTTP2Stream extends IdleTimeout implements IStream, Callback, Dumpa
return; return;
} }
if (dataLength != Long.MIN_VALUE)
{
dataLength -= frame.remaining();
if (frame.isEndStream() && dataLength != 0)
{
reset(new ResetFrame(streamId, ErrorCode.PROTOCOL_ERROR.code), Callback.NOOP);
callback.failed(new IOException("invalid_data_length"));
return;
}
}
if (updateClose(frame.isEndStream(), CloseState.Event.RECEIVED)) if (updateClose(frame.isEndStream(), CloseState.Event.RECEIVED))
session.removeStream(this); session.removeStream(this);
notifyData(this, frame, callback); notifyData(this, frame, callback);
} }