You should still be able to open the input stream after XML/JSON pars…

…ing fails.
rackerlabs · Jun 7, 2016 · 673e9d6 · 673e9d6
1 parent 36af5bd
commit 673e9d6
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 2 deletions.
diff --git a/.../main/scala/com/rackspace/com/papi/components/checker/servlet/CheckerServletRequest.scala b/.../main/scala/com/rackspace/com/papi/components/checker/servlet/CheckerServletRequest.scala
@@ -70,6 +70,12 @@ class CheckerServletRequest(val request : HttpServletRequest) extends HttpServle
                          Array[String]()
   }
 
+  private var clearInput = false
+
+  def clearInputStream : Unit = {
+    clearInput = true
+  }
+
   def pathToSegment(uriLevel : Int) : String = {
     "/" + URISegment.slice(0, uriLevel).reduceLeft( _ + "/" +_ )
   }
@@ -154,7 +160,9 @@ class CheckerServletRequest(val request : HttpServletRequest) extends HttpServle
   }
 
   override def getInputStream : ServletInputStream = {
-    if (parsedXML != null) {
+    if (clearInput) {
+      new ByteArrayServletInputStream(Array[Byte]())
+    } else if (parsedXML != null) {
       var transformer : Transformer = null
       val bout = new ByteArrayOutputStream()
       try {
@@ -185,7 +193,9 @@ class CheckerServletRequest(val request : HttpServletRequest) extends HttpServle
   }
 
   override def getReader : BufferedReader = {
-    if (parsedXML != null) {
+    if (clearInput) {
+      new BufferedReader(new InputStreamReader (getInputStream, "UTF-8"))
+    } else if (parsedXML != null) {
       new BufferedReader(new InputStreamReader (getInputStream, parsedXML.getInputEncoding))
     } else if (parsedJSON != null) {
       new BufferedReader(new InputStreamReader (getInputStream, "UTF-8"))

diff --git a/core/src/main/scala/com/rackspace/com/papi/components/checker/step/WellFormedJSON.scala b/core/src/main/scala/com/rackspace/com/papi/components/checker/step/WellFormedJSON.scala
@@ -38,6 +38,7 @@ class WellFormedJSON(id : String, label : String, val priority : Long, next : Ar
     } catch {
       case e : Exception => req.contentError = e
                             req.contentErrorPriority = priority
+                            req.clearInputStream
     } finally {
       if (parser != null) returnParser(parser)
     }

diff --git a/core/src/main/scala/com/rackspace/com/papi/components/checker/step/WellFormedXML.scala b/core/src/main/scala/com/rackspace/com/papi/components/checker/step/WellFormedXML.scala
@@ -41,6 +41,7 @@ class WellFormedXML(id : String, label : String, val priority : Long, next : Arr
     }catch {
       case e : Exception => req.contentError = e
                             req.contentErrorPriority = priority
+                            req.clearInputStream
     }
     finally {
       if (parser != null) returnParser(parser)

diff --git a/core/src/test/scala/com/rackspace/com/papi/components/checker/step/StepSuite.scala b/core/src/test/scala/com/rackspace/com/papi/components/checker/step/StepSuite.scala
@@ -636,6 +636,21 @@ class StepSuite extends BaseStepSuite with MockitoSugar {
     assert (req1.contentErrorPriority == 150)
   }
 
+  test("In a WellFormedXML step, if the content is not well formed XML, you should still be able to open the input stream") {
+    val wfx = new WellFormedXML("WFXML", "WFXML", 150, Array[Step]())
+    val req1 = request("PUT", "/a/b", "application/xml", """<validXML xmlns='http://valid'>""")
+
+    wfx.checkStep (req1, response, chain, 0)
+    assert (req1.getInputStream.available == 0)
+    assert (req1.getInputStream.read == -1)
+
+    val req2 = request("PUT", "/a/b", "application/xml", """{ \"bla\" : 55 }""")
+
+    wfx.checkStep (req2, response, chain, 1)
+    assert (req2.getInputStream.available == 0)
+    assert (req2.getInputStream.read == -1)
+  }
+
   test("In a WellFormedXML step, XML in the same request should not be parsed twice") {
     val wfx = new WellFormedXML("WFXML", "WFXML", 10, Array[Step]())
     val req1 = request("PUT", "/a/b", "application/xml", <validXML xmlns="http://valid"/>)
@@ -793,6 +808,20 @@ class StepSuite extends BaseStepSuite with MockitoSugar {
     assert (req2.contentError.isInstanceOf[JsonParseException])
   }
 
+  test("In a WellFormedJSON step, if the content contains JSON that is not well-formed, you should still be able to access the input stream") {
+    val wfj = new WellFormedJSON("WFJSON", "WFJSON", 10, Array[Step]())
+    val req1 = request("PUT", "/a/b", "application/json", """ { "valid" : ture } """)
+    wfj.checkStep (req1, response, chain, 0)
+    assert (req1.getInputStream.available == 0)
+    assert (req1.getInputStream.read == -1)
+
+    val req2 = request("PUT", "/a/b", "application/json", """ <json /> """)
+    wfj.checkStep (req2, response, chain, 1)
+    assert (req2.getInputStream.available == 0)
+    assert (req2.getInputStream.read == -1)
+  }
+
+
   test("In a WellFormedJSON step, if the content contains JSON that is not well-formed, then the request should contain the correct contentErrorPriority") {
     val wfj = new WellFormedJSON("WFJSON", "WFJSON", 1000, Array[Step]())
     val req1 = request("PUT", "/a/b", "application/json", """ { "valid" : ture } """)