rabbah commented on a change in pull request #2717: Ensure that base64 encoded
'+json' bodies are accepted and decoded.
URL:
https://github.com/apache/incubator-openwhisk/pull/2717#discussion_r138668531
##########
File path:
core/controller/src/main/scala/whisk/core/controller/WebActions.scala
##########
@@ -264,37 +264,50 @@ protected[core] object WhiskWebActionsApi extends
Directives {
}
/**
- * Finds the content-type in the header list and maps it to a known media
type. If it is not
- * recognized, construct a failure with appropriate message.
+ * Finds the content-type in the header list and ensures that it is a valid
format. If it is not
+ * valid, construct a failure with appropriate message.
+ * If the content-type header is missing, then return the supplied
defaultType
*/
private def findContentTypeInHeader(headers: List[RawHeader],
transid: TransactionId,
defaultType: MediaType): Try[MediaType]
= {
headers.find(_.lowercaseName == `Content-Type`.lowercaseName) match {
case Some(header) =>
MediaType.parse(header.value) match {
- case Right(mediaType: MediaType) =>
- // lookup the media type specified in the content header to see if
it is a recognized type
- MediaTypes.getForKey(mediaType.mainType ->
mediaType.subType).map(Success(_)).getOrElse {
- // this is a content-type that is not recognized, reject it
- Failure(RejectRequest(BadRequest,
Messages.httpUnknownContentType)(transid))
- }
- case _ => Failure(RejectRequest(BadRequest,
Messages.httpUnknownContentType)(transid))
+ case Right(mediaType: MediaType) => Success(mediaType)
+ case _ =>
Failure(RejectRequest(BadRequest, Messages.httpUnknownContentType)(transid))
}
case None => Success(defaultType)
}
}
+ private def isJsonFamily(mt: MediaType) = {
+ mt == `application/json` || mt.value.endsWith("+json")
+ }
+
private def interpretHttpResponseAsJson(code: StatusCode,
headers: List[RawHeader],
js: JsValue,
transid: TransactionId) = {
findContentTypeInHeader(headers, transid, `application/json`) match {
- case Success(mediaType) if (mediaType == `application/json`) =>
+ // use the default akka-http response marshaler for standard
application/json
+ case Success(mediaType) if mediaType == `application/json` =>
respondWithHeaders(removeContentTypeHeader(headers)) {
complete(code, js)
}
+ // for all other json-family content-type, explicitly marshal the
response;
+ // the order of the case statement matters; isJsonFamily returns true
for application/json
+ case Success(mediaType) if isJsonFamily(mediaType) =>
Review comment:
see my comment above - also this method is used elsewhere where both types
are plausible.
"use the default akka-http response marshaler for standard application/json'
i debated collapsing both case matches but decided it was cleaner this way -
i'm receptive to input.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
