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

Merge remote-tracking branch 'remotes/open/master' into feature/vkolomeyko/ent-master-merge

Browse Source 
# Conflicts:
#	node/src/integration-test/kotlin/net/corda/node/modes/draining/FlowsDrainingModeContentionTest.kt
#	node/src/integration-test/kotlin/net/corda/node/persistence/NodeStatePersistenceTests.kt
This commit is contained in:
Viktor Kolomeyko
2018-04-05 13:12:13 +01:00
parent 2543bb356e 54db391e3c
commit 375b4638ba
8 changed files with 65 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
node-api/src/test/kotlin/net/corda/nodeapi/internal/SignedNodeInfoTest.kt
View File

@ -10,7 +10,14 @@
package net.corda.nodeapi.internal
import net.corda.core.crypto.CompositeKey
import net.corda.core.crypto.Crypto
import net.corda.core.identity.CordaX500Name
import net.corda.core.identity.PartyAndCertificate
import net.corda.core.node.NodeInfo
import net.corda.core.utilities.NetworkHostAndPort
import net.corda.nodeapi.internal.crypto.CertificateType
import net.corda.nodeapi.internal.crypto.X509Utilities
import net.corda.testing.core.ALICE_NAME
import net.corda.testing.core.BOB_NAME
import net.corda.testing.core.SerializationEnvironmentRule
@ -20,6 +27,9 @@ import org.assertj.core.api.Assertions.assertThat
import org.assertj.core.api.Assertions.assertThatThrownBy
import org.junit.Rule
import org.junit.Test
import java.security.KeyPair
import java.security.PrivateKey
import java.security.PublicKey
import java.security.SignatureException
class SignedNodeInfoTest {
@ -55,6 +65,19 @@ class SignedNodeInfoTest {
.hasMessageContaining("Missing signatures")
}
@Test
fun `verifying composite keys only`() {
val aliceKeyPair = generateKeyPair()
val bobKeyPair = generateKeyPair()
val identityKeyPair = generateKeyPair()
val compositeKey = CompositeKey.Builder().addKeys(aliceKeyPair.public, bobKeyPair.public).build(threshold = 1)
val nodeInfo = createNodeInfoWithSingleIdentity(ALICE_NAME, aliceKeyPair, compositeKey)
val signedNodeInfo = nodeInfo.signWith(listOf(identityKeyPair.private))
assertThatThrownBy { signedNodeInfo.verified() }
.isInstanceOf(IllegalArgumentException::class.java)
.hasMessageContaining("At least one identity with a non-composite key needs to be specified.")
}
@Test
fun `verifying extra signature`() {
val (_, aliceKey) = nodeInfoBuilder.addIdentity(ALICE_NAME)
@ -87,4 +110,26 @@ class SignedNodeInfoTest {
}
private fun generateKeyPair() = Crypto.generateKeyPair()
private fun createNodeInfoWithSingleIdentity(name: CordaX500Name, nodeKeyPair: KeyPair, identityCertPublicKey: PublicKey): NodeInfo {
val nodeCertificateAndKeyPair = createDevNodeCa(DEV_INTERMEDIATE_CA, name, nodeKeyPair)
val identityCert = X509Utilities.createCertificate(
CertificateType.LEGAL_IDENTITY,
nodeCertificateAndKeyPair.certificate,
nodeCertificateAndKeyPair.keyPair,
nodeCertificateAndKeyPair.certificate.subjectX500Principal,
identityCertPublicKey)
val certPath = X509Utilities.buildCertPath(
identityCert,
nodeCertificateAndKeyPair.certificate,
DEV_INTERMEDIATE_CA.certificate,
DEV_ROOT_CA.certificate)
val partyAndCertificate = PartyAndCertificate(certPath)
return NodeInfo(
listOf(NetworkHostAndPort("my.${partyAndCertificate.party.name.organisation}.com", 1234)),
listOf(partyAndCertificate),
1,
1
)
}
}