raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

=htc #15686 fix off-by-one error when creating strict entities for small payloads

Browse source
This commit is contained in:
Johannes Rudolph 2014-07-22 17:47:32 +02:00
parent b69235e195
commit e066dd36fc
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-http-core/src/main/scala/akka/http/parsing/HttpRequestParser.scala
View file

@ -125,7 +125,7 @@ private[http] class HttpRequestParser(_settings: ParserSettings,
else if (contentLength == 0) { else if (contentLength == 0) {
emitRequestStart(emptyEntity(cth)) emitRequestStart(emptyEntity(cth))
startNewMessage(input, bodyStart) startNewMessage(input, bodyStart)
} else if (contentLength < input.size - bodyStart) { } else if (contentLength <= input.size - bodyStart) {
val cl = contentLength.toInt val cl = contentLength.toInt
emitRequestStart(strictEntity(cth, input, bodyStart, cl)) emitRequestStart(strictEntity(cth, input, bodyStart, cl))
startNewMessage(input, bodyStart + cl) startNewMessage(input, bodyStart + cl)

16
akka-http-core/src/test/scala/akka/http/server/HttpServerPipelineSpec.scala
View file

@ -89,7 +89,7 @@ class HttpServerPipelineSpec extends AkkaSpec with Matchers with BeforeAndAfterA
} }
}) })
"deliver the request entity as it comes in strictly for an immediately completed Strict entity" in pendingUntilFixed(new TestSetup { // broken because of #15686 "deliver the request entity as it comes in strictly for an immediately completed Strict entity" in new TestSetup {
send("""POST /strict HTTP/1.1 send("""POST /strict HTTP/1.1
|Host: example.com |Host: example.com
|Content-Length: 12 |Content-Length: 12
@ -102,7 +102,7 @@ class HttpServerPipelineSpec extends AkkaSpec with Matchers with BeforeAndAfterA
uri = "http://example.com/strict", uri = "http://example.com/strict",
headers = List(Host("example.com")), headers = List(Host("example.com")),
entity = HttpEntity.Strict(ContentTypes.`application/octet-stream`, ByteString("abcdefghijkl"))) entity = HttpEntity.Strict(ContentTypes.`application/octet-stream`, ByteString("abcdefghijkl")))
}) }
"deliver the request entity as it comes in for a Default entity" in new TestSetup { "deliver the request entity as it comes in for a Default entity" in new TestSetup {
send("""POST / HTTP/1.1 send("""POST / HTTP/1.1
|Host: example.com |Host: example.com
@ -146,7 +146,7 @@ class HttpServerPipelineSpec extends AkkaSpec with Matchers with BeforeAndAfterA
} }
} }
"deliver the second message properly after a Strict entity" in pendingUntilFixed(new TestSetup { // broken because of #15686 "deliver the second message properly after a Strict entity" in new TestSetup {
send("""POST /strict HTTP/1.1 send("""POST /strict HTTP/1.1
|Host: example.com |Host: example.com
|Content-Length: 12 |Content-Length: 12
@ -172,8 +172,8 @@ class HttpServerPipelineSpec extends AkkaSpec with Matchers with BeforeAndAfterA
uri = "http://example.com/next-strict", uri = "http://example.com/next-strict",
headers = List(Host("example.com")), headers = List(Host("example.com")),
entity = HttpEntity.Strict(ContentTypes.`application/octet-stream`, ByteString("mnopqrstuvwx"))) entity = HttpEntity.Strict(ContentTypes.`application/octet-stream`, ByteString("mnopqrstuvwx")))
}) }
"deliver the second message properly after a Default entity" in pendingUntilFixed(new TestSetup { // broken because of #15686 "deliver the second message properly after a Default entity" in new TestSetup {
send("""POST / HTTP/1.1 send("""POST / HTTP/1.1
|Host: example.com |Host: example.com
|Content-Length: 12 |Content-Length: 12
@ -206,8 +206,8 @@ class HttpServerPipelineSpec extends AkkaSpec with Matchers with BeforeAndAfterA
case HttpRequest(HttpMethods.POST, _, _, HttpEntity.Strict(_, data), _) ⇒ case HttpRequest(HttpMethods.POST, _, _, HttpEntity.Strict(_, data), _) ⇒
data shouldEqual (ByteString("abcde")) data shouldEqual (ByteString("abcde"))
} }
}) }
"deliver the second message properly after a Chunked entity" in pendingUntilFixed(new TestSetup { // broken because of #15686 "deliver the second message properly after a Chunked entity" in new TestSetup {
send("""POST /chunked HTTP/1.1 send("""POST /chunked HTTP/1.1
|Host: example.com |Host: example.com
|Transfer-Encoding: chunked |Transfer-Encoding: chunked
@ -243,7 +243,7 @@ class HttpServerPipelineSpec extends AkkaSpec with Matchers with BeforeAndAfterA
case HttpRequest(HttpMethods.POST, _, _, HttpEntity.Strict(_, data), _) ⇒ case HttpRequest(HttpMethods.POST, _, _, HttpEntity.Strict(_, data), _) ⇒
data shouldEqual (ByteString("abcde")) data shouldEqual (ByteString("abcde"))
} }
}) }
"close the request entity stream when the entity is complete for a Default entity" in new TestSetup { "close the request entity stream when the entity is complete for a Default entity" in new TestSetup {
send("""POST / HTTP/1.1 send("""POST / HTTP/1.1