Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 11:19:04 +01:00
Code Issues Projects Releases Wiki Activity

briar-headless: Inject a singleton ObjectMapper for JSON parsing

Browse Source
This commit is contained in:
Torsten Grote
2018-10-18 09:55:08 -03:00
parent 89d5145665
commit 8cf54bcedb
9 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt
View File

@@ -1,5 +1,6 @@
package org.briarproject.briar.headless
import com.fasterxml.jackson.databind.ObjectMapper
import dagger.Module
import dagger.Provides
import org.briarproject.bramble.api.crypto.CryptoComponent
@@ -113,4 +114,8 @@ internal class HeadlessModule(private val appDir: File) {
}
}
@Provides
@Singleton
internal fun provideObjectMapper() = ObjectMapper()
}

5
briar-headless/src/main/java/org/briarproject/briar/headless/Router.kt
View File

@@ -115,10 +115,9 @@ constructor(
/**
* Returns a String from the JSON field or throws [BadRequestResponse] if null or empty.
*/
fun Context.getFromJson(field: String) : String {
fun Context.getFromJson(objectMapper: ObjectMapper, field: String) : String {
try {
// TODO use a static object mapper to avoid re-initializations
val jsonNode = ObjectMapper().readTree(body())
val jsonNode = objectMapper.readTree(body())
if (!jsonNode.hasNonNull(field)) throw BadRequestResponse("'$field' missing in JSON")
val result = jsonNode.get(field).asText()
if (result == null || result.isEmpty()) throw BadRequestResponse("'$field' empty in JSON")

4
briar-headless/src/main/java/org/briarproject/briar/headless/blogs/BlogControllerImpl.kt
View File

@@ -1,5 +1,6 @@
package org.briarproject.briar.headless.blogs
import com.fasterxml.jackson.databind.ObjectMapper
import io.javalin.BadRequestResponse
import io.javalin.Context
import org.briarproject.bramble.api.identity.IdentityManager
@@ -21,6 +22,7 @@ constructor(
private val blogManager: BlogManager,
private val blogPostFactory: BlogPostFactory,
private val identityManager: IdentityManager,
private val objectMapper: ObjectMapper,
private val clock: Clock
) : BlogController {
@@ -35,7 +37,7 @@ constructor(
}
override fun createPost(ctx: Context): Context {
val text = ctx.getFromJson("text")
val text = ctx.getFromJson(objectMapper, "text")
if (utf8IsTooLong(text, MAX_BLOG_POST_TEXT_LENGTH))
throw BadRequestResponse("Blog post text is too long")

6
briar-headless/src/main/java/org/briarproject/briar/headless/forums/ForumControllerImpl.kt
View File

@@ -1,5 +1,6 @@
package org.briarproject.briar.headless.forums
import com.fasterxml.jackson.databind.ObjectMapper
import io.javalin.BadRequestResponse
import io.javalin.Context
import org.briarproject.bramble.util.StringUtils.utf8IsTooLong
@@ -14,14 +15,15 @@ import javax.inject.Singleton
@Singleton
internal class ForumControllerImpl
@Inject
constructor(private val forumManager: ForumManager) : ForumController {
constructor(private val forumManager: ForumManager, private val objectMapper: ObjectMapper) :
ForumController {
override fun list(ctx: Context): Context {
return ctx.json(forumManager.forums.output())
}
override fun create(ctx: Context): Context {
val name = ctx.getFromJson("name")
val name = ctx.getFromJson(objectMapper, "name")
if (utf8IsTooLong(name, MAX_FORUM_NAME_LENGTH))
throw BadRequestResponse("Forum name is too long")
return ctx.json(forumManager.addForum(name).output())

4
briar-headless/src/main/java/org/briarproject/briar/headless/messaging/MessagingControllerImpl.kt
View File

@@ -1,5 +1,6 @@
package org.briarproject.briar.headless.messaging
import com.fasterxml.jackson.databind.ObjectMapper
import io.javalin.BadRequestResponse
import io.javalin.Context
import io.javalin.NotFoundResponse
@@ -45,6 +46,7 @@ constructor(
private val contactManager: ContactManager,
private val webSocketController: WebSocketController,
@DatabaseExecutor private val dbExecutor: Executor,
private val objectMapper: ObjectMapper,
private val clock: Clock
) : MessagingController, EventListener {
@@ -60,7 +62,7 @@ constructor(
override fun write(ctx: Context): Context {
val contact = getContact(ctx)
val message = ctx.getFromJson("text")
val message = ctx.getFromJson(objectMapper, "text")
if (utf8IsTooLong(message, MAX_PRIVATE_MESSAGE_TEXT_LENGTH))
throw BadRequestResponse("Message text is too long")