nikola/pairgoth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Importing json should tolerate a BOM

Browse Source
This commit is contained in:
Claude Brisson
2024-04-11 13:14:11 +02:00
parent bb5e13709d
commit c9be8b6d76
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
view-webapp/src/main/kotlin/org/jeudego/pairgoth/web/ImportServlet.kt
View File

@@ -1,9 +1,12 @@
package org.jeudego.pairgoth.web package org.jeudego.pairgoth.web
import com.republicate.kson.Json import com.republicate.kson.Json
import org.apache.commons.io.input.BOMInputStream
import org.jeudego.pairgoth.util.Upload import org.jeudego.pairgoth.util.Upload
import org.jeudego.pairgoth.view.ApiTool import org.jeudego.pairgoth.view.ApiTool
import org.jeudego.pairgoth.view.PairgothTool.Companion.EXAMPLES_DIRECTORY import org.jeudego.pairgoth.view.PairgothTool.Companion.EXAMPLES_DIRECTORY
import java.io.ByteArrayInputStream
import java.io.InputStreamReader
import java.nio.charset.StandardCharsets import java.nio.charset.StandardCharsets
import javax.servlet.http.HttpServlet import javax.servlet.http.HttpServlet
import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletRequest
@@ -23,7 +26,8 @@ class ImportServlet: HttpServlet() {
val bytes = uploads.first().second val bytes = uploads.first().second
var apiResp: Json? = null var apiResp: Json? = null
if (name.endsWith(".tour")) { if (name.endsWith(".tour")) {
val json = Json.parse(bytes.toString(StandardCharsets.UTF_8)) val content = InputStreamReader(BOMInputStream(ByteArrayInputStream(bytes)), StandardCharsets.UTF_8).readText()
val json = Json.parse(content)
if (json == null || !json.isObject) { if (json == null || !json.isObject) {
resp.sendError(HttpServletResponse.SC_BAD_REQUEST) resp.sendError(HttpServletResponse.SC_BAD_REQUEST)
} else { } else {