fix: use 400 instead of 500 for invalid input in fulltext search (DEV…

…-1829) (#2557)
dasch-swiss · Apr 6, 2023 · 51acceb · 51acceb
1 parent f94bb82
commit 51acceb
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/webapi/src/it/scala/org/knora/webapi/responders/v2/SearchResponderV2Spec.scala b/webapi/src/it/scala/org/knora/webapi/responders/v2/SearchResponderV2Spec.scala
@@ -21,6 +21,7 @@ import org.knora.webapi.messages.v2.responder.valuemessages.ReadValueV2
 import org.knora.webapi.messages.v2.responder.valuemessages.StillImageFileValueContentV2
 import org.knora.webapi.responders.v2.ResourcesResponseCheckerV2.compareReadResourcesSequenceV2Response
 import org.knora.webapi.sharedtestdata.SharedTestDataADM
+import dsp.errors.BadRequestException
 
 /**
  * Tests [[SearchResponderV2]].
@@ -80,6 +81,26 @@ class SearchResponderV2Spec extends CoreSpec with ImplicitSender {
 
     }
 
+    "return a Bad Request error if fulltext search input is invalid" in {
+
+      appActor ! FulltextSearchRequestV2(
+        searchValue = "qin(",
+        offset = 0,
+        limitToProject = None,
+        limitToResourceClass = None,
+        limitToStandoffClass = None,
+        returnFiles = false,
+        targetSchema = ApiV2Complex,
+        schemaOptions = SchemaOptions.ForStandoffWithTextValues,
+        requestingUser = SharedTestDataADM.anythingUser1
+      )
+
+      expectMsgPF(timeout) { case msg: akka.actor.Status.Failure =>
+        assert(msg.cause.isInstanceOf[BadRequestException])
+      }
+
+    }
+
     "return files attached to full-text search results" in {
 
       appActor ! FulltextSearchRequestV2(

diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/impl/TriplestoreServiceLive.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/impl/TriplestoreServiceLive.scala
@@ -164,7 +164,6 @@ case class TriplestoreServiceLive(
     for {
       resultStr <-
         getSparqlHttpResponse(sparql, isUpdate = false, simulateTimeout = simulateTimeout, isGravsearch = isGravsearch)
-
       // Parse the response as a JSON object and generate a response message.
       responseMessage <- parseJsonResponse(sparql, resultStr)
     } yield responseMessage
@@ -681,9 +680,7 @@ case class TriplestoreServiceLive(
     acceptMimeType: String = mimeTypeApplicationSparqlResultsJson,
     simulateTimeout: Boolean = false
   ): Task[String] = {
-
     val httpClient = ZIO.attempt(queryHttpClient)
-
     val httpPost = ZIO.attempt {
       if (isUpdate) {
         // Send updates as application/sparql-update (as per SPARQL 1.1 Protocol §3.2.2, "UPDATE using POST directly").
@@ -882,6 +879,8 @@ case class TriplestoreServiceLive(
 
         (statusCode, entity) match {
           case (404, _) => ZIO.fail(NotFoundException.notFound)
+          case (500, Some(response)) if response.contains("Text search parse error") =>
+            ZIO.fail(BadRequestException(s"$response"))
           case (500, _) => ZIO.fail(TriplestoreResponseException(statusResponseMsg))
           case (503, Some(response)) if response.contains("Query timed out") =>
             ZIO.fail(TriplestoreTimeoutException(s"$statusResponseMsg: $response"))