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

htp #19681 MalformedRequestContentRejection cause traceability (#20346)

Browse source 
* improved cause tracking for MalformedRequestContentRejection
* unwrapping RejectionErrors when unmarshalling
* amended old project name in CONTRIBUTING.md
This commit is contained in:
Stefano Bonetti 2016-05-06 10:19:01 +01:00 • committed by Konrad Malawski
parent 92a08ab1d0
commit 7d40c1d8d4
5 changed files with 27 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CONTRIBUTING.md
View file

@ -59,7 +59,7 @@ The Akka build includes a special task called `validatePullRequest` which invest
then running tests only on those projects.
For example changing something in `akka-http-core` would cause tests to be run in all projects which depend on it
(e.g. `akka-http-core-tests`, `akka-http-marshallers-*`, `akka-docs` etc.).
(e.g. `akka-http-tests`, `akka-http-marshallers-*`, `akka-docs` etc.).
To use the task simply type, and the output should include entries like shown below:

24
akka-http-tests/src/test/scala/akka/http/scaladsl/server/directives/MarshallingDirectivesSpec.scala
View file

@ -16,6 +16,9 @@ import spray.json.DefaultJsonProtocol._
import MediaTypes._
import HttpCharsets._
import headers._
import org.xml.sax.SAXParseException
import scala.util.{ Failure, Try }
class MarshallingDirectivesSpec extends RoutingSpec with Inside {
import ScalaXmlSupport._
@ -26,6 +29,12 @@ class MarshallingDirectivesSpec extends RoutingSpec with Inside {
case NodeSeq.Empty ⇒ throw Unmarshaller.NoContentException
case x ⇒ { val i = x.text.toInt; require(i >= 0); i }
}
implicit val TryIntUnmarshaller: FromEntityUnmarshaller[Try[Int]] =
IntUnmarshaller map {
Try(_).recoverWith {
case e: IllegalArgumentException ⇒ Failure(RejectionError(ValidationRejection(e.getMessage, Option(e))))
}
}
val `text/xxml` = MediaType.customWithFixedCharset("text", "xxml", `UTF-8`)
implicit val IntMarshaller: ToEntityMarshaller[Int] =
@ -71,12 +80,23 @@ class MarshallingDirectivesSpec extends RoutingSpec with Inside {
}
}
}
"unwrap a RejectionError and return its exception" in {
Put("/", HttpEntity(ContentType(`text/xml`, iso88592), "<int>-3</int>")) ~> {
entity(as[Try[Int]]) { _ ⇒ completeOk }
} ~> check {
inside(rejection) {
case ValidationRejection("requirement failed", Some(_: IllegalArgumentException)) ⇒
}
}
}
"return a MalformedRequestContentRejection if unmarshalling failed due to a not further classified error" in {
Put("/", HttpEntity(ContentTypes.`text/xml(UTF-8)`, "<foo attr='illegal xml'")) ~> {
entity(as[NodeSeq]) { _ ⇒ completeOk }
} ~> check {
rejection shouldEqual MalformedRequestContentRejection(
"XML document structures must start and end within the same entity.", None)
inside(rejection) {
case MalformedRequestContentRejection(
"XML document structures must start and end within the same entity.", _: SAXParseException) ⇒
}
}
}
"extract an Option[T] from the requests entity using the in-scope Unmarshaller" in {

2
akka-http/src/main/scala/akka/http/impl/server/RejectionHandlerWrapper.scala
View file

@ -48,7 +48,7 @@ private[http] class RejectionHandlerWrapper(javaHandler: server.RejectionHandler
case TooManyRangesRejection(maxRanges) ⇒
handleTooManyRangesRejection(ctx, maxRanges)
case MalformedRequestContentRejection(message, cause) ⇒
handleMalformedRequestContentRejection(ctx, message, cause.orNull)
handleMalformedRequestContentRejection(ctx, message, cause)
case RequestEntityExpectedRejection ⇒
handleRequestEntityExpectedRejection(ctx)
case UnacceptedResponseContentTypeRejection(supported) ⇒

2
akka-http/src/main/scala/akka/http/scaladsl/server/Rejection.scala
View file

@ -99,7 +99,7 @@ case class TooManyRangesRejection(maxRanges: Int) extends Rejection
* Note that semantic issues with the request content (e.g. because some parameter was out of range)
* will usually trigger a `ValidationRejection` instead.
*/
case class MalformedRequestContentRejection(message: String, cause: Option[Throwable] = None) extends Rejection
case class MalformedRequestContentRejection(message: String, cause: Throwable) extends Rejection
/**
* Rejection created by unmarshallers.

3
akka-http/src/main/scala/akka/http/scaladsl/server/directives/MarshallingDirectives.scala
View file

@ -33,10 +33,11 @@ trait MarshallingDirectives {
import ctx.materializer
onComplete(um(ctx.request)) flatMap {
case Success(value) ⇒ provide(value)
case Failure(RejectionError(r)) ⇒ reject(r)
case Failure(Unmarshaller.NoContentException) ⇒ reject(RequestEntityExpectedRejection)
case Failure(Unmarshaller.UnsupportedContentTypeException(x)) ⇒ reject(UnsupportedRequestContentTypeRejection(x))
case Failure(x: IllegalArgumentException) ⇒ reject(ValidationRejection(x.getMessage.nullAsEmpty, Some(x)))
case Failure(x) ⇒ reject(MalformedRequestContentRejection(x.getMessage.nullAsEmpty, Option(x.getCause)))
case Failure(x) ⇒ reject(MalformedRequestContentRejection(x.getMessage.nullAsEmpty, x))
}
} & cancelRejections(RequestEntityExpectedRejection.getClass, classOf[UnsupportedRequestContentTypeRejection])