ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-23 09:25:36 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixing the HSM service config overriding issue (#274)

Browse Source 
* Fixing the HSM service config overriding issue

* Addressing review comments
This commit is contained in:
Michal Kit
2018-01-03 11:26:45 +00:00
committed by GitHub
parent 62dbf3651d
commit e9c2090832
5 changed files with 18 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
network-management/src/test/kotlin/com/r3/corda/networkmanage/doorman/DoormanParametersTest.kt
View File

@ -25,7 +25,7 @@ class DoormanParametersTest {
@Test
fun `should fail when config file is missing`() {
val message = assertFailsWith<IllegalStateException> {
val message = assertFailsWith<IllegalArgumentException> {
parseParameters("--config-file", "not-existing-file")
}.message
assertThat(message).contains("Config file ")

25
network-management/src/test/kotlin/com/r3/corda/networkmanage/hsm/configuration/ConfigurationTest.kt
View File

@ -3,6 +3,7 @@ package com.r3.corda.networkmanage.hsm.configuration
import com.r3.corda.networkmanage.TestBase
import com.r3.corda.networkmanage.hsm.authentication.AuthMode
import com.typesafe.config.ConfigException
import org.assertj.core.api.Assertions
import org.junit.Test
import java.io.File
import kotlin.test.assertEquals
@ -13,18 +14,10 @@ class ConfigurationTest : TestBase() {
private val invalidConfigPath = File(javaClass.getResource("/hsm_fail.conf").toURI()).absolutePath
@Test
fun `authMode is parsed correctly`() {
val paramsWithPassword = parseParameters("--configFile", validConfigPath, "--authMode", AuthMode.CARD_READER.name)
assertEquals(AuthMode.CARD_READER, paramsWithPassword.authMode)
val paramsWithCardReader = parseParameters("--configFile", validConfigPath, "--authMode", AuthMode.PASSWORD.name)
assertEquals(AuthMode.PASSWORD, paramsWithCardReader.authMode)
}
@Test
fun `validDays duration is parsed correctly`() {
val expectedDuration = 360
val paramsWithPassword = parseParameters("--configFile", validConfigPath, "--validDays", expectedDuration.toString())
assertEquals(expectedDuration, paramsWithPassword.validDays)
fun `config file is parsed correctly`() {
val paramsWithPassword = parseParameters("--configFile", validConfigPath)
assertEquals(AuthMode.PASSWORD, paramsWithPassword.authMode)
assertEquals("3001@192.168.0.1", paramsWithPassword.device)
}
@Test
@ -34,4 +27,12 @@ class ConfigurationTest : TestBase() {
parseParameters("--configFile", invalidConfigPath)
}
}
@Test
fun `should fail when config file is missing`() {
val message = assertFailsWith<IllegalArgumentException> {
com.r3.corda.networkmanage.doorman.parseParameters("--config-file", "not-existing-file")
}.message
Assertions.assertThat(message).contains("Config file ")
}
}

2
network-management/src/test/resources/hsm.conf
View File

@ -1,4 +1,4 @@
device = "3001@127.0.0.1"
device = "3001@192.168.0.1"
keyGroup = "DEV.DOORMAN"
keySpecifier = -1
authMode = PASSWORD