Skip to content

Return not acceptable when failing to parse media type #24

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
Jun 13, 2019
Merged

Return not acceptable when failing to parse media type #24

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
fff9601
Return not acceptable when failing to parse media type
mduesterhoeft Jun 13, 2019
8f0d460
Update router/src/test/kotlin/io/moia/router/RequestHandlerTest.kt
mduesterhoeft Jun 13, 2019
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
9 changes: 8 additions & 1 deletion router/src/main/kotlin/io/moia/router/APIGatewayProxyEventExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ fun APIGatewayProxyRequestEvent.acceptHeader() = getHeaderCaseInsensitive("accep
fun APIGatewayProxyRequestEvent.acceptedMediaTypes() = acceptHeader()
?.split(",")
?.map { it.trim() }
?.map { MediaType.parse(it) }
?.mapNotNull { parseMediaTypeSafe(it) }
.orEmpty()
fun APIGatewayProxyRequestEvent.contentType() = getHeaderCaseInsensitive("content-type")

Expand Down Expand Up @@ -68,3 +68,10 @@ private fun getCaseInsensitive(key: String, map: Map<String, String>?): String?
?.value

fun APIGatewayProxyResponseEvent.bodyAsBytes() = Base64.getDecoder().decode(body)

private fun parseMediaTypeSafe(input: String): MediaType? =
try {
MediaType.parse(input)
} catch (e: IllegalArgumentException) {
null
}
15 changes: 15 additions & 0 deletions router/src/test/kotlin/io/moia/router/RequestHandlerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,21 @@ class RequestHandlerTest {
assert(response.body).isEqualTo("""{"greeting":"some"}""")
}

@Test
fun `should fail with 406 Not Acceptable on an unparsable media type`() {

val response = testRequestHandler.handleRequest(
POST("/some")
.withHeaders(mapOf(
"Accept" to "*",
"Content-Type" to "application/json"
))
.withBody("""{ "greeting": "some" }"""), mockk()
)

assert(response.statusCode).isEqualTo(406)
}

@Test
fun `should match request requiring permission`() {

Expand Down