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

Use signing key instead of name to identify parties in IRS

Browse Source 
The IRS demo uses names of parties to identify them in flows, which introduces problems when a node may not
know who a party is, as well as being a poor choice of key generally. This switches to use the owning key
instead.
This commit is contained in:
Ross Nicoll 2016-11-25 11:44:24 +00:00 committed by Ross Nicoll
parent d376a902ad
commit 3572b78372
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
samples/irs-demo/src/main/kotlin/net/corda/irs/flows/FixingFlow.kt
View File

@ -47,9 +47,8 @@ object FixingFlow {
// validate the party that initiated is the one on the deal and that the recipient corresponds with it. // validate the party that initiated is the one on the deal and that the recipient corresponds with it.
// TODO: this is in no way secure and will be replaced by general session initiation logic in the future // TODO: this is in no way secure and will be replaced by general session initiation logic in the future
val myName = serviceHub.myInfo.legalIdentity.name
// Also check we are one of the parties // Also check we are one of the parties
deal.parties.filter { it.name == myName }.single() require(deal.parties.count { it.owningKey == serviceHub.myInfo.legalIdentity.owningKey } == 1)
return handshake return handshake
} }
@ -60,8 +59,7 @@ object FixingFlow {
val fixOf = deal.nextFixingOf()!! val fixOf = deal.nextFixingOf()!!
// TODO Do we need/want to substitute in new public keys for the Parties? // TODO Do we need/want to substitute in new public keys for the Parties?
val myName = serviceHub.myInfo.legalIdentity.name val myOldParty = deal.parties.single { it.owningKey == serviceHub.myInfo.legalIdentity.owningKey }
val myOldParty = deal.parties.single { it.name == myName }
val newDeal = deal val newDeal = deal
@ -109,8 +107,8 @@ object FixingFlow {
} }
override val myKeyPair: KeyPair get() { override val myKeyPair: KeyPair get() {
val myName = serviceHub.myInfo.legalIdentity.name val myCompositeKey = serviceHub.myInfo.legalIdentity.owningKey
val myKeys = dealToFix.state.data.parties.filter { it.name == myName }.single().owningKey.keys val myKeys = dealToFix.state.data.parties.filter { it.owningKey == myCompositeKey }.single().owningKey.keys
return serviceHub.keyManagementService.toKeyPair(myKeys) return serviceHub.keyManagementService.toKeyPair(myKeys)
} }
@ -144,13 +142,12 @@ object FixingFlow {
override fun call(): Unit { override fun call(): Unit {
progressTracker.nextStep() progressTracker.nextStep()
val dealToFix = serviceHub.loadState(ref) val dealToFix = serviceHub.loadState(ref)
// TODO: this is not the eventual mechanism for identifying the parties
val fixableDeal = (dealToFix.data as FixableDealState) val fixableDeal = (dealToFix.data as FixableDealState)
val sortedParties = fixableDeal.parties.sortedBy { it.name } val parties = fixableDeal.parties.filter { it.owningKey != serviceHub.myInfo.legalIdentity.owningKey }
if (sortedParties[0].name == serviceHub.myInfo.legalIdentity.name) { if (parties.isNotEmpty()) {
val fixing = FixingSession(ref, fixableDeal.oracleType) val fixing = FixingSession(ref, fixableDeal.oracleType)
// Start the Floater which will then kick-off the Fixer // Start the Floater which will then kick-off the Fixer
subFlow(Floater(sortedParties[1], fixing)) subFlow(Floater(parties.first(), fixing))
} }
} }
} }