Fix Java runtime version and test endpoints

Co-authored-by: hrj <345879+hrj@users.noreply.github.com>

Author: google-labs-jules[bot]

.github/workflows/ci.yml

@@ -12,10 +12,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.11
+    - name: Set up JDK 17
       uses: actions/setup-java@v1
       with:
-        java-version: 1.11
+        java-version: 17
     - uses: sbt/setup-sbt@v1
     - name: Run tests
       run: sbt test assembly

.github/workflows/docker-latest.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 1.16
+          java-version: 17
 
       - uses: sbt/setup-sbt@v1
 

.travis.yml

@@ -1,5 +1,5 @@
 language: scala
-jdk: openjdk11
+jdk: openjdk17
 scala:
         - 2.13.2
 script:

src/main/scala/lc/server/Server.scala

@@ -31,12 +31,15 @@ class Server(
     .POST(
       "/v2/captcha",
       (request) => {
-        val paramEither = Parameters.codec.decode(ByteBuffer.wrap(request.getBodyString().getBytes("UTF-8")))
-        val id = paramEither match {
-          case Right(param) => captchaManager.getChallenge(param)
-          case Left(err) => Left(Error("Invalid parameters: " + err.toString))
+        val bodyStr = request.getBodyString().trim.replaceAll("\u0000", "")
+        val paramEither = Parameters.codec.decode(ByteBuffer.wrap(bodyStr.getBytes("UTF-8")))
+        paramEither match {
+          case Right(param) =>
+            val id = captchaManager.getChallenge(param)
+            getResponse(id, headerMap)
+          case Left(err) =>
+            getResponse(Left(Error("Invalid parameters: " + err.toString)), headerMap)
         }
-        getResponse(id, headerMap)
       }
     )
     .GET(
@@ -56,12 +59,15 @@ class Server(
     .POST(
       "/v2/answer",
       (request) => {
-        val answerEither = Answer.codec.decode(ByteBuffer.wrap(request.getBodyString().getBytes("UTF-8")))
-        val result = answerEither match {
-          case Right(answer) => captchaManager.checkAnswer(answer)
-          case Left(err) => Left(Error("Invalid answer format: " + err.toString))
+        val bodyStr = request.getBodyString().trim.replaceAll("\u0000", "")
+        val answerEither = Answer.codec.decode(ByteBuffer.wrap(bodyStr.getBytes("UTF-8")))
+        answerEither match {
+          case Right(answer) =>
+            val result = captchaManager.checkAnswer(answer)
+            getResponse(result, headerMap)
+          case Left(err) =>
+            getResponse(Left(Error("Invalid answer format: " + err.toString)), headerMap)
         }
-        getResponse(result, headerMap)
       }
     )
   if (playgroundEnabled) {

test-zio.scala

@@ -24,15 +24,15 @@ class QuickStartUser(SequentialTaskSet):
     def captcha(self):
         captcha_params = {"level":"debug","media":"image/png","input_type":"text", "size":"350x100"}
 
-        with self.client.post(path="/v2/captcha", json=captcha_params, name="/captcha", catch_response = True) as resp:
+        with self.client.post(url="/v2/captcha", json=captcha_params, name="/captcha", catch_response = True) as resp:
           if resp.status_code != 200:
             resp.failure("Status was not 200: " + resp.text)
           captchaJson = resp.json()
           uuid = captchaJson.get("id")
           if not uuid:
             resp.failure("uuid not returned on /captcha endpoint: " + resp.text)
 
-        with self.client.get(path="/v2/media?id=%s" % uuid, name="/media", stream=True, catch_response = True) as resp:
+        with self.client.get(url="/v2/media?id=%s" % uuid, name="/media", stream=True, catch_response = True) as resp:
           if resp.status_code != 200:
             resp.failure("Status was not 200: " + resp.text)
 
@@ -41,7 +41,7 @@ def captcha(self):
         ocrAnswer = self.solve(uuid, media)
 
         answerBody = {"answer": ocrAnswer,"id": uuid}
-        with self.client.post(path='/v2/answer', json=answerBody, name="/answer", catch_response=True) as resp:
+        with self.client.post(url='/v2/answer', json=answerBody, name="/answer", catch_response=True) as resp:
           if resp.status_code != 200:
               resp.failure("Status was not 200: " + resp.text)
           else:

tests/locustfile-functional.py

@@ -26,7 +26,7 @@ def captcha(self):
         # TODO: Iterate over parameters for a more comprehensive test
         captcha_params = {"level":"easy","media":"image/png","input_type":"text", "size":"350x100"}
 
-        resp = self.client.post(path="/v2/captcha", json=captcha_params, name="/captcha")
+        resp = self.client.post(url="/v2/captcha", json=captcha_params, name="/captcha")
         if resp.status_code != 200:
             print("\nError on /captcha endpoint: ")
             print(resp)
@@ -36,14 +36,14 @@ def captcha(self):
         uuid = json.loads(resp.text).get("id")
         answerBody = {"answer": "qwer123","id": uuid}
 
-        resp = self.client.get(path="/v2/media?id=%s" % uuid, name="/media")
+        resp = self.client.get(url="/v2/media?id=%s" % uuid, name="/media")
         if resp.status_code != 200:
             print("\nError on /media endpoint: ")
             print(resp)
             print(resp.text)
             print("----------------END.MEDIA-------------------\n\n")
 
-        resp = self.client.post(path='/v2/answer', json=answerBody, name="/answer")
+        resp = self.client.post(url='/v2/answer', json=answerBody, name="/answer")
         if resp.status_code != 200:
             print("\nError on /answer endpoint: ")
             print(resp)