Skip to content

We can now read http responses that are missing status code description. #23

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

Merged
merged 2 commits into from
Feb 5, 2018
Merged

We can now read http responses that are missing status code description. #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c27ee1
We can now read http resposes that are missing status code description.
AdamChlupacek Feb 2, 2018
4024343
We now send the status code description, if no custom one is provided.
AdamChlupacek Feb 2, 2018
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
17 changes: 14 additions & 3 deletions http/src/main/scala/spinoco/protocol/http/codec/HttpResponseHeaderCodec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,24 @@ object HttpResponseHeaderCodec {
val headerLineCodec: Codec[HttpVersion.Value :: HttpStatusCode :: String :: HNil] = {

(bytesUntil(_ != ' ').codedAs(HttpVersion.codec) <~ whitespace()) ::
(bytesUntil(_ != ' ').codedAs(HttpStatusCode.codec) <~ whitespace()) ::
utf8String
choice(
(bytesUntil(_ != ' ').codedAs(HttpStatusCode.codec) <~ whitespace()) :: utf8String
, HttpStatusCode.codec.xmap[HttpStatusCode :: String :: HNil](
code => code :: code.description :: HNil
, { case code :: _ :: HNil => code }
)
)
}

parametrizedN(crlf, crlf, "Response" | headerLineCodec, "Headers" | headerCodec).xmap[HttpResponseHeader] (
{ case (version :: status :: phrase :: HNil, headers) => HttpResponseHeader(status, phrase, headers, version) }
, h => ( h.version :: h.status :: h.reason :: HNil, h.headers)
, h => {
val description =
if (h.reason.isEmpty) h.status.description
else h.reason

( h.version :: h.status :: description :: HNil, h.headers)
}
)
}

Expand Down
58 changes: 58 additions & 0 deletions http/src/test/scala/spinoco/protocol/http/codec/HttpResponseHeaderCodecSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,45 @@ object HttpResponseHeaderCodecSpec extends Properties("HttpResponseHeaderCodec")
property("Response.encode") = secure {

HttpResponseHeaderCodec.defaultCodec.encode(
HttpResponseHeader(
status = HttpStatusCode.Ok
, reason = "OK localised"
, headers = List(
Date(ZonedDateTime.parse("2009-07-27T12:28:53+00:00").toLocalDateTime)
, Server(ServerProduct(List(ProductDescription("Apache",Some("2.2.14")))))
, `Last-Modified`(ZonedDateTime.parse("2009-07-22T19:15:56+00:00").toLocalDateTime)
, `Content-Length`(88)
, `Content-Type`(ContentType.TextContent(MediaType.`text/html`, None))
, Connection(List("Closed"))
)
, version = HttpVersion.V1_1
)
).map(_.decodeAscii) ?= Attempt.successful(Right(
Seq(
"HTTP/1.1 200 OK localised"
, "Date: Mon, 27 Jul 2009 12:28:53 GMT"
, "Server: Apache/2.2.14"
, "Last-Modified: Wed, 22 Jul 2009 19:15:56 GMT"
, "Content-Length: 88"
, "Content-Type: text/html"
, "Connection: Closed"
).mkString("\r\n")
))

}

property("Response.decode.no-reason") = secure {
HttpResponseHeaderCodec.defaultCodec.decode(BitVector(
Seq(
"HTTP/1.1 200"
, "Date: Mon, 27 Jul 2009 12:28:53 GMT"
, "Server: Apache/2.2.14"
, "Last-Modified: Wed, 22 Jul 2009 19:15:56 GMT"
, "Content-Length: 88"
, "Content-Type: text/html"
, "Connection: Closed"
).mkString("\r\n").getBytes
)) ?= Attempt.successful(DecodeResult(
HttpResponseHeader(
status = HttpStatusCode.Ok
, reason = "OK"
Expand All @@ -59,6 +98,25 @@ object HttpResponseHeaderCodecSpec extends Properties("HttpResponseHeaderCodec")
)
, version = HttpVersion.V1_1
)
, BitVector.empty))
}

property("Response.encode.no-reason") = secure {

HttpResponseHeaderCodec.defaultCodec.encode(
HttpResponseHeader(
status = HttpStatusCode.Ok
, reason = ""
, headers = List(
Date(ZonedDateTime.parse("2009-07-27T12:28:53+00:00").toLocalDateTime)
, Server(ServerProduct(List(ProductDescription("Apache",Some("2.2.14")))))
, `Last-Modified`(ZonedDateTime.parse("2009-07-22T19:15:56+00:00").toLocalDateTime)
, `Content-Length`(88)
, `Content-Type`(ContentType.TextContent(MediaType.`text/html`, None))
, Connection(List("Closed"))
)
, version = HttpVersion.V1_1
)
).map(_.decodeAscii) ?= Attempt.successful(Right(
Seq(
"HTTP/1.1 200 OK"
Expand Down