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

HTTP2: Allow frame of type RstStreamFrame when in state HalfClosedLocalWaitingForPeerStream #614

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

HTTP2: Allow frame of type RstStreamFrame when in state HalfClosedLocalWaitingForPeerStream #614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
449820e
WIP: test reproducing the "Received unexpected frame of type RstStrea…
jtjeferreira Sep 30, 2024
a34a990
abuse 429 TooManyRequests
jtjeferreira Oct 1, 2024
8fcc920
also use PeerClosedStreamException
jtjeferreira Oct 1, 2024
4d49c30
scalafmt
jtjeferreira Oct 1, 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
5 changes: 5 additions & 0 deletions http-core/src/main/scala/org/apache/pekko/http/impl/engine/http2/Http2StreamHandling.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,11 @@ private[http2] trait Http2StreamHandling extends GraphStageLogic with LogHelper
case _: WindowUpdateFrame =>
// We're not planning on sending any data on this stream anymore, so we don't care about window updates.
this
case rst: RstStreamFrame =>
val headers = ParsedHeadersFrame(rst.streamId, endStream = false, Seq((":status", "429")), None)
dispatchSubstream(headers, Right(Source.failed(new PeerClosedStreamException(rst.streamId, rst.errorCode))),
correlationAttributes)
Closed
Comment on lines +448 to +452
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should I handle rst: RstStreamFrame is other states? should I change other places that handle RstStreamFrame to return the fake response?

case _ =>
expectIncomingStream(event, Closed, HalfClosedLocal(_), correlationAttributes)
}
Expand Down
18 changes: 18 additions & 0 deletions http2-tests/src/test/scala/org/apache/pekko/http/impl/engine/http2/Http2ClientSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,24 @@ class Http2ClientSpec extends PekkoSpecWithMaterializer("""
val dynamicTableUpdateTo8192 = ByteString(63, 225, 63)
headerPayload.take(3) shouldBe dynamicTableUpdateTo8192
})
"close stream if peer sends RST_STREAM frame with REFUSED_STREAM".inAssertAllStagesStopped(
new TestSetup with NetProbes {
val data = ByteString("abcd")
user.emitRequest(Post("/", HttpEntity(data)))
val TheStreamId = network.expect[HeadersFrame]().streamId
network.expectDATA(TheStreamId, endStream = true, data)

network.sendRST_STREAM(TheStreamId, ErrorCode.REFUSED_STREAM)

val response = user.expectResponse()
response.status should be(StatusCodes.TooManyRequests)

val entityDataIn = ByteStringSinkProbe(response.entity.dataBytes)
val error = entityDataIn.expectError()
error.getMessage shouldBe "Stream with ID [1] was closed by peer with code REFUSED_STREAM(0x07)"

connectionShouldStillBeUsable()
})
}

"support stream for response data" should {
Expand Down
Loading