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

Ensure the use SecureRandom when creating authentication token

Browse Source
This commit is contained in:
Torsten Grote
2018-09-20 16:49:01 -03:00
parent 8d55911dab
commit 4b5e9bd64f
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,7 @@ import org.briarproject.bramble.account.AccountModule
import org.briarproject.bramble.system.DesktopSecureRandomModule
import org.briarproject.briar.BriarCoreEagerSingletons
import org.briarproject.briar.BriarCoreModule
import java.security.SecureRandom
import javax.inject.Singleton
@Component(
@@ -20,5 +21,7 @@ import javax.inject.Singleton
)
@Singleton
internal interface BriarHeadlessApp : BrambleCoreEagerSingletons, BriarCoreEagerSingletons {
fun router(): Router
fun getRouter(): Router
fun getSecureRandom(): SecureRandom
}

20
briar-headless/src/main/java/org/briarproject/briar/headless/Main.kt
View File

@@ -9,6 +9,7 @@ import com.github.ajalt.clikt.parameters.types.int
import org.briarproject.bramble.BrambleCoreModule
import org.briarproject.briar.BriarCoreModule
import org.slf4j.impl.SimpleLogger.DEFAULT_LOG_LEVEL_KEY
import org.spongycastle.util.encoders.Base64.toBase64String
import java.io.File
import java.io.File.separator
import java.io.IOException
@@ -17,7 +18,7 @@ import java.lang.System.setProperty
import java.nio.file.Files.setPosixFilePermissions
import java.nio.file.attribute.PosixFilePermission
import java.nio.file.attribute.PosixFilePermission.*
import java.util.UUID.randomUUID
import java.security.SecureRandom
import java.util.logging.Level.*
import java.util.logging.LogManager
@@ -65,8 +66,6 @@ private class Main : CliktCommand(
LogManager.getLogManager().getLogger("").level = level
val dataDir = getDataDir()
val authToken = getOrCreateAuthToken(dataDir)
val app =
DaggerBriarHeadlessApp.builder().headlessModule(HeadlessModule(dataDir)).build()
// We need to load the eager singletons directly after making the
@@ -74,7 +73,9 @@ private class Main : CliktCommand(
BrambleCoreModule.initEagerSingletons(app)
BriarCoreModule.initEagerSingletons(app)
app.router().start(authToken, port, debug)
val authToken = getOrCreateAuthToken(dataDir, app.getSecureRandom())
app.getRouter().start(authToken, port, debug)
}
private fun getDataDir(): File {
@@ -92,18 +93,23 @@ private class Main : CliktCommand(
return file
}
private fun getOrCreateAuthToken(dataDir: File): String {
private fun getOrCreateAuthToken(dataDir: File, secureRandom: SecureRandom): String {
val tokenFile = File(dataDir, "auth_token")
return if (tokenFile.isFile) {
tokenFile.readText()
} else {
// TODO use better way of getting random token?
val authToken = randomUUID().toString()
val authToken = createAuthToken(secureRandom)
tokenFile.writeText(authToken)
authToken
}
}
private fun createAuthToken(secureRandom: SecureRandom): String {
val bytes = ByteArray(32)
secureRandom.nextBytes(bytes)
return toBase64String(bytes)
}
}
fun main(args: Array<String>) = Main().main(args)